[Commits] [SCM] claws branch, master, updated. 3.17.8-96-g6df051d20

paul at claws-mail.org paul at claws-mail.org
Sat Jul 10 10:11:02 CEST 2021


The branch, master has been updated
       via  6df051d20454f7f0c222d40cca89cd1cd4bf3db6 (commit)
      from  45f3cda034f9a7139c6f7af40662b0c4ea3df665 (commit)

Summary of changes:
 po/ca.po    | 2064 ++++++++++--------
 po/cs.po    | 6763 ++++++++++++++++++++++++++++++++---------------------------
 po/da.po    | 3221 ++++++++++++++--------------
 po/nl.po    | 2913 +++++++++++++------------
 po/pl.po    | 2628 +++++++++++++----------
 po/pt_BR.po | 4775 ++++++++++++++++++++++-------------------
 po/ro.po    | 2323 +++++++++++---------
 po/ru.po    | 2021 ++++++++++--------
 po/sk.po    | 2055 +++++++++---------
 po/tr.po    | 2045 +++++++++---------
 po/zh_TW.po | 2653 ++++++++++++-----------
 11 files changed, 18180 insertions(+), 15281 deletions(-)


- Log -----------------------------------------------------------------
commit 6df051d20454f7f0c222d40cca89cd1cd4bf3db6
Author: Paul <paul at claws-mail.org>
Date:   Sat Jul 10 09:10:46 2021 +0100

    update translations

diff --git a/po/ca.po b/po/ca.po
index 91fd9f8df..cb7ab7667 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.
+# David Medina <opensusecatala at gmail.com>, actualització per a la versió nova, agost i desembre de 2018, febrer i setembre de 2020 i juliol de 2021.
 # 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: 2020-09-13 17:40+0100\n"
-"PO-Revision-Date: 2020-09-15 18:11+0200\n"
+"POT-Creation-Date: 2021-07-03 09:16+0100\n"
+"PO-Revision-Date: 2021-07-08 10:03+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 2.4.1\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-SearchPath-0: .\n"
 
@@ -67,48 +67,48 @@ msgstr "Els comptes amb carpetes remotes no es poden copiar."
 msgid "Copy of %s"
 msgstr "Còpia de %s"
 
-#: src/account.c:1125
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Realment voleu suprimir el compte \"%s\"?"
 
-#: src/account.c:1127
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr "(Sense títol)"
 
-#: src/account.c:1128
+#: src/account.c:1129
 msgid "Delete account"
 msgstr "Suprimeix el compte"
 
-#: src/account.c:1602
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1608
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "\"Rep missatges\" recupera els missatges des dels comptes seleccionats"
 
-#: 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/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
 #: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: 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
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1623 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Servidor"
 
@@ -159,7 +159,8 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5277 src/compose.c:5282 src/ldaputil.c:333
+#: 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/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -431,12 +432,12 @@ msgid "_Book"
 msgstr "Lli_breta"
 
 #: 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/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Edita"
 
-#: src/addressbook.c:407 src/compose.c:619 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "E_ines"
@@ -469,14 +470,14 @@ msgstr "_Edita la llibreta"
 msgid "_Delete book"
 msgstr "S_uprimeix la llibreta"
 
-#: src/addressbook.c:426 src/compose.c:631
+#: src/addressbook.c:426 src/compose.c:632
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "De_sa"
 
-#: src/addressbook.c:427 src/compose.c:635 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
@@ -491,13 +492,13 @@ msgid "C_ut"
 msgstr "T_alla"
 
 #: 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/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copia"
 
 #: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Enganxa"
 
@@ -820,7 +821,7 @@ msgid "Person"
 msgstr "Persona"
 
 #: 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/folderview.c:449 src/prefs_account.c:3468 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -945,18 +946,18 @@ msgstr "Actualització d'adreces"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Actualització fallida. Canvis no escrits al directori."
 
-#: src/alertpanel.c:144 src/compose.c:9810
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr "Anunci"
 
-#: 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/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:5091
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr "Avís"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5808 src/inc.c:726
+#: 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
 msgid "Error"
 msgstr "Error"
@@ -1077,36 +1078,36 @@ 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:1238
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "Negociació SSL/TLS fallida\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "No hi ha cap mètode disponible per a SMTP AUTH\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "El mètode SMTP AUTH seleccionat no està disponible\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "resposta SMTP incorrecta\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "hi ha hagut un error a la sessió SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "hi ha hagut un error d'autenticació\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, 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:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "no s'ha pogut iniciar la sessió STARTTLS\n"
 
@@ -1247,217 +1248,217 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Dilluns"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Dijous"
 
-#: src/common/utils.c:4056
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Divendres"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Gener"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrer"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Març"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maig"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juny"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juliol"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agost"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Setembre"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4069
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembre"
 
-#: src/common/utils.c:4070
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Desembre"
 
-#: src/common/utils.c:4072
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "dg."
 
-#: src/common/utils.c:4073
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "dl."
 
-#: src/common/utils.c:4074
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "dt."
 
-#: src/common/utils.c:4075
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "dc."
 
-#: src/common/utils.c:4076
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "dj."
 
-#: src/common/utils.c:4077
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "dv."
 
-#: src/common/utils.c:4078
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "ds."
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "gen."
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "febr."
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "març"
 
-#: src/common/utils.c:4083
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "abr."
 
-#: src/common/utils.c:4084
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "maig"
 
-#: src/common/utils.c:4085
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "juny"
 
-#: src/common/utils.c:4086
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul."
 
-#: src/common/utils.c:4087
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "ag."
 
-#: src/common/utils.c:4088
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "set."
 
-#: src/common/utils.c:4089
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "nov."
 
-#: src/common/utils.c:4090
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4091
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "des."
 
-#: src/common/utils.c:4102
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "a. m."
 
-#: src/common/utils.c:4103
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "p. m. "
 
-#: src/common/utils.c:4104
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "a. m."
 
-#: src/common/utils.c:4105
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "p. m."
 
-#: src/compose.c:195
+#: src/compose.c:198
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1469,373 +1470,373 @@ msgstr ""
 "\n"
 "S'han inhabilitat les opcions de signar i encriptar per a aquest missatge."
 
-#: src/compose.c:603
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Afegeix..."
 
-#: src/compose.c:604 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "Sup_rimeix"
 
-#: src/compose.c:606 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Propietats..."
 
-#: src/compose.c:613 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "_Missatge"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "_Ortografia"
 
-#: src/compose.c:618 src/compose.c:685
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Opcions"
 
-#: src/compose.c:620 src/mainwindow.c:528 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
 msgid "_Help"
 msgstr "A_juda"
 
-#: src/compose.c:622
+#: src/compose.c:623
 msgid "S_end"
 msgstr "_Envia"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "Envia'_l després"
 
-#: src/compose.c:626
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "_Adjunta-hi un fitxer"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "_Insereix-hi un fitxer"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Insereix-hi una si_gnatura"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "_Reemplaça'n la signatura"
 
-#: src/compose.c:633
+#: src/compose.c:634
 msgid "_Print"
 msgstr "Im_primeix"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "Des_fés"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Refés"
 
-#: src/compose.c:642 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Talla"
 
-#: src/compose.c:646
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "Enganxat e_special"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Com a _citació"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "A_justa"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "Desaj_ustat"
 
-#: src/compose.c:651 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Seleccion_a-ho tot"
 
-#: src/compose.c:653
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "A_vançat"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Ves al caràcter anterior"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Ves al caràcter següent"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Ves a la paraula anterior"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Ves a la paraula següent"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Ves a l'inici de la línia"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Ves al final de la línia"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Ves a la línia anterior"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Ves a la línia següent"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Suprimeix el caràcter anterior"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Suprimeix el caràcter següent"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Suprimeix la paraula anterior"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Suprimeix la paraula següent"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Suprimeix la línia"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Suprimeix fins al final de la línia"
 
-#: src/compose.c:670 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "Tro_ba"
 
-#: src/compose.c:673
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "A_justa el paràgraf actual"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Ajusta totes les _línies llargues"
 
-#: src/compose.c:676
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Edita amb un editor e_xtern"
 
-#: src/compose.c:679
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "_Comprova-ho tot o la selecció"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "_Ressalta tots els errors ortogràfics"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "Comprova els errors d'ortografia cap _enrere"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "Avança fins a la  _falta d'ortografia següent"
 
-#: src/compose.c:689
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "_Mode de resposta"
 
-#: src/compose.c:691
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "_Sistema de privacitat"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "_Prioritat"
 
-#: src/compose.c:697 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "Codificació d_e caràcters"
 
-#: src/compose.c:702 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Europeu occidental"
 
-#: src/compose.c:703 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Bàltic"
 
-#: src/compose.c:704 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: src/compose.c:705 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Àrab"
 
-#: src/compose.c:706 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Ciríl·lic"
 
-#: src/compose.c:707 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonès"
 
-#: src/compose.c:708 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Xinès"
 
-#: src/compose.c:709 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Coreà"
 
-#: src/compose.c:710 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Tailandès"
 
-#: src/compose.c:713 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "Llibret_a d'adreces"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:717 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "Accio_ns"
 
-#: src/compose.c:721 src/mainwindow.c:825 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
 msgid "_About"
 msgstr "Qu_ant a"
 
-#: src/compose.c:726
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Ajusta aut_omàticament"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Sa_gnat automàtic"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "Si_gna"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "_Encripta"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "Demana una confirmació de _recepció"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "Suprimei_x les referències"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "Mostra el gestor de _regles"
 
-#: src/compose.c:737 src/compose.c:747
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:738 src/mainwindow.c:674 src/messageview.c:305
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
 #: src/summaryview.c:433
 msgid "_All"
 msgstr "_Tothom"
 
-#: src/compose.c:739 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_Sender"
 msgstr "_Remitent"
 
-#: src/compose.c:740
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "_Llista de correu"
 
-#: src/compose.c:745
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "Més _alta"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "A_lta"
 
-#: src/compose.c:748
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "Bai_xa"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "Més _baixa"
 
-#: src/compose.c:754 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automàtic"
 
-#: src/compose.c:755 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:756 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:760 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centreeuropeu (ISO-8859-_2)"
 
-#: src/compose.c:763 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grec (ISO-8859-_7)"
 
-#: src/compose.c:768 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
-#: src/compose.c:1055
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr "Error de format al \"Des de\" del missatge nou."
 
-#: src/compose.c:1148
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr "Error de format a l'assumpte del missatge nou."
 
-#: src/compose.c:1180 src/quote_fmt.c:563
+#: src/compose.c:1181 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Missatge nou\" té un error a la línia %d."
 
-#: src/compose.c:1449
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "No es pot respondre. Probablement el missatge original no existeix."
 
-#: src/compose.c:1634 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "El camp \"Des de\" de la plantilla \"Respon\" conté una adreça no vàlida."
 
-#: src/compose.c:1683 src/quote_fmt.c:583
+#: src/compose.c:1684 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Respon\" té un error a la línia %d."
 
-#: src/compose.c:1824 src/compose.c:2025 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1843,56 +1844,56 @@ msgstr ""
 "El camp \"Des de\" de la plantilla \"Reenvia\" conté una adreça de correu no "
 "vàlida."
 
-#: src/compose.c:1885 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Reenvia\" conté un error a la línia %d."
 
-#: src/compose.c:2068
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
 msgstr "Fw: missatges múltiples"
 
-#: src/compose.c:2577
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Redirecciona\" conté un error a la línia %d."
 
-#: src/compose.c:2648 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "A/c:"
 
-#: src/compose.c:2651 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "C/o:"
 
-#: src/compose.c:2654 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Respon a:"
 
-#: src/compose.c:2657 src/compose.c:5026 src/compose.c:5028
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grups de notícies:"
 
-#: src/compose.c:2660 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Envia a:"
 
-#: src/compose.c:2663 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Com a resposta a:"
 
-#: src/compose.c:2667 src/compose.c:5023 src/compose.c:5031
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Per a:"
 
-#: src/compose.c:2857
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "No s'ha pogut adjuntar el fitxer (conversió de joc de caràcters fallida)."
 
-#: src/compose.c:2863
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1907,16 +1908,16 @@ msgstr[1] ""
 "S'han adjuntat els fitxers següents:\n"
 "%s"
 
-#: src/compose.c:3143
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "El símbol de cometes de la plantilla és erroni."
 
-#: src/compose.c:3672
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "No s'ha pogut obtenir la mida del fitxer \"%s\"."
 
-#: src/compose.c:3690
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1925,57 +1926,57 @@ msgstr ""
 "Esteu a punt d'inserir un fitxer de %s al cos del missatge. Segur que ho "
 "voleu fer?"
 
-#: src/compose.c:3693
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr "N'esteu segur?"
 
-#: src/compose.c:3694 src/compose.c:10859 src/compose.c:11753
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr "_Insereix"
 
-#: src/compose.c:3819
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr "El fitxer %s és buit."
 
-#: src/compose.c:3820
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr "Fitxer buit"
 
-#: src/compose.c:3821
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr "_Adjunta-ho tanmateix"
 
-#: src/compose.c:3830
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr "No es pot llegir %s."
 
-#: src/compose.c:3857
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr "Missatge: %s"
 
-#: src/compose.c:4867 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Editat]"
 
-#: src/compose.c:4874 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Escriu missatge%s"
 
-#: src/compose.c:4877 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sense assumpte] - Escriu missatge%s"
 
-#: src/compose.c:4879 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Escriu un missatge"
 
-#: src/compose.c:4906 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1983,60 +1984,60 @@ msgstr ""
 "No heu especificat cap compte per a l'enviament.\n"
 "Seleccioneu algun compte abans d'enviar."
 
-#: src/compose.c:5123 src/compose.c:5160
+#: src/compose.c:5126 src/compose.c:5163
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 "L'únic destinatari és l'adreça per defecte \"%s\". Voleu enviar-lo tanmateix?"
 
-#: src/compose.c: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: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
 msgid "Send"
 msgstr "Envia"
 
-#: 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/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
 msgid "_Send"
 msgstr "_Envia"
 
-#: src/compose.c:5181
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr "No heu especificat el destinatari."
 
-#: src/compose.c:5196
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "L'assumpte és buit. %s"
 
-#: src/compose.c:5197 src/compose.c:5240
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Voleu enviar-lo tanmateix?"
 
-#: src/compose.c:5198 src/compose.c:5241
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Voleu posar-lo a la cua tanmateix?"
 
-#: src/compose.c:5200 src/compose.c:5243 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr "Envia'l després"
 
-#: src/compose.c:5201 src/compose.c:5244
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr "A la _cua"
 
-#: src/compose.c:5239
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Enviant-ho a %d destinataris. %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5271
 msgid "Could not queue message."
 msgstr "No s'ha pogut posar el missatge a la cua."
 
-#: src/compose.c:5271
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2047,7 +2048,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5275
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2058,7 +2059,7 @@ msgstr ""
 "\n"
 "Signatura fallida: %s"
 
-#: src/compose.c:5280
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2069,7 +2070,7 @@ msgstr ""
 "\n"
 "Ha fallat l'encriptació: %s"
 
-#: src/compose.c:5285
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2079,7 +2080,7 @@ msgstr ""
 "\n"
 "Conversió de joc de caràcters fallida."
 
-#: src/compose.c:5289
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2089,7 +2090,7 @@ msgstr ""
 "\n"
 "No s'ha pogut obtenir la clau d'encriptació del receptor."
 
-#: src/compose.c:5352 src/compose.c:5412
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2098,7 +2099,7 @@ msgstr ""
 "Useu \"Envia els missatges de la cua\" de la finestra principal per tornar-"
 "ho a intentar."
 
-#: src/compose.c:5408
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
@@ -2108,7 +2109,7 @@ msgstr ""
 "Useu \"Envia els missatges de la cua\" de la finestra principal per tornar-"
 "ho a intentar."
 
-#: src/compose.c:5805
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2119,7 +2120,7 @@ msgstr ""
 "al joc de caràcters %s especificat.\n"
 "Voleu enviar-lo com a %s?"
 
-#: src/compose.c:5867
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2132,68 +2133,68 @@ msgstr ""
 "\n"
 "Voleu enviar-lo tanmateix?"
 
-#: src/compose.c:6102
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr "Avís d'encriptació"
 
-#: src/compose.c:6103
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr "C_ontinua"
 
-#: src/compose.c:6152
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr "No hi ha cap compte disponible per enviar correus!"
 
-#: src/compose.c:6161
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 "El compte seleccionat no és de tipus NNTP: la publicació no és possible."
 
-#: src/compose.c:6415
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "L'adjunt %s ja no existeix. Voleu ignorar-lo?"
 
-#: src/compose.c:6417 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Cancel·la l'enviament"
 
-#: src/compose.c:6417
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr "Ignora l'adjunt"
 
-#: src/compose.c:6473
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr "Secció %s original"
 
-#: src/compose.c:7073
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr "Afegeix a la lli_breta d'adreces"
 
-#: src/compose.c:7240
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr "Suprimeix el contingut de l'entrada"
 
-#: src/compose.c:7244 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Useu <tab> per a l'autocompleció des de la llibreta d'adreces"
 
-#: src/compose.c:7476
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:7482 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: 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
 msgid "Size"
 msgstr "Mida"
 
-#: src/compose.c:7544
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr "Desa el missatge a "
 
-#: src/compose.c:7575 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
@@ -2204,27 +2205,27 @@ msgstr "Desa el missatge a "
 msgid "_Browse"
 msgstr "Na_vega"
 
-#: src/compose.c:7591
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr "Seleccioneu una carpeta per desar-hi el missatge"
 
-#: src/compose.c:8048
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Ca_pçalera"
 
-#: src/compose.c:8053
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Adjunts"
 
-#: src/compose.c:8067
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "Alt_res"
 
-#: src/compose.c:8082
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "Ass_umpte:"
 
-#: src/compose.c:8306
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2233,19 +2234,19 @@ msgstr ""
 "No s'ha pogut iniciar el corrector ortogràfic.\n"
 "%s"
 
-#: src/compose.c:8453
+#: src/compose.c:8456
 msgid "_From:"
 msgstr "_De:"
 
-#: src/compose.c:8470
+#: src/compose.c:8473
 msgid "Account to use for this email"
 msgstr "Compte a usar per a aquest correu electrònic"
 
-#: src/compose.c:8472
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr "Adreça del remitent per usar"
 
-#: src/compose.c:8654
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2254,73 +2255,105 @@ msgstr ""
 "El sistema de privacitat \"%s\" no s'ha pogut carregar. No podreu signar o "
 "encriptar aquest missatge."
 
-#: src/compose.c:8765 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "_Cap"
 
-#: src/compose.c:8866 src/prefs_template.c:752
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "El cos de la plantilla té un error a la línia %d."
 
-#: src/compose.c:8963
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Error de format de la plantilla \"%s\"."
 
-#: src/compose.c:9387
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr "Tipus MIME no vàlid."
 
-#: src/compose.c:9402
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr "El fitxer no existeix o és buit."
 
-#: src/compose.c:9476
+#: src/compose.c:9479
 msgid "Properties"
 msgstr "Propietats"
 
-#: src/compose.c:9494
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:9527
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr "Codificació"
 
-#: src/compose.c:9547
+#: src/compose.c:9550
 msgid "Path"
 msgstr "Camí"
 
-#: src/compose.c:9548
+#: src/compose.c:9551
 msgid "File name"
 msgstr "Nom del fitxer"
 
-#: src/compose.c:9807
+#: src/compose.c:9646
+#, c-format
+#| msgid ""
+#| "Could not create mbox file:\n"
+#| "%s\n"
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"No s'ha pogut escriure el cos al fitxer:\n"
+"%s"
+
+#: src/compose.c:9704
+#, c-format
+#| msgid ""
+#| "Could not fork to execute the following command:\n"
+#| "%s\n"
+#| "%s"
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"No s'ha pogut generar l'ordre següent:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9743
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr "L'editor extern s'ha aturat amb un error: %s"
+
+#: src/compose.c:9817
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
 "L'editor extern encara està actiu.\n"
-"Voleu acabar el procés?\n"
-"Id. del grup del procés: %d"
+"Voleu forçar l'acabament del procés?\n"
+"Id. del procés: %d"
 
-#: src/compose.c:10280 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 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:10473
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr "No s'ha pogut desar l'esborrany."
 
-#: src/compose.c:10477
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr "No s'ha pogut desar l'esborrany"
 
-#: src/compose.c:10478
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2328,24 +2361,24 @@ msgstr ""
 "No s'ha pogut desar l'esborrany.\n"
 "Voleu cancel·lar la sortida o descartar aquest missatge?"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr "_Cancel·la la sortida"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr "_Descarta el missatge"
 
-#: src/compose.c:10669 src/compose.c:10683
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr "Selecciona un fitxer"
 
-#: src/compose.c:10697
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No s'ha pogut llegir el ftxer \"%s\"."
 
-#: src/compose.c:10699
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2354,50 +2387,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:10778
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr "Descarta el missatge"
 
-#: src/compose.c:10779
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr "Aquest missatge ha estat modificat. Voleu descartar-lo?"
 
-#: src/compose.c:10780 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Descarta"
 
-#: src/compose.c:10780 src/compose.c:10785
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr "De_sa a la carpeta d'esborranys"
 
-#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Desa els canvis"
 
-#: src/compose.c:10784
+#: src/compose.c:10734
 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:10785
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr "No ho _desis"
 
-#: src/compose.c:10856
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voleu aplicar la plantilla \"%s\"?"
 
-#: src/compose.c:10858
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr "Aplica la plantilla"
 
-#: src/compose.c:10859 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
 #: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: src/compose.c:11746
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2412,20 +2445,20 @@ msgstr[1] ""
 "Voleu inserir el contingut dels %d fitxers dins el cos del missatge o "
 "adjuntar-los al correu?"
 
-#: src/compose.c:11752
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr "Inserir o adjuntar?"
 
-#: src/compose.c:11753
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr "_Adjunta-ho"
 
-#: src/compose.c:11971
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de format de la cita a la línia %d."
 
-#: src/compose.c:12267
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2643,7 +2676,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:2158
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Fitxer"
@@ -2728,13 +2761,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:2910
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 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:2917
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2796,7 +2829,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2962,8 +2995,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:1405 src/prefs_account.c:2003
-#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
+#: 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
 msgid "Show password"
 msgstr "Mostra la contrasenya"
@@ -2987,11 +3020,11 @@ 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:3722
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr "Bàsiques"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "Estesa"
 
@@ -3135,8 +3168,8 @@ msgstr "Full d'estils"
 #: 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/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
 msgid "None"
 msgstr "Cap"
 
@@ -3375,7 +3408,7 @@ msgstr "Exporta la llibreta d'adreces a un fitxer LDIF"
 msgid "Distinguished Name"
 msgstr "Nom distingit"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr "Exporta a fitxer de bústia"
 
@@ -3440,19 +3473,19 @@ msgstr "El nom és massa llarg."
 msgid "Not specified."
 msgstr "Sense especificar."
 
-#: 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 ""
 "No s'ha trobat el fitxer %s! Voleu usar el fitxer de la còpia de seguretat "
 "de %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 "No s'ha pogut copiar %s a %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 "
@@ -3560,51 +3593,51 @@ msgstr "no s'ha pogut aplicar l'acció\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "sense processament addicional després de l'acció [%s]\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "processant la regla \"%s\" [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "processant la regla <sense nom> [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "inhabilitada la regla \"%s\" [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "regla inhabilitada <sense nom> [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "indeterminat"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "incorporació"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "manualment"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "processament de carpetes"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "preprocessant"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "postprocessant"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3621,11 +3654,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr "."
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3660,35 +3693,35 @@ msgstr "Esborranys"
 msgid "Processing (%s)...\n"
 msgstr "Processant (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiant %s a %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movent %s a %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualitzant memòria cau per a %s ..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "Processant missatges..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronitzant %s per usar sense connexió...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Un nom de carpeta no pot començar o acabar amb un punt."
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "Un nom de carpeta no pot acabar amb un espai."
 
@@ -3771,13 +3804,13 @@ msgstr "Estableix les columnes visibles"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr "Nous"
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Sense llegir"
@@ -3796,7 +3829,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Establint informació de carpeta..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr "Marca-ho tot com a llegit"
 
@@ -3808,12 +3841,12 @@ msgstr ""
 "Realment voleu marcar tots els missatges d'aquesta carpeta i les seves "
 "subcarpetes com a llegits?"
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:871 src/summaryview.c:4292
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Realment voleu marcar tots els correus d'aquesta carpeta com a llegits?"
 
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr "Marca'ls tots com a no llegits"
 
@@ -3825,17 +3858,17 @@ msgstr ""
 "Realment voleu marcar tots els missatges d'aquesta carpeta i de les "
 "subcarpetes com a no llegits?"
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:877 src/summaryview.c:4338
 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:1067 src/imap.c:4675
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "S'explora la carpeta %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4679 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Explorant la carpeta %s..."
@@ -3894,7 +3927,7 @@ msgstr "Voleu suprimir tots els missatges de la paperera?"
 msgid "_Empty trash"
 msgstr "Buida la pap_erera"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Avís de desconnexió"
 
@@ -3914,7 +3947,7 @@ msgstr "Voleu enviar tots els missatges de la cua?"
 msgid "Some errors occurred while sending queued messages."
 msgstr "S'han produït alguns errors enviant els missatges de la cua."
 
-#: src/folderview.c:2557 src/main.c:2891 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3980,7 +4013,7 @@ msgstr "El desplaçament ha fallat!"
 msgid "Processing configuration for folder %s"
 msgstr "Processant la configuració per a la carpeta %s"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 "La carpeta de destinació només es pot usar per emmaguetzemar subcarpetes."
@@ -4031,7 +4064,7 @@ msgstr "desconegut"
 msgid "Can't retrieve newsgroup list."
 msgstr "No es pot obtenir la llista de grups."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1848 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr "Fet."
 
@@ -4066,11 +4099,11 @@ msgstr ""
 
 #: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "L'equip del Claws Mail\n"
 "i en Hiroyuki Yamamoto"
 
@@ -4225,44 +4258,44 @@ 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:718 src/main.c:2715
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr "Estadístiques de la sessió\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2725 src/main.c:2728
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr "Iniciat: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2734
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr "Trànsit d'entrada\n"
 
-#: src/gtk/about.c:741 src/main.c:2737
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Missatges rebuts: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2743
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr "Trànsit de sortida\n"
 
-#: src/gtk/about.c:751 src/main.c:2746
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Missatges nous / redireccionats: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2750
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Missatges resposts: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2754
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Missatges reenviats: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2758
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total de missatges sortints: %d\n"
@@ -4474,20 +4507,20 @@ msgstr ""
 "El corrector ortogràfic no ha pogut canviar al diccionari alternatiu.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1853
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "Ha fallat: no s'ha trobat el registre del servei."
 
-#: src/gtk/gtkutils.c:1856
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "Ha fallat: error de xarxa."
 
-#: src/gtk/gtkutils.c:1859
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Ha fallat: error desconegut (%d)."
 
-#: src/gtk/gtkutils.c:1929
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "Configurant..."
 
@@ -4731,7 +4764,7 @@ msgstr "Agent-Usuari:"
 msgid "Content-Type"
 msgstr "Tipus de contingut"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr "Tipus de contingut:"
 
@@ -4759,7 +4792,7 @@ msgstr "Procedència"
 msgid "Precedence:"
 msgstr "Procedència:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "Organizació"
 
@@ -5082,7 +5115,7 @@ msgstr ""
 #: 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/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
@@ -5140,11 +5173,11 @@ msgid "_Hide"
 msgstr "Ama_ga"
 
 #: 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: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
 msgid "Account"
 msgstr "Compte"
 
@@ -5374,51 +5407,51 @@ msgstr ""
 "de tenir per coincidir i ser mostrats a la llista de missatges.\n"
 "Es poden usar els següents símbols:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Quelcom ha fallat durant la cerca. Es recomana consultar el registre."
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr "De/Per a/Cc/Assumpte/Etiqueta"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Recursiu"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "Enganxós"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "Escriptura anticipada"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "Executa sobre la selecció"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "Neteja la cerca actual"
 
-#: 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 "Edita els criteris de cerca"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr "Informació sobre símbols ampliats"
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr "_Informació"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr "E_dita"
 
-#: 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:349
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "_Neteja"
@@ -5594,213 +5627,213 @@ msgstr "(Sense remitent)"
 msgid "(No Subject)"
 msgstr "(Sense assumpte)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr "Error:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr "Mida del fitxer:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr "Carrega la imatge"
 
-#: src/imap.c:582
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr "Connexió IMAP trencada\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: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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Error d'IMAP a %s:"
 
-#: src/imap.c:627
+#: src/imap.c:628
 msgid "authenticated"
 msgstr "autenticat"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "no autenticat"
 
-#: src/imap.c:633
+#: src/imap.c:634
 msgid "bad state"
 msgstr "mal estat"
 
-#: src/imap.c:636
+#: src/imap.c:637
 msgid "stream error"
 msgstr "error de flux"
 
-#: src/imap.c:639
+#: src/imap.c:640
 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:643
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "connexió rebutjada"
 
-#: src/imap.c:646
+#: src/imap.c:647
 msgid "memory error"
 msgstr "error de memòria"
 
-#: src/imap.c:649
+#: src/imap.c:650
 msgid "fatal error"
 msgstr "error fatal"
 
-#: src/imap.c:652
+#: src/imap.c:653
 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:656
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr "connexió no acceptada"
 
-#: src/imap.c:659
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr "error d'ADDICIÓ"
 
-#: src/imap.c:662
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr "error de NO OP"
 
-#: src/imap.c:665
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr "error de SORTIDA"
 
-#: src/imap.c:668
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr "error de CAPACITAT"
 
-#: src/imap.c:671
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr "error de COMPROVACIÓ"
 
-#: src/imap.c:674
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr "error de TANCAMENT"
 
-#: src/imap.c:677
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr "error de SUPRESSIÓ"
 
-#: src/imap.c:680
+#: src/imap.c:681
 msgid "COPY error"
 msgstr "error de CÒPIA"
 
-#: src/imap.c:683
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr "error de CÒPIA D'UID"
 
-#: src/imap.c:686
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr "error de CREACIÓ"
 
-#: src/imap.c:689
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr "error de SUPRESSIÓ"
 
-#: src/imap.c:692
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr "error d'EXAMINAR"
 
-#: src/imap.c:695
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr "error d'OBTENCIÓ"
 
-#: src/imap.c:698
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr "error d'OBTENCIÓ D'UID"
 
-#: src/imap.c:701
+#: src/imap.c:702
 msgid "LIST error"
 msgstr "error de LLISTAT"
 
-#: src/imap.c:704
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr "error d'ENTRADA"
 
-#: src/imap.c:707
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr "error d'LSUB"
 
-#: src/imap.c:710
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr "error de CANVI DE NOM"
 
-#: src/imap.c:713
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr "error de CERCA"
 
-#: src/imap.c:716
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr "error de CERCA D'UID"
 
-#: src/imap.c:719
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr "error de SELECCIÓ"
 
-#: src/imap.c:722
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr "error d'ESTAT"
 
-#: src/imap.c:725
+#: src/imap.c:726
 msgid "STORE error"
 msgstr "error d'EMMAGATZEMATGE"
 
-#: src/imap.c:728
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr "error d'EMMAGATZEMATGE D'UID"
 
-#: src/imap.c:731
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr "error de SUBSCRIPCIÓ"
 
-#: src/imap.c:734
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr "error de NO-SUBSCRIPCIÓ"
 
-#: src/imap.c:737
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr "error d'STARTTLS"
 
-#: src/imap.c:740
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr "error d'INVAL"
 
-#: src/imap.c:743
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr "error d'EXTENSIÓ"
 
-#: src/imap.c:746
+#: src/imap.c:747
 msgid "SASL error"
 msgstr "error de SASL"
 
-#: src/imap.c:750
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr "error d'SSL/TLS"
 
-#: src/imap.c:754
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Error desconegut [%d]"
 
-#: src/imap.c:960
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5812,7 +5845,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:966
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5824,7 +5857,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:972
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5836,7 +5869,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:978
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5848,7 +5881,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:984
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5860,36 +5893,36 @@ 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:991
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Ha fallat la connexió amb %s: entrada refusada.%s"
 
-#: src/imap.c:995
+#: src/imap.c:1003
 #, 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:1013
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "La connexió amb %s fa fallat"
 
-#: src/imap.c:1020 src/imap.c:1023
+#: src/imap.c:1028 src/imap.c:1031
 #, 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:1053 src/imap.c:3725 src/imap.c:4384 src/imap.c:4478
-#: src/imap.c:4656 src/imap.c:5467
+#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 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:1163 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Connexió no segura"
 
-#: src/imap.c:1164 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5903,108 +5936,108 @@ msgstr ""
 "Voleu continuar connectant a aquest servidor? La comunicació pot no ser "
 "segura."
 
-#: src/imap.c:1170 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "Con_tinua connectant"
 
-#: src/imap.c:1179
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Compte: \"%s\": connectant al servidor IMAP: %s:%d ..."
 
-#: src/imap.c:1244
+#: src/imap.c:1252
 #, 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:1247
+#: src/imap.c:1255
 #, 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:1279 src/imap.c:4146
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "No es pot iniciar la sessió STARTTLS.\n"
 
-#: src/imap.c:1348
+#: src/imap.c:1359
 #, 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:1351
+#: src/imap.c:1362
 #, 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:1779
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "Afegint missatges..."
 
-#: src/imap.c:1984 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copiant missatges..."
 
-#: src/imap.c:2510
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr "La cerca ha fallat a causa d'un error del servidor."
 
-#: src/imap.c:2594
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "no s'han pogut establir els indicadors suprimits\n"
 
-#: src/imap.c:2601 src/imap.c:5097
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "no es pot suprimir\n"
 
-#: src/imap.c:2976
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscant carpetes no subscrites a %s..."
 
-#: src/imap.c:2979
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscant subcarpetes de %s..."
 
-#: src/imap.c:3267
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no s'ha pogut crear la bústia: LIST ha fallat\n"
 
-#: src/imap.c:3280
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "no es pot crear la bústia\n"
 
-#: src/imap.c:3411
+#: src/imap.c:3422
 #, 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:3524
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "no es pot suprimir la bústia\n"
 
-#: src/imap.c:3803
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "LIST ha fallat\n"
 
-#: src/imap.c:3888
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr "Marcant missatges..."
 
-#: src/imap.c:3991
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "No s'ha pogut seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4143
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "El servidor requereix STARTTLS per accedir-hi.\n"
 
-#: src/imap.c:4153
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr "No es poden refrescar les capacitats.\n"
 
-#: src/imap.c:4158
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6013,20 +6046,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:4166
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr "Les entrades al servidor estan inhabilitades.\n"
 
-#: src/imap.c:4389
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "Obtenint el missatge..."
 
-#: src/imap.c:5090
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no s'han pogut establir els indicadors suprimits: %d\n"
 
-#: src/imap.c:6125
+#: src/imap.c:6136
 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"
@@ -6079,7 +6112,7 @@ msgstr "_Subscriviu-vos-hi..."
 
 #: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Unsubscribe..."
-msgstr "Dona't de bai_xa..."
+msgstr "Dona-te'n de bai_xa..."
 
 #: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
 #: src/plugins/mailmbox/plugin_gtk.c:64
@@ -6227,7 +6260,7 @@ msgstr "_Subscriviu-vos-hi"
 
 #: src/imap_gtk.c:574 src/news_gtk.c:252
 msgid "_Unsubscribe"
-msgstr "Dona't de bai_xa"
+msgstr "Dona-te'n de bai_xa"
 
 #: src/import.c:113 src/import.c:209
 msgid "Import mbox file"
@@ -6422,142 +6455,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:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 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:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "%s ha fallat\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "Obtenint missatges nous"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Recuperant"
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, 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:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "Fet (no hi ha missatges nous)"
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Connexió fallida"
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Auth fallida"
 
-#: 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: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
 msgid "Locked"
 msgstr "Bloquejat"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:397
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr "Temps d'espera esgotat"
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, 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:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "Acabat (no hi ha missatges nous)"
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: recuperant missatges nous"
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Compte \"%s\": connectant al servidor POP3: %s:%d..."
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, 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:927
+#: src/inc.c:932
 #, 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:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Autenticant..."
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Obtenint missatges de %s (%s)..."
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtenint el nombre de missatges nous (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtenint el nombre de missatges nous (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtenint el nombre de missatges nous (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtenint la mida dels missatges (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "Sortint"
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperant el missatge (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, 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:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "La connexió amb %s:%d ha fallat."
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "S'ha produït un error mentre es processava el correu."
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6566,37 +6599,37 @@ msgstr ""
 "S'ha produït un error mentre es processava el correu:\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "No hi ha espai lliure al disc."
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "No es pot escriure el fitxer."
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "Error de sòcol"
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de sòcol connectant amb %s:%d."
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "Connexió tancada per la màquina remota."
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, 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:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "La bústia està bloquejada."
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6605,11 +6638,11 @@ msgstr ""
 "La bústia està bloquejada:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "Autenticació fallida."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6618,7 +6651,7 @@ msgstr ""
 "L'autenticació ha fallat:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6626,46 +6659,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:1296
+#: src/inc.c:1301
 #, 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:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr "Incorporació cancel·lada\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1766
+#: 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
 msgid "seconds"
 msgstr "segons"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, 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:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sEsteu treballant sense connexió. Ho anul·lo?"
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "Només _una vegada"
 
@@ -7016,20 +7049,19 @@ msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         commuta el mode de depuració"
 
 #: src/main.c:2081
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h              presenta aquesta ajuda i surt"
+msgid "  --help -h              display this help"
+msgstr "  --help -h              mostra aquesta ajuda"
 
 #: src/main.c:2082
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           mostra la informació de la versió i surt"
+msgid "  --version -v           output version information"
+msgstr "  --version -v           mostra la informació de la versió"
 
 #: src/main.c:2083
 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      mostra la informació de la versió, les "
-"característiques i surt"
+"  --version-full -V      mostra la informació de la versió i de les funcions "
+"integrades"
 
 #: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
@@ -7088,11 +7120,11 @@ msgstr "Missatges a la cua"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hi ha missatges sense enviar a la cua. Voleu sortir ara?"
 
-#: src/main.c:3019
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: la xarxa està connectada.\n"
 
-#: src/main.c:3025
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la xarxa està desconnectada.\n"
 
@@ -7414,7 +7446,7 @@ msgstr "Ajuda"
 
 #: src/mainwindow.c:691
 msgid "Unsubscribe"
-msgstr "Dona't de baixa"
+msgstr "Dona-te'n de baixa"
 
 #: src/mainwindow.c:693
 msgid "View archive"
@@ -7856,7 +7888,7 @@ msgstr "Descendent"
 msgid "_Auto detect"
 msgstr "Detecta _automàticament"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr "Aplica les etiquetes..."
 
@@ -8029,7 +8061,7 @@ msgstr "No s'ha trobat cap missatge duplicat a %d carpetes.\n"
 msgid "Select folder to go to"
 msgstr "Seleccioneu una carpeta per anar-hi"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr "Regles de processament per aplicar abans de les regles de les carpetes"
 
@@ -8038,7 +8070,7 @@ 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:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr "Configuració del filtratge"
 
@@ -8388,8 +8420,8 @@ msgstr ""
 "\n"
 "  El missatge s'ha suprimit o desplaçat a una altra carpeta."
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr "S'ha produït un error mentre s'aprenia.\n"
 
@@ -8503,7 +8535,7 @@ msgid "Go back to email"
 msgstr "Torna al correu"
 
 #: 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:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No s'ha pogut desar la secció del missatge multisecció: %s"
@@ -8565,8 +8597,8 @@ msgstr "Selecciona una carpeta de destinació"
 msgid "'%s' is not a directory."
 msgstr "\"%s\" no és un directori."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr "Desa com a"
 
@@ -8623,7 +8655,7 @@ msgstr "Tipus:"
 msgid "Size:"
 msgstr "Mida:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: 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
 msgid "Description:"
@@ -8717,7 +8749,7 @@ msgstr ""
 
 #: src/news_gtk.c:56
 msgid "_Subscribe to newsgroup..."
-msgstr "_Subscriure's a un grup de notícies..."
+msgstr "_Subscriviu-vos a un grup de notícies..."
 
 #: src/news_gtk.c:57
 msgid "_Unsubscribe newsgroup"
@@ -8736,6 +8768,83 @@ 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:238
+#| msgid "Default missing icon mode"
+msgid "OAuth2 missing authentication code\n"
+msgstr "Falta el codi d’autenticació d’OAuth2.\n"
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr "Error de connexió d'OAuth2\n"
+
+#: src/oauth2.c:253 src/oauth2.c:367
+#| msgid "IMAP connection broken\n"
+msgid "OAuth2 SSL connection error\n"
+msgstr "Error de connexió SSL d'OAuth2\n"
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr "S'ha obtingut el testimoni d'accés d'OAuth2\n"
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr "No s'ha obtingut el testimoni d'accés d'OAuth2\n"
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr "S'ha obtingut el testimoni d'actualització d'OAuth2\n"
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "No s'ha obtingut el testimoni d'actualització d'OAuth2\n"
+
+#: src/oauth2.c:452
+#| msgid "Socket write error"
+msgid "OAuth2 socket write error\n"
+msgstr "Error d'escriptura del sòcol d'OAuth2\n"
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr "Error de temps d'espera del sòcol d'OAuth2 \n"
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr "El testimoni d'accés d'OAuth2 encara està actualitzat.\n"
+
+#: src/oauth2.c:534
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr ""
+"OAuth2 obté un testimoni d’accés mitjançant un testimoni d’actualització.\n"
+
+#: src/oauth2.c:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr "OAuth2 prova un testimoni d'accés nou amb codi d'autenticació.\n"
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr "S'ha actualitzat el testimoni d'accés d'OAuth2.\n"
+
+#: src/oauth2.c:583
+#, c-format
+#| msgid "Original %s part"
+msgid "OAuth2 original: %s\n"
+msgstr "OAuth2 original: %s\n"
+
+#: src/oauth2.c:584
+#, c-format
+#| msgid "--- Ended: %s\n"
+msgid "OAuth2 encoded: %s\n"
+msgstr "OAuth2 codificat: %s\n"
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr ""
+"OAuth2 descodificat: %s\n"
+"\n"
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr "Escriviu la contrasenya mestra."
@@ -9710,7 +9819,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:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1616
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr "KB"
 
@@ -10243,7 +10352,7 @@ msgstr "Obre al visualitzador (el contingut remot està habilitat)"
 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:3924
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Servidor intermediari"
@@ -10296,7 +10405,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:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
+#: src/prefs_account.c:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Na_vega"
@@ -10305,89 +10414,89 @@ msgstr "Na_vega"
 msgid "Select stylesheet"
 msgstr "Selecciona el full d'estil."
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr "La càrrega de contingut remot està inhabilitada."
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr "Carrega les imatges."
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr "Habilita el contingut remot."
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr "Habilita Javascript."
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr "Habilita els connectors."
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr "Habilita el Java."
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
 msgstr "Obre els enllaços amb un navegador extern."
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ha ocorregut un error: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s està malformat o no és un canal d'informació suportat."
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr "Cerca a la xarxa"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr "Obre al visualitzador"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr "Obre al navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr "Obre imatge"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
 msgstr "Copia l'enllaç"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
 msgstr "Descarrega l'enllaç"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr "Desa la imatge com a"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr "Copia la imatge"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr "Importa un canal"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr "Elegant"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr "Visualitzador atractiu d'HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10615,7 +10724,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:1921
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
 msgid "Authentication"
 msgstr "Autenticació"
 
@@ -10674,7 +10783,7 @@ msgstr "Integració de GData"
 #: 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"
 
@@ -10803,8 +10912,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: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:323 src/prefs_account.c:1697
+#: src/prefs_account.c:1855 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "hores"
 
@@ -10885,11 +10994,11 @@ msgstr ""
 "disponible. Deixeu una URL buida per usar la icona de libravatar taronja per "
 "defecte."
 
-#: src/plugins/libravatar/libravatar_prefs.c:397
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "Permet redireccions a _altres llocs."
 
-#: 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"
@@ -10897,25 +11006,25 @@ msgstr ""
 "Segueix les respostes rebudes amb redirecció des del servidor de libravatar "
 "cap a un altre servei d'avatars com ara gravatar.com."
 
-#: src/plugins/libravatar/libravatar_prefs.c:407
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "Habilita els servidors f_ederats."
 
-#: 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 ""
 "Tracta d'aconseguir l'avatar del servidor de libravatar del domini del "
 "remitent."
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr "Demana el límit de temps."
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "segon(s)"
 
-#: 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."
@@ -10923,15 +11032,15 @@ msgstr ""
 "Establiu-ho a 0 per usar el temps d'espera global d'E/S de sòcol. El valor "
 "màxim ha de ser també menor que el temps d'espera d'E/S de sòcols global."
 
-#: src/plugins/libravatar/libravatar_prefs.c:472
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Memòria cau d'icones"
 
-#: src/plugins/libravatar/libravatar_prefs.c:476
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "No s'ha trobat el mode d'icona per defecte."
 
-#: src/plugins/libravatar/libravatar_prefs.c:480
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Xarxa"
 
@@ -11069,7 +11178,7 @@ msgstr "Mètode d'autenticació no disponible"
 msgid "sending error on Sieve session: %s\n"
 msgstr "error d'enviament a la sessió de Sedàs: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
 msgid "_Filter"
 msgstr "_Filtratge"
 
@@ -11128,7 +11237,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - filtre Sedàs %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 "Carregant..."
 
@@ -11201,7 +11310,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Habilita el Sedàs"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr "Informació del servidor"
 
@@ -11253,28 +11362,28 @@ msgstr "Especifiqueu l'autenticació"
 
 #: 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:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 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: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/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
 msgid "Password"
 msgstr "Contrasenya"
 
-#: 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:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr "Mètode d'autenticació"
 
-#: 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/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
 msgid "Automatic"
 msgstr "Automàtic"
@@ -11909,95 +12018,95 @@ msgstr "Format:"
 msgid "Optimized:"
 msgstr "Optimitzat:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "Propietats del PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "Escriviu la contrasenya"
 
-#: 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 "Aquest document està bloquejat i cal una contrasenya per obrir-lo."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1387
 #, c-format
 msgid "%s Document"
 msgstr "%s Document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
 msgstr "de %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 "La representació de PDF ha fallat per un motiu desconegut."
 
-#: 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 "Índex del document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "Primera pàgina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr "Pàgina anterior"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "Pàgina següent"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "Última pàgina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "Augmenta"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "Disminueix"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "Ajusta la pàgina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "Ajusta l'amplada de la pàgina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "Imprimeix el document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "Informació del document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "Número de pàgina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "Factor d'augment"
 
-#: 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 "
@@ -12010,13 +12119,13 @@ msgstr ""
 "\n"
 "Les opinions són benvingudes a 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 "Visualitzador de PDF"
 
-#: 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 "
@@ -12070,19 +12179,34 @@ msgstr "Si us plau. escriviu la contrasenya per a"
 msgid "Bad passphrase.\n"
 msgstr "Contrasenya errònia\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Importa una clau"
 
-#: 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?"
 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 and import it?"
 msgstr ""
-"Aquesta clau no és al vostre anell de claus. Voleu que el Claws Mail intenti "
-"importar-la des d'un servidor de claus?"
+"Aquesta clau no és al clauer. Voleu que el Claws Mail intenti importar-la?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+#| msgid "No"
+msgid "_No"
+msgstr "_No"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "del servidor de claus"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+#| msgid "Create Directory"
+msgid "from Web Key Directory"
+msgstr "del directori de claus web"
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
@@ -12090,15 +12214,15 @@ msgstr ""
 "\n"
 "  clau 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 "   Aquesta clau no és al vostre anell de claus.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   Hauria de ser possible importar-la"
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -12106,17 +12230,21 @@ msgstr ""
 "mentre treballeu amb connexió,\n"
 "   o "
 
-#: src/plugins/pgpcore/pgp_viewer.c:188
+#: src/plugins/pgpcore/pgp_viewer.c:194
+#| msgid ""
+#| "with the following command: \n"
+#| "\n"
+#| "     "
 msgid ""
-"with the following command: \n"
+"with either of the following commands: \n"
 "\n"
 "     "
 msgstr ""
-"amb l'ordre següent: \n"
+"amb qualsevol de les ordres següents: \n"
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -12124,29 +12252,32 @@ msgstr ""
 "\n"
 "  Important l'ID de la clau "
 
-#: 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 "   Aquesta clau s'ha estat importat al vostre anell de claus.\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 "   Aquesta clau no s'ha pogut importar al vostre anell de claus.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Els servidors de claus a vegades són lents.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Podeu intentar importar-la manualment amb l'ordre:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+#| msgid ""
+#| "   You can try to import it manually with the command:\n"
+#| "\n"
+#| "     "
+msgid "   You can try to import it manually with the command:"
+msgstr "   Podeu provar d’importar-la manualment amb l’ordre següent:"
+
+#: src/plugins/pgpcore/pgp_viewer.c:288
+#| msgid "Port"
+msgid "or"
+msgstr "o"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   Aquesta clau és al vostre anell de claus.\n"
 
@@ -12204,8 +12335,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:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minuts"
 
@@ -12832,8 +12963,8 @@ msgstr "Mostra la consola de Python"
 msgid "Refresh"
 msgstr "Refresca"
 
-#: 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/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
 msgid "Browse"
 msgstr "Navega"
@@ -13021,7 +13152,7 @@ msgstr "Refresca tots els canals"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
-msgstr "Subscriviu-vos al feed"
+msgstr "Subscriviu-vos al canal"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
@@ -13168,7 +13299,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: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/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dies"
 
@@ -13295,7 +13426,7 @@ msgstr "No s'ha pogut crear la carpeta per al canal nou \"%s\"."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
-msgstr "Subscriure's el nou canal?"
+msgstr "Us voleu subscriure a un canal nou?"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
 msgid "Feed folder:"
@@ -13879,45 +14010,45 @@ msgstr "Accepta provisionalment"
 msgid "Decline"
 msgstr "Refusa"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr "Teniu un element pendent."
 
-#: 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:718
 msgid "Details follow:"
 msgstr "Aquests en són els detalls:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "Heu creat una reunió."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr "Heu estat convidat a una reunió."
 
-#: 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 "Una reunió a la qual heu estat convidat ha estat cancel·lada."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr "Us han reenviat una cita."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr "(aquest esdeveniment es repeteix)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr "(aquest esdeveniment forma part d'un de recurrent)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Heu rebut una resposta a una proposta de reunió desconeguda."
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13926,35 +14057,35 @@ msgstr ""
 "Heu rebut una resposta a una proposta de reunió.\n"
 "%s ha %s la invitació amb els següents detalls:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr "Error - No es pot obtenir la secció MIME del calendari."
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr "Error - No s'ha trobat la secció de calendari."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr "Error - Tipus de component de calendari desconegut."
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
 msgstr "Envia una notificació als assistents"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr "Cancel·la la reunió"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Segur que voleu cancel·lar aquesta reunió?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr "No s'ha trobat cap compte"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13962,68 +14093,68 @@ msgstr ""
 "No teniu cap compte que coincideixi amb cap assitent.\n"
 "Voleu respondre tanmateix?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr "Respon tanmateix"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr "Respon"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr "Edita la reunió..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr "Cancel·la la reunió..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr "Obre'n el lloc web"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr "Ja esteu ocupat en aquesta hora."
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Esdeveniment:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organitzador:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Ubicació:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Sumari:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr "Inici:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr "Final:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Assitents:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr "Acció:"
 
@@ -14647,95 +14778,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:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "Error del protocol POP\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "resposta UIDL no vàlida: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: se suprimeix el missatge caducat %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, 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:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "la bústia està bloquejada\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "Excedit el temps d'espera de la sessió\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "ordre no suportada\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "hi ha hagut un error a la sessió POP\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "ordre TOP no suportada\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr "Notícies (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Fitxer de bústia local"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr "Cap (només SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr "Nom del compte"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
 msgstr "Estableix com a predeterminat"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr "Informació personal"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
 msgstr "Adreça de correu"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Configura automàticament"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14743,77 +14874,82 @@ 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:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr "Aquest servidor requereix autenticació."
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr "Autentica en connectar."
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr "Servidor de notícies"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr "Servidor de recepció"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr "Bústia local"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr "Usa una ordre de correu enlloc del servidor SMTP."
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr "ordre per enviar els correus"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr "Bústia d'entrada per defecte"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Els missatges sense filtrar es desaran en aquesta carpeta."
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
-msgstr "Usa l'autenticació segura (APOP)"
+#: src/prefs_account.c:1634
+#| msgid "Authenticate on connect"
+msgid "Authenticate before POP connection"
+msgstr "Autentiqueu-vos abans de la connexió POP"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1658 src/prefs_account.c:2259
+msgid "Select"
+msgstr "Selecciona"
+
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr "Suprimeix els missatges del servidor quan s'hagin rebut."
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr "Suprimeix després de"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dies i 0 hores: suprimeix immediatament"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr "Límit de la mida de recepció"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14821,94 +14957,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:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr "Nombre màxim d'articles per descarregar"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr "sense límit si s'especifica 0"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr "Text pla"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr "Directori del servidor IMAP"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr "(normalment buït)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
 msgstr "Mostra només les carpetes subscrites."
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1831
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mode d'ample de banda eficient (evita recuperar etiquetes remotes)"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1833
 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:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Verificació automàtica"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr "Usa els paràmetres globals"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Comprova si hi ha missatges nous cada"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr "Filtra els missatges durant la recepció."
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permet filtrar usant connectors durant la recepció."
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1908
 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:1894 src/prefs_customheader.c:210
+#: 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
 msgid "Header"
 msgstr "Capçalera"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr "Genera Missatge-ID"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
 msgstr "Envia l'adreça de correu dins l'ID del missatge"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr "Afegeix un capçalera d'agent d'usuari"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr "Afegeix capçaleres d'usuari"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticació SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14916,173 +15052,221 @@ msgstr ""
 "Si deixeu aquests camps buits, s'usarà el mateix ID d'usuari i contrasenya "
 "usats per a la recepció."
 
-#: src/prefs_account.c:2033
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr "Autentica amb POP abans d'enviar."
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr "Esgotament del temps d'espera de l'autenticació de POP"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2233
+#| msgid "Authentication"
+msgid "Authorization"
+msgstr "Autorització"
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr "Seleccioneu el proveïdor de serveis de correu electrònic d'OAuth2."
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr "ID del client"
+
+#: src/prefs_account.c:2296
+msgid "Client secret"
+msgstr "Secret del client"
+
+#: src/prefs_account.c:2328
+#| msgid "GData plugin: Authorization successful\n"
+msgid "Obtain authorization code"
+msgstr "Obteniu el codi d’autorització"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr "Obre el navegador predeterminat amb la sol·licitud"
+
+#: src/prefs_account.c:2338
+msgid "Copy link"
+msgstr "Copia l'enllaç"
+
+#: src/prefs_account.c:2350
+msgid "Authorization code"
+msgstr "Codi d'autorització"
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr ""
+"Enganxeu l'URL complet del navegador o del testimoni d'autorització "
+"proporcionat."
+
+#: src/prefs_account.c:2364
+msgid "Complete authorization"
+msgstr "Completeu l'autorització"
+
+#: src/prefs_account.c:2368
+msgid "Authorize"
+msgstr "Autoritza"
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr "Signatura"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
 msgstr "Insereix la signatura automàticament."
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr "Separador de signatura"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr "Sortida de l'ordre"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
 msgstr "Estableix les adreces següents automàticament."
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr "Diccionaris de correcció ortogràfica"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Diccionari per defecte"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Diccionari alternatiu per defecte"
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Escriu"
 
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Respon"
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: 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
 msgid "Forward"
 msgstr "Reenvia"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr "Sistema de privacitat per defecte"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Sempre missatges signats"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Sempre missatges encriptats"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2792
 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:2476
+#: src/prefs_account.c:2795
 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:2479
+#: src/prefs_account.c:2798
 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:2481
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr "Desa els missatges encriptats enviats com a text clar."
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
 msgid "Don't use SSL/TLS"
 msgstr "No usis SSL/TLS"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: 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 "Usa SSL/TLS"
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Usa l'ordre d'STARTTLS per obrir la sessió encriptada"
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr "Envia (SMTP)"
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:3004
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "No usis SSL/TLS (però usa STARTTLS si és necessari)"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr "Certificats del client"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr "Certificat per a la recepció"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificat de client com a fitxer PKCS12 o PEM"
 
-#: src/prefs_account.c:2732
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr "Certificat per enviar"
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Accepta automàticament els certificats d'SSL/TLS vàlids."
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr "Usa SSL/TLS sense bloqueig"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3106
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Desactiveu això si teniu problemes de connexió d'SSL/TLS."
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Usa un servidor intermediari"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3207
 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:2890
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
 msgstr "Usa els paràmetres globals del servidor intermediari."
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Usa autenticació."
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
 msgstr "Usa el servidor intermediari per a l'enviament."
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15091,27 +15275,27 @@ msgstr ""
 "servidor de sortida configurat, ignorant qualsevol servidor intermediari "
 "configurat."
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr "Port POP"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr "Port IMAP"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr "Nom del domini"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15119,148 +15303,153 @@ msgstr ""
 "El nom del domini s'usarà al Message-ID generat i en connectar a servidors "
 "SMTP."
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr "Usa una ordre per comunicar-se amb el servidor"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3451
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marca els missatges creuats com a llegits i acoloreix-los:"
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr "Posa els missatges enviats a"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr "Posa els missatges de la cua a"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr "Posa els esborranys a"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr "Posa els missatges suprimits a"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr "No s'ha especificat el nom del compte."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
 msgstr "No s'ha especificat l'adreça de correu."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr "No s'ha especificat el servidor SMTP."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr "No s'ha especificat l'usuari."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr "No s'ha especificat el servidor POP."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr "La bústia d'entrada per defecte no existeix."
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr "No s'ha especificat el servidor IMAP."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr "No s'ha especificat el servidor NNTP."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3626
 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:3313
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
 msgstr "no s'ha especificat l'ordre de correu."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3642
 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:3328
+#: src/prefs_account.c:3647
 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:3356
+#: src/prefs_account.c:3678
 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:3361
+#: src/prefs_account.c:3683
 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:3437
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr "no se n'ha especificat el domini."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr "no s'ha seleccionat la capeta d'enviats."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr "no s'ha seleccionat la carpeta de cua."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr "no s'ha seleccionat la carpeta d'esborranys."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "no s'ha seleccionat la carpeta de paperera."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr "Rep"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+#| msgid "Author"
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantilles"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr "Privacitat"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr "Preferències per a un compte nou"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferències del compte"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Ha fallat (adreça incorrecta)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr "Selecciona un fitxer de signatura"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Selecciona un fitxer de certificat"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (mòdul no carregat)"
@@ -15532,7 +15721,7 @@ msgstr ""
 "t{Per a: %t\\n}?c{Cc: %c\\n}?n{Grups de notícies: %n\\n}?s{Assumpte: %s"
 "\\n}\\n\\n%M"
 
-#: src/prefs_common.c:456
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15757,8 +15946,8 @@ msgstr ""
 "missatge a través d'un script quan useu l'opció del menú contextual \"Mostra-"
 "ho com a text\"."
 
-#: 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:180
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Vista de missatge"
 
@@ -16306,27 +16495,46 @@ msgstr "Lletres"
 msgid "Preferences"
 msgstr "Preferències"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Mostra les imatges adjuntes automàticament."
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr "Redimensiona les imatges adjuntes per defecte."
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
 msgstr "Clicar a la imatge en commuta l'escala."
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:96
+msgid "Fit image"
+msgstr "Ajusta la imatge"
+
+#: src/prefs_image_viewer.c:99
+#| msgid "Clicking image toggles scaling"
+msgid "Right-clicking image toggles fitting height/width"
+msgstr ""
+"Clicant amb el botó dret a la imatge es commuta l'ajust de l'alçària i "
+"l'amplada"
+
+#: src/prefs_image_viewer.c:102
+msgid "Height"
+msgstr "Alçària"
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr "Amplada"
+
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr "Mostra les imatges inserides."
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr "Imprimeix les imatges"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr "Visualitzador d'imatges"
 
@@ -16534,11 +16742,11 @@ msgstr "missatge complet"
 # RML I think this is ambiguous:
 # RML on filtering is a verb ("Marcar") while in summary colunm it's really
 # RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr "Marcat"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr "Suprimit"
 
@@ -16546,11 +16754,11 @@ msgstr "Suprimit"
 msgid "Replied"
 msgstr "Respost"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr "Reenviat"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Correu brossa"
@@ -16559,7 +16767,7 @@ msgstr "Correu brossa"
 msgid "Has attachment"
 msgstr "Té adjunts"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr "Signat"
 
@@ -16839,83 +17047,92 @@ msgstr ""
 msgid "Current condition rules"
 msgstr "Regles de condició actuals"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Capçaleres"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "Mostra un plafó de capçaleres sobre la vista de missatge."
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr "Mostrar (X-)Face a la vista de missatge."
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "Desa (X-)Cara a la llibreta d'adreces si és possible."
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr "Mostra Face a la vista de missatge."
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+#| msgid "Find address book email duplicates"
+msgid "Save Face in address book if possible"
+msgstr "Desa la Cara a la llibreta d'adreces si és possible"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "Mostra les capçaleres a la vista de missatge."
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "Missatges HTML"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "Representa els missatges HTML com si fossin de text."
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Mostra els missatges només d'HTML amb un connector si és possible."
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Selecciona la secció HTML de missatges multisecció / alternatius."
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Interlineat"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "píxels"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Desplaçament"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Mitja pàgina"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Desplaçament suau"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Pas"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Mostra descripcions dels adjunts (enlloc de noms)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Citació"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Replega el text citat amb un doble clic."
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Tracta aquests caràcters com a cometes altes."
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Opcions de text"
 
@@ -17585,8 +17802,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:520 src/send_message.c:524
-#: src/send_message.c:529
+#: src/prefs_send.c:420 src/send_message.c:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "Enviant"
 
@@ -17977,7 +18194,7 @@ msgstr "Afegeix la plantilla nova a sobre de la llista"
 #: src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr ""
-"Susbtitueix la plantilla seleccionada a la llista per la plantilla de dalt"
+"Substitueix la plantilla seleccionada a la llista per la plantilla de dalt"
 
 #: src/prefs_template.c:328
 msgid "Delete the selected template from the list"
@@ -18390,7 +18607,7 @@ msgstr "No s'ha establert cap clau de receptor."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Error descodificant BASE64]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr "No s'ha pogut descodificar la part"
 
@@ -18754,88 +18971,88 @@ msgstr "Introduïu text per reemplaçar \"%s\""
 msgid "Enter variable"
 msgstr "Insereix una variable"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviant el missatge usant l'ordre %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "No s'ha pogut executar l'ordre: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "S'ha produït un error executant l'ordre: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "Connectant"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "Fent POP abans de SMTP..."
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "POP abans de SMTP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Compte \"%s\": connectant al servidor SMTP: %s:%d..."
 
-#: src/send_message.c:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "Missatge enviat correctament."
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "Enviant HELO..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "Autenticant"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "Enviant el missatge..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "Enviant EHLO..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "Enviant MAIL FROM..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "Enviant RCPT TO..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "Enviant DATA..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "Sortint..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviant el missatge (%d / %d bytes)"
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "Enviant el missatge"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "Hi ha hagut un error enviant el missatge."
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19138,92 +19355,92 @@ msgstr "Des de: %s, %s"
 msgid "To: %s, on %s"
 msgstr "Per a: %s, %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr "No sou l'autor de l'article."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4574
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Realment voleu suprimir el missatge seleccionat?"
 msgstr[1] "Realment voleu suprimir els %d missatges seleccionats?"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Suprimeix el missatge"
 msgstr[1] "Suprimeix els missatges"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr "La destinació és la mateixa que la carpeta actual."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4796
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Seleccioneu una carpeta per desplaçar-hi el missatge seleccionat."
 msgstr[1] ""
 "Seleccioneu una carpeta per desplaçar-hi els missatges seleccionats."
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr "La destinació de la còpia és la mateixa carpeta actual."
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4881
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Seleccioneu una carpeta per copiar-hi el missatge seleccionat."
 msgstr[1] "Seleccioneu una carpeta per copiar-hi els missatges seleccionats."
 
-#: src/summaryview.c:5036
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr "Afegeix o sobreescriu"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr "Voleu afegir o sobreescriure el fitxer existent?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr "_Afegeix"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr "_Sobreescriu"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No s'ha pogut desar el fitxer \"%s\"."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5090
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Esteu a punt d'imprimir %d missatges, un a un. Voleu continuar?"
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr "Construint els fils..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr "Salta't aquestes regles"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5799
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplica aquestes regles independentment del compte a què pertanyin"
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5802
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplica aquestes regles si s'apliquen al compte actual"
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr "Filtratge"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19231,75 +19448,75 @@ msgstr ""
 "Hi ha algunes regles de filtratge que pertanyen a un compte.\n"
 "Si us plau, trieu què s'ha de fer amb aquestes regles:"
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr "Filtrant..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr "Configuració de processament"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6095
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Realment voleu restablir l'etiqueta de color de tots els missatges "
 "seleccionats?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6097
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Realment voleu aplicar aquesta etiqueta de color a tots els missatges "
 "seleccionats?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Reset color label"
 msgstr "Restableix el color de l'etiqueta"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Set color label"
 msgstr "Estableix l'etiqueta de color"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr "Fil ignorat"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr "Fil vist"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Respost però també reenviat. Cliqueu per veure'n la resposta."
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr "Respost. Cliqueu per veure'n la resposta."
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr "Per desplaçar"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr "Per copiar"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr "Signat, té adjunt(s)"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr "Encriptat, té adjunt(s)"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr "Encriptat"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr "Té adjunt(s)"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19308,11 +19525,11 @@ msgstr ""
 "Error de l'expressió regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8402
 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:8403
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr "Torna a la llista de carpetes"
 
@@ -20132,6 +20349,9 @@ msgstr ""
 "El Claws Mail ja està a punt.\n"
 "Feu clic a Desa per començar."
 
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Usa l'autenticació segura (APOP)"
+
 #~ msgid ""
 #~ "  --select folder[/msg]  jumps to the specified folder/message\n"
 #~ "                         folder is a folder id like 'folder/sub_folder'"
diff --git a/po/cs.po b/po/cs.po
index 3edae6ec8..2f6e3fb54 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: 2020-02-17 12:21+0000\n"
-"PO-Revision-Date: 2020-02-15 23:03+0100\n"
+"POT-Creation-Date: 2021-07-03 09:15+0100\n"
+"PO-Revision-Date: 2021-07-04 12:53+0200\n"
 "Last-Translator: David Vachulka <david at konstrukce-cad.com>\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.2.4\n"
+"X-Generator: Poedit 2.3\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -45,64 +45,161 @@ msgstr ""
 "zde uvedeny. Zaškrtnutím ve sloupci 'P' určíte, zda účet bude touto funkcí "
 "zpracován. Tučný text značí aktuální účet."
 
-#: src/account.c:823
+#: src/account.c:822
 msgid " _Set as default account "
 msgstr " Nastavit účet jako _výchozí "
 
-#: src/account.c:915
+#: src/account.c:829 src/action.c:1405 src/addrduplicates.c:843
+#: src/addressadd.c:601 src/addressbook.c:427 src/addressbook.c:1437
+#: src/addressbook.c:3258 src/addressbook.c:3309 src/addressbook.c:4176
+#: src/addressbook.c:4182 src/addressbook.c:4298 src/addrindex.c:1836
+#: src/alertpanel.c:129 src/alertpanel.c:193 src/browseldap.c:301
+#: src/compose.c:631 src/exphtmldlg.c:293 src/expldifdlg.c:323
+#: src/gtk/about.c:912 src/gtk/gtkutils.c:90 src/gtk/icon_legend.c:184
+#: src/gtk/pluginwindow.c:391 src/gtk/prefswindow.c:509
+#: src/gtk/sslcertwindow.c:374 src/importldif.c:438 src/inc.c:841
+#: src/message_search.c:320 src/messageview.c:225
+#: src/plugins/managesieve/sieve_editor.c:88
+#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_manager.c:785
+#: src/plugins/pdf_viewer/poppler_viewer.c:1228
+#: src/plugins/pgpcore/sgpgme.c:815 src/prefs_actions.c:887
+#: src/prefs_actions.c:892 src/prefs_actions.c:918 src/prefs_filtering.c:1465
+#: src/prefs_filtering.c:1487 src/prefs_filtering.c:1509
+#: src/prefs_matcher.c:2162 src/prefs_template.c:567 src/prefs_template.c:592
+#: src/prefs_template.c:597 src/summary_search.c:785
+msgid "_Close"
+msgstr "_Zavřít"
+
+#: src/account.c:914
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 "Účty se vzdáleně umístěnými složkami (např. IMAP) nemohou být kopírovány."
 
-#: src/account.c:922
+#: src/account.c:921
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie %s"
 
-#: src/account.c:1119
+#: src/account.c:1125
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Opravdu chcete odstranit účet '%s'?"
 
-#: src/account.c:1121
+#: src/account.c:1127
 msgid "(Untitled)"
 msgstr "(Nepojmenovaný)"
 
-#: src/account.c:1122
+#: src/account.c:1128
 msgid "Delete account"
 msgstr "Odstranit účet"
 
-#: src/account.c:1596
+#: src/account.c:1129 src/addrcustomattr.c:162 src/addrcustomattr.c:187
+#: src/addrcustomattr.c:495 src/addrduplicates.c:147 src/addrduplicates.c:793
+#: src/addressadd.c:300 src/addressbook.c:1483 src/addressbook.c:1490
+#: src/addressbook.c:2957 src/addressbook.c:2969 src/addressbook.c:2982
+#: src/addressbook.c:2989 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3681 src/compose.c:3809 src/compose.c:5115 src/compose.c:5152
+#: src/compose.c:5189 src/compose.c:5232 src/compose.c:5796 src/compose.c:5859
+#: src/compose.c:6091 src/compose.c:9516 src/compose.c:10694
+#: src/compose.c:10699 src/compose.c:10773 src/compose.c:11665
+#: src/compose.c:12183 src/editaddress.c:172 src/editaddress.c:815
+#: src/editaddress.c:820 src/editbook.c:196 src/editgroup.c:407
+#: src/editjpilot.c:305 src/editldap_basedn.c:238 src/editldap.c:362
+#: src/edittags.c:222 src/edittags.c:258 src/editvcard.c:203
+#: src/exphtmldlg.c:603 src/exphtmldlg.c:678 src/expldifdlg.c:671
+#: src/expldifdlg.c:747 src/export.c:174 src/foldersel.c:350
+#: src/folderview.c:2480 src/folderview.c:2538 src/grouplistdialog.c:241
+#: src/gtk/foldersort.c:243 src/gtk/gtkaspell.c:1513 src/gtk/inputdialog.c:368
+#: src/gtk/prefswindow.c:504 src/gtk/progressdialog.c:97 src/imap.c:1178
+#: src/imap_gtk.c:369 src/imap_gtk.c:515 src/imap_gtk.c:574 src/import.c:173
+#: src/import.c:204 src/importldif.c:923 src/importldif.c:989
+#: src/importmutt.c:250 src/importpine.c:249 src/inc.c:888 src/main.c:2249
+#: src/mainwindow.c:4000 src/mainwindow.c:4202 src/mbox.c:552
+#: src/messageview.c:2065 src/messageview.c:2076 src/mh_gtk.c:207
+#: src/mh_gtk.c:375 src/mimeview.c:1905 src/mimeview.c:1930 src/mimeview.c:2355
+#: src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:214
+#: src/plugins/archive/archiver_gtk.c:117
+#: src/plugins/archive/archiver_gtk.c:575
+#: src/plugins/archive/archiver_gtk.c:622
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1046
+#: src/plugins/att_remover/att_remover.c:388
+#: src/plugins/att_remover/att_remover.c:430
+#: src/plugins/attachwarner/attachwarner.c:217
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
+#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:334
+#: src/plugins/managesieve/sieve_editor.c:336
+#: src/plugins/managesieve/sieve_editor.c:434
+#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_manager.c:330
+#: src/plugins/notification/notification_foldercheck.c:590
+#: src/plugins/notification/notification_trayicon.c:550
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:157
+#: src/plugins/rssyl/rssyl_cb_menu.c:323
+#: src/plugins/rssyl/rssyl_feed_props.c:492
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1058
+#: src/plugins/vcalendar/vcal_folder.c:1997
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:217
+#: src/prefs_actions.c:702 src/prefs_actions.c:723 src/prefs_customheader.c:177
+#: src/prefs_customheader.c:693 src/prefs_display_header.c:246
+#: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
+#: src/prefs_filtering.c:1194 src/prefs_filtering.c:1213
+#: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1761
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:287
+#: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
+#: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
+#: src/prefs_themes.c:596 src/send_message.c:294 src/ssl_manager.c:448
+#: src/summaryview.c:1327 src/summaryview.c:4550 src/summaryview.c:5012
+#: src/summaryview.c:5066 src/summaryview.c:5805 src/textview.c:2881
+#: src/toolbar.c:3054 src/wizard.c:1814
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: src/account.c:1129 src/addrcustomattr.c:216 src/addressbook.c:437
+#: src/addressbook.c:462 src/addressbook.c:479 src/edittags.c:285
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1313
+#: src/plugins/mailmbox/plugin_gtk.c:334
+#: src/plugins/managesieve/sieve_manager.c:330
+#: src/plugins/vcalendar/vcal_folder.c:1997 src/prefs_actions.c:1077
+#: src/prefs_customheader.c:693 src/prefs_filtering.c:1681
+#: src/prefs_template.c:1105 src/summaryview.c:4550
+msgid "_Delete"
+msgstr "_Odstranit"
+
+#: src/account.c:1602
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "P"
 
-#: src/account.c:1602
+#: src/account.c:1608
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 "Funkce 'Přijmout poštu ze všech účtů' načte zprávy z účtů označených "
 "zaškrtnutím"
 
-#: src/account.c:1609 src/addrduplicates.c:472 src/addressadd.c:223
-#: src/addressbook.c:128 src/compose.c:7473 src/editaddress.c:1474
-#: src/editaddress.c:1503 src/editaddress.c:1519
-#: src/editaddress_other_attributes_ldap.c:371
-#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
-#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
-#: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
+#: src/account.c:1615 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:128 src/compose.c:7467 src/editaddress.c:1475
+#: src/editaddress.c:1497 src/editaddress.c:1516
+#: src/editaddress_other_attributes_ldap.c:369
+#: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
+#: src/editgroup.c:288 src/editjpilot.c:255 src/editldap.c:426
+#: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
-#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:385
-#: src/prefs_filtering.c:1875 src/prefs_summaries.c:477 src/prefs_template.c:79
-#: src/prefs_themes.c:990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1849
+#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1854 src/prefs_summaries.c:477 src/prefs_template.c:78
+#: src/prefs_themes.c:993
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1623 src/prefs_account.c:1267 src/prefs_account.c:4955
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1625 src/ssl_manager.c:109
+#: src/account.c:1631 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -153,7 +250,8 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
+#: src/action.c:999 src/compose.c:5265 src/compose.c:5270 src/compose.c:9669
+#: src/compose.c:9708 src/ldaputil.c:333
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -163,25 +261,25 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: src/action.c:1218 src/action.c:1390
+#: src/action.c:1218 src/action.c:1395
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: src/action.c:1254
+#: src/action.c:1255
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Spuštěno: %s\n"
 
-#: src/action.c:1258
+#: src/action.c:1259
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončeno: %s\n"
 
-#: src/action.c:1304
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr "Vstup/výstup akce"
 
-#: src/action.c:1636
+#: src/action.c:1641
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -192,11 +290,11 @@ msgstr ""
 "('%%h' bude nahrazeno parametrem)\n"
 "  %s"
 
-#: src/action.c:1641
+#: src/action.c:1646
 msgid "Action's hidden user argument"
 msgstr "Skrytý uživatelský parametr akce"
 
-#: src/action.c:1645
+#: src/action.c:1650
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -207,7 +305,7 @@ msgstr ""
 "('%%u' bude nahrazeno parametrem)\n"
 "  %s"
 
-#: src/action.c:1650
+#: src/action.c:1655
 msgid "Action's user argument"
 msgstr "Uživatelský parametr akce"
 
@@ -223,72 +321,72 @@ msgstr "Nelze kopírovat knihu adres do sebe sama."
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "Nelze přesunout složku do sebe sama nebo do své vlastní podsložky."
 
-#: src/addr_compl.c:689 src/addressbook.c:5018
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/addr_compl.c:699 src/addressbook.c:5006
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addrcustomattr.c:65
+#: src/addrcustomattr.c:64
 msgid "date of birth"
 msgstr "datum narození"
 
-#: src/addrcustomattr.c:66
+#: src/addrcustomattr.c:65
 msgid "address"
 msgstr "adresa"
 
-#: src/addrcustomattr.c:67
+#: src/addrcustomattr.c:66
 msgid "phone"
 msgstr "telefon"
 
-#: src/addrcustomattr.c:68
+#: src/addrcustomattr.c:67
 msgid "mobile phone"
 msgstr "mobilní telefon"
 
-#: src/addrcustomattr.c:69
+#: src/addrcustomattr.c:68
 msgid "organization"
 msgstr "organizace"
 
-#: src/addrcustomattr.c:70
+#: src/addrcustomattr.c:69
 msgid "office address"
 msgstr "pracovní adresa"
 
-#: src/addrcustomattr.c:71
+#: src/addrcustomattr.c:70
 msgid "office phone"
 msgstr "telefon práce"
 
-#: src/addrcustomattr.c:72
+#: src/addrcustomattr.c:71
 msgid "fax"
 msgstr "fax"
 
-#: src/addrcustomattr.c:73
+#: src/addrcustomattr.c:72
 msgid "website"
 msgstr "domovská stránka"
 
-#: src/addrcustomattr.c:146
+#: src/addrcustomattr.c:145
 msgid "Attribute name"
 msgstr "Název atributu"
 
-#: src/addrcustomattr.c:161
+#: src/addrcustomattr.c:160
 msgid "Delete all attribute names"
 msgstr "Odstranit všechna jména atributů"
 
-#: src/addrcustomattr.c:162
+#: src/addrcustomattr.c:161
 msgid "Do you really want to delete all attribute names?"
 msgstr "Opravdu chcete odstranit všechna jména atributů?"
 
-#: src/addrcustomattr.c:186
+#: src/addrcustomattr.c:185
 msgid "Delete attribute name"
 msgstr "Odstranit jméno atributu"
 
-#: src/addrcustomattr.c:187
+#: src/addrcustomattr.c:186
 msgid "Do you really want to delete this attribute name?"
 msgstr "Opravdu chcete odstranit jméno atributu?"
 
-#: src/addrcustomattr.c:196
+#: src/addrcustomattr.c:195
 msgid "Reset to default"
 msgstr "Nastavit jako výchozí"
 
-#: src/addrcustomattr.c:197
+#: src/addrcustomattr.c:196
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
@@ -296,36 +394,97 @@ msgstr ""
 "Opravdu chcete nahradit všechna jména atributů\n"
 "výchozím nastavením?"
 
-#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
-#: src/addressbook.c:484 src/edittags.c:286
-#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
-msgid "_Delete"
-msgstr "_Odstranit"
-
-#: 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:197 src/compose.c:9783 src/exphtmldlg.c:181
+#: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
+#: src/file_checker.c:107 src/folderview.c:880 src/folderview.c:1102
+#: src/folderview.c:2526 src/folderview.c:2628 src/inc.c:1668 src/main.c:407
+#: src/mainwindow.c:2868 src/mainwindow.c:2873 src/message_search.c:335
+#: src/plugins/libravatar/libravatar_prefs.c:175
+#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:708
+#: src/plugins/pgpcore/sgpgme.c:899 src/plugins/pgpcore/sgpgme.c:1021
+#: src/plugins/vcalendar/vcalendar.c:961 src/prefs_migration.c:61
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/prefs_themes.c:573
+#: src/summary_search.c:796 src/summaryview.c:1327 src/summaryview.c:1940
+#: src/summaryview.c:1988 src/summaryview.c:2025 src/summaryview.c:2073
+#: src/summaryview.c:2107 src/summaryview.c:2140 src/summaryview.c:2174
+#: src/summaryview.c:2203 src/summaryview.c:4264 src/summaryview.c:4310
+#: src/summaryview.c:6072 src/toolbar.c:3034
+msgid "_No"
+msgstr "_Ne"
+
+#: src/addrcustomattr.c:197 src/compose.c:9783 src/compose.c:12183
+#: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:880
+#: src/folderview.c:1102 src/folderview.c:2526 src/folderview.c:2628
+#: src/inc.c:1668 src/main.c:407 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/plugins/pgpcore/select-keys.c:708 src/plugins/pgpcore/sgpgme.c:899
+#: src/plugins/pgpcore/sgpgme.c:1021 src/plugins/vcalendar/vcalendar.c:122
+#: src/plugins/vcalendar/vcalendar.c:961 src/prefs_migration.c:61
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/prefs_themes.c:573
+#: src/summary_search.c:796 src/summaryview.c:1327 src/summaryview.c:1940
+#: src/summaryview.c:1988 src/summaryview.c:2025 src/summaryview.c:2073
+#: src/summaryview.c:2107 src/summaryview.c:2140 src/summaryview.c:2174
+#: src/summaryview.c:2203 src/summaryview.c:4264 src/summaryview.c:4310
+#: src/summaryview.c:5066 src/summaryview.c:6072 src/toolbar.c:3034
+msgid "_Yes"
+msgstr "_Ano"
+
+#: src/addrcustomattr.c:217 src/edittags.c:286 src/prefs_actions.c:1078
+#: src/prefs_filtering.c:1682 src/prefs_template.c:1106
 msgid "Delete _all"
 msgstr "Odstranit _vše"
 
-#: src/addrcustomattr.c:219
+#: src/addrcustomattr.c:218
 msgid "_Reset to default"
 msgstr "_Nastavit výchozí hodnoty"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:407
 msgid "Attribute name is not set."
 msgstr "Není nastaven název atributu."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:466
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Upravit jméno atributu"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:480
 msgid "New attribute name:"
 msgstr "Název nového atributu:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:496 src/addressadd.c:301
+#: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:363
+#: src/compose.c:5859 src/compose.c:9517 src/editaddress.c:172
+#: src/editaddress.c:816 src/editaddress.c:821 src/editbook.c:197
+#: src/editgroup.c:408 src/editjpilot.c:306 src/editldap_basedn.c:239
+#: src/editldap.c:363 src/editvcard.c:204 src/export.c:175 src/foldersel.c:351
+#: src/grouplistdialog.c:242 src/gtk/foldersort.c:244 src/gtk/gtkaspell.c:1514
+#: src/gtk/inputdialog.c:369 src/gtk/prefswindow.c:505 src/import.c:174
+#: src/import.c:204 src/importmutt.c:251 src/importpine.c:250 src/main.c:2249
+#: src/mimeview.c:1906 src/password_gtk.c:215
+#: src/plugins/archive/archiver_gtk.c:575
+#: src/plugins/archive/archiver_gtk.c:622
+#: src/plugins/archive/archiver_gtk.c:749
+#: src/plugins/archive/archiver_gtk.c:1048
+#: src/plugins/att_remover/att_remover.c:389
+#: src/plugins/gdata/cm_gdata_contacts.c:137
+#: src/plugins/managesieve/sieve_editor.c:632
+#: src/plugins/notification/notification_foldercheck.c:591
+#: src/plugins/notification/notification_trayicon.c:550
+#: src/plugins/pgpcore/passphrase.c:123
+#: src/plugins/rssyl/rssyl_feed_props.c:509
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1789
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1913 src/prefs_actions.c:218
+#: src/prefs_customheader.c:178 src/prefs_display_header.c:247
+#: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
+#: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
+#: src/prefs_summaries.c:288 src/prefs_summary_column.c:356
+#: src/prefs_summary_open.c:182 src/prefs_template.c:400
+msgid "_OK"
+msgstr "_OK"
+
+#: src/addrcustomattr.c:517
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -358,7 +517,7 @@ msgstr "Nebyly nalezeny žádné duplikované adresy v knize adres"
 msgid "Duplicate email addresses"
 msgstr "Duplikovat emailovou adresu(y)"
 
-#: src/addrduplicates.c:443 src/addressadd.c:235
+#: src/addrduplicates.c:443 src/addressadd.c:233
 #: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
 #: src/toolbar.c:529
 msgid "Address"
@@ -368,11 +527,11 @@ msgstr "Adresa"
 msgid "Address book path"
 msgstr "Cesta ke knize adres"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1445 src/addressbook.c:1498
+#: src/addrduplicates.c:791 src/addressbook.c:1435 src/addressbook.c:1488
 msgid "Delete address(es)"
 msgstr "Odstranit adresu(y)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1499
+#: src/addrduplicates.c:792 src/addressbook.c:1489
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete odstranit tuto adresu(y)?"
 
@@ -380,28 +539,28 @@ msgstr "Opravdu chcete odstranit tuto adresu(y)?"
 msgid "Delete address"
 msgstr "Odstranit adresu(y)"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1446
+#: src/addrduplicates.c:842 src/addressbook.c:1436
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Tato data jsou pouze pro čtení a nelze je odstranit."
 
-#: src/addressadd.c:192 src/prefs_filtering_action.c:195
+#: src/addressadd.c:190 src/prefs_filtering_action.c:193
 msgid "Add to address book"
 msgstr "Přidat do knihy adres"
 
-#: src/addressadd.c:215
+#: src/addressadd.c:213
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/addressadd.c:246 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1302 src/editgroup.c:292
+#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1256
+#: src/editaddress.c:1301 src/editgroup.c:290
 msgid "Remarks"
 msgstr "Poznámky"
 
-#: src/addressadd.c:289 src/addressbook_foldersel.c:158
+#: src/addressadd.c:288 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro knihu adres"
 
-#: src/addressadd.c:599 src/addressbook.c:3268 src/addressbook.c:3319
+#: src/addressadd.c:599 src/addressbook.c:3256 src/addressbook.c:3307
 msgid "Add address(es)"
 msgstr "Přidat adresu(y)"
 
@@ -409,8 +568,8 @@ msgstr "Přidat adresu(y)"
 msgid "Can't add the specified address"
 msgstr "Nebylo možno přidat zadanou adresu"
 
-#: src/addressbook.c:129 src/addressbook.c:5006 src/editaddress.c:1247
-#: src/editaddress.c:1285 src/editgroup.c:291 src/expldifdlg.c:517
+#: src/addressbook.c:129 src/addressbook.c:4994 src/editaddress.c:1245
+#: src/editaddress.c:1282 src/editgroup.c:289 src/expldifdlg.c:507
 #: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
 msgstr "E-mail"
@@ -419,257 +578,241 @@ msgstr "E-mail"
 msgid "_Book"
 msgstr "_Kniha"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
+#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
+#: src/addressbook.c:478 src/compose.c:610 src/mainwindow.c:517
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "Ú_pravy"
 
-#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:615 src/mainwindow.c:520
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
-#: src/messageview.c:216
-msgid "_Help"
-msgstr "Nápo_věda"
-
-#: src/addressbook.c:411 src/addressbook.c:469
+#: src/addressbook.c:410 src/addressbook.c:464
 msgid "New _Book"
 msgstr "Nová _kniha"
 
-#: src/addressbook.c:412 src/addressbook.c:470
+#: src/addressbook.c:411 src/addressbook.c:465
 msgid "New _Folder"
 msgstr "Nová _složka"
 
-#: src/addressbook.c:413
+#: src/addressbook.c:412
 msgid "New _vCard"
 msgstr "Nová _vCard"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:416
 msgid "New _JPilot"
 msgstr "Nový _JPilot"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:419
 msgid "New LDAP _Server"
 msgstr "Přidat nový LDAP _server"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:423
 msgid "_Edit book"
 msgstr "Up_ravit knihu"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:424
 msgid "_Delete book"
 msgstr "_Odstranit knihu"
 
-#: src/addressbook.c:427 src/compose.c:624
+#: src/addressbook.c:426 src/compose.c:627 src/gtk/gtkutils.c:69
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
-#: src/plugins/managesieve/sieve_editor.c:633
+#: src/plugins/managesieve/sieve_editor.c:633 src/wizard.c:1813
 msgid "_Save"
 msgstr "_Uložit"
 
-#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
-#: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:631
-msgid "_Close"
-msgstr "_Zavřít"
-
-#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
+#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
 msgid "_Select all"
 msgstr "Vybrat vš_e"
 
-#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
+#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
 msgid "C_ut"
 msgstr "_Vyjmout"
 
-#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
-#: src/plugins/managesieve/sieve_editor.c:96
+#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
+#: src/compose.c:639 src/gtk/gtkutils.c:71 src/mainwindow.c:551
+#: src/messageview.c:228 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
-#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: src/addressbook.c:440 src/addressbook.c:486
+#: src/addressbook.c:439 src/addressbook.c:481
 msgid "New _Address"
 msgstr "Nová _adresa"
 
-#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
+#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
 msgid "New _Group"
 msgstr "Nová _skupina"
 
-#: src/addressbook.c:443 src/addressbook.c:493
+#: src/addressbook.c:442 src/addressbook.c:488
 msgid "_Mail To"
 msgstr "Napsat novou _zprávu"
 
-#: src/addressbook.c:444 src/addressbook.c:497
+#: src/addressbook.c:443 src/addressbook.c:492
 msgid "_Merge"
 msgstr "Spo_jit"
 
-#: src/addressbook.c:448
+#: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr "Importovat _LDIF soubor..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Import M_utt file..."
 msgstr "Importovat _Mutt soubor..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Import _Pine file..."
 msgstr "Importovat _Pine soubor..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:451
 msgid "Export _HTML..."
 msgstr "Exportovat _HTML..."
 
-#: src/addressbook.c:453
+#: src/addressbook.c:452
 msgid "Export LDI_F..."
 msgstr "Exportovat LDI_F..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:454
 msgid "Find duplicates..."
 msgstr "Najít duplikované..."
 
-#: src/addressbook.c:456
+#: src/addressbook.c:455
 msgid "Edit custom attributes..."
 msgstr "Upravit uživatelské atributy..."
 
-#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
-#: src/messageview.c:340
-msgid "_About"
-msgstr "_O programu"
-
-#: src/addressbook.c:495
+#: src/addressbook.c:490
 msgid "_Browse Entry"
 msgstr "_Prohlížet záznam"
 
-#: src/addressbook.c:509 src/crash.c:457 src/crash.c:476 src/importldif.c:114
+#: 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/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:397
+#: src/plugins/vcalendar/month-view.c:424 src/prefs_themes.c:819
 #: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr "Neznámá(ý)"
 
-#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
 msgid "Success"
 msgstr "Úspěch"
 
-#: src/addressbook.c:517 src/importldif.c:122
+#: src/addressbook.c:512 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Špatné argumenty"
 
-#: src/addressbook.c:518 src/importldif.c:123
+#: src/addressbook.c:513 src/importldif.c:123
 msgid "File not specified"
 msgstr "Není zadán soubor"
 
-#: src/addressbook.c:519 src/importldif.c:124
+#: src/addressbook.c:514 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Chyba při otevírání souboru"
 
-#: src/addressbook.c:520 src/importldif.c:125
+#: src/addressbook.c:515 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Chyba při čtení souboru"
 
-#: src/addressbook.c:521 src/importldif.c:126
+#: src/addressbook.c:516 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Byl dosažen konec souboru"
 
-#: src/addressbook.c:522 src/importldif.c:127
+#: src/addressbook.c:517 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Chyba při alokaci paměti"
 
-#: src/addressbook.c:523 src/importldif.c:128
+#: src/addressbook.c:518 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Špatný formát souboru"
 
-#: src/addressbook.c:524 src/importldif.c:129
+#: src/addressbook.c:519 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Chyba při zápisu do souboru"
 
-#: src/addressbook.c:525 src/importldif.c:130
+#: src/addressbook.c:520 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Chyba při otevírání adresáře"
 
-#: src/addressbook.c:526 src/importldif.c:131
+#: src/addressbook.c:521 src/importldif.c:131
 msgid "No path specified"
 msgstr "Není zadána cesta"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error connecting to LDAP server"
 msgstr "Chyba při připojování na LDAP server"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "Error initializing LDAP"
 msgstr "Chyba při inicializaci LDAP"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "Error binding to LDAP server"
 msgstr "Chyba při napojování na LDAP server"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error searching LDAP database"
 msgstr "Chyba hledání v LDAP databázi"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Timeout performing LDAP operation"
 msgstr "Při provádění operací s LDAP vypršel čas"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Error in LDAP search criteria"
 msgstr "Chyba ve vyhledávacích kritériích pro LDAP"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "No LDAP entries found for search criteria"
 msgstr "Pro vyhledávací kritéria nebyly nalezeny žádné položky"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "LDAP search terminated on request"
 msgstr "Prohledávání ukončeno na žádost"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:539
 msgid "Error starting STARTTLS connection"
 msgstr "Chyba při vytváření STARTTLS spojení"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:540
 msgid "Distinguished Name (dn) is missing"
 msgstr "Rozlišovací jméno (dn) chybí"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:541
 msgid "Missing required information"
 msgstr "Schází požadované informace"
 
-#: src/addressbook.c:547
+#: src/addressbook.c:542
 msgid "Another contact exists with that key"
 msgstr "Pod tímto klíčem je již existující kontakt"
 
-#: src/addressbook.c:548
+#: src/addressbook.c:543
 msgid "Strong(er) authentication required"
 msgstr "Vyžadována silnější autentizace"
 
-#: src/addressbook.c:916
+#: src/addressbook.c:911
 msgid "Sources"
 msgstr "Zdroje adres"
 
-#: src/addressbook.c:920 src/prefs_matcher.c:643 src/prefs_other.c:493
+#: src/addressbook.c:915 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "Kniha adres"
 
-#: src/addressbook.c:1118 src/editldap.c:794
+#: src/addressbook.c:1108 src/editldap.c:777
 msgid "Search"
 msgstr "Hledání"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1480
 msgid "Delete group"
 msgstr "Odstranit skupinu"
 
-#: src/addressbook.c:1491
+#: src/addressbook.c:1481
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -677,26 +820,26 @@ msgstr ""
 "Chcete odstranit skupinu (skupiny)?\n"
 "Adresy v ní (v nich) obsažené budou ztraceny."
 
-#: src/addressbook.c:2218
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Nelze vložit. Cílová kniha adres je pouze pro čtení."
 
-#: src/addressbook.c:2228
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr "Nelze provést vložení do skupiny adres."
 
-#: src/addressbook.c:2965
+#: src/addressbook.c:2953
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Opravdu chcete odstranit výsledky vyhledávání a adresy v '%s'?"
 
-#: src/addressbook.c:2968 src/addressbook.c:2994 src/addressbook.c:3001
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
+#: src/addressbook.c:2956 src/addressbook.c:2982 src/addressbook.c:2989
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:171
 #: src/toolbar.c:497
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:2965
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -705,20 +848,20 @@ msgstr ""
 "Chcete odstranit '%s'? Pokud odstraníte pouze složku, adresy v ní obsažené "
 "budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:2980 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
+#: src/addressbook.c:2968 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:156
 msgid "Delete folder"
 msgstr "Odstranit složku"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2969
 msgid "Delete _folder only"
 msgstr "Odstranit pouze _složku"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2969
 msgid "Delete folder and _addresses"
 msgstr "Odstranit složku a _adresy"
 
-#: src/addressbook.c:2992
+#: src/addressbook.c:2980
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -727,7 +870,7 @@ msgstr ""
 "Chcete odstranit '%s'?\n"
 "Adresy v ní obsažené budou ztraceny."
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:2987
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -736,28 +879,28 @@ msgstr ""
 "Chcete odstranit '%s'?\n"
 "Adresy v ní obsažené budou ztraceny."
 
-#: src/addressbook.c:3113
+#: src/addressbook.c:3101
 #, c-format
 msgid "Search '%s'"
 msgstr "Hledání '%s'"
 
-#: src/addressbook.c:3251 src/addressbook.c:3300
+#: src/addressbook.c:3239 src/addressbook.c:3288
 msgid "New Contacts"
 msgstr "Nový kontakt"
 
-#: src/addressbook.c:4137
+#: src/addressbook.c:4125
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit index soubor."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4129
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s knihou adres."
 
-#: src/addressbook.c:4151
+#: src/addressbook.c:4139
 msgid "Old address book converted successfully."
 msgstr "Konverze staré knihy adres proběhla úspěšně."
 
-#: src/addressbook.c:4156
+#: src/addressbook.c:4144
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -765,7 +908,7 @@ msgstr ""
 "Stará kniha adres zkonvertována,\n"
 "nepodařilo se uložit nový soubor s indexem adres."
 
-#: src/addressbook.c:4169
+#: src/addressbook.c:4157
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -773,7 +916,7 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres,\n"
 "ale byl vytvořen nové prázdné soubory knihy adres."
 
-#: src/addressbook.c:4175
+#: src/addressbook.c:4163
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -781,7 +924,7 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres,\n"
 "nepodařilo se uložit nový soubor s indexem adres."
 
-#: src/addressbook.c:4180
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -789,57 +932,57 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres\n"
 "a nepodařilo se vytvořit nové soubory knihy adres."
 
-#: src/addressbook.c:4187 src/addressbook.c:4193
+#: src/addressbook.c:4175 src/addressbook.c:4181
 msgid "Addressbook conversion error"
 msgstr "Chyba při konverzi knihy adres"
 
-#: src/addressbook.c:4308
+#: src/addressbook.c:4296
 msgid "Addressbook Error"
 msgstr "Chyba v knize adres"
 
-#: src/addressbook.c:4309
+#: src/addressbook.c:4297
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:4640
+#: src/addressbook.c:4628
 msgid "Busy searching..."
 msgstr "Prohledávám..."
 
-#: src/addressbook.c:4970 src/prefs_send.c:220
+#: src/addressbook.c:4958 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:4982
+#: src/addressbook.c:4970
 msgid "Address Books"
 msgstr "Kniha adres"
 
-#: src/addressbook.c:4994
+#: src/addressbook.c:4982
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:5030 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3149 src/prefs_folder_column.c:77
+#: src/addressbook.c:5018 src/exporthtml.c:885 src/folderview.c:361
+#: src/folderview.c:449 src/prefs_account.c:3420 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:5042
+#: src/addressbook.c:5030
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5054 src/addressbook.c:5066
+#: src/addressbook.c:5042 src/addressbook.c:5054
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5078
+#: src/addressbook.c:5066
 msgid "LDAP servers"
 msgstr "LDAP servery"
 
-#: src/addressbook.c:5090
+#: src/addressbook.c:5078
 msgid "LDAP Query"
 msgstr "LDAP dotaz"
 
-#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:985 src/importldif.c:541
+#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:369 src/expldifdlg.c:386
+#: src/exporthtml.c:985 src/importldif.c:539
 msgid "Address Book"
 msgstr "Kniha adres"
 
@@ -867,54 +1010,54 @@ msgstr "adresy přidané Claws Mail"
 msgid "Addresses collected successfully."
 msgstr "Adresy získány úspěšně."
 
-#: src/addrgather.c:360
+#: src/addrgather.c:358
 msgid "Current folder:"
 msgstr "Aktuální složka:"
 
-#: src/addrgather.c:371
+#: src/addrgather.c:367
 msgid "Address book name:"
 msgstr "Jméno kniha adres:"
 
-#: src/addrgather.c:398
+#: src/addrgather.c:395
 msgid "Address book folder size:"
 msgstr "Velikost složky knihy adres:"
 
-#: src/addrgather.c:402 src/addrgather.c:411
+#: src/addrgather.c:399 src/addrgather.c:409
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr ""
 "Maximální počet položek ve složce uvnitř nově vytvořených adresních knih"
 
-#: src/addrgather.c:415
+#: src/addrgather.c:412
 msgid "Process these mail header fields"
 msgstr "Zpracovat tato pole z hlavičky zprávy"
 
-#: src/addrgather.c:434
+#: src/addrgather.c:432
 msgid "Include subfolders"
 msgstr "Zahrnout podsložky"
 
-#: src/addrgather.c:492 src/prefs_filtering_action.c:1384
+#: src/addrgather.c:490 src/prefs_filtering_action.c:1384
 msgid "Header Name"
 msgstr "Záhlaví"
 
-#: src/addrgather.c:498
+#: src/addrgather.c:496
 msgid "Address Count"
 msgstr "Počet adres"
 
-#: src/addrgather.c:586
+#: src/addrgather.c:584
 msgid "Header Fields"
 msgstr "Záhlaví"
 
-#: src/addrgather.c:587 src/exphtmldlg.c:659 src/expldifdlg.c:723
-#: src/importldif.c:982
+#: src/addrgather.c:585 src/exphtmldlg.c:635 src/expldifdlg.c:703
+#: src/importldif.c:965
 msgid "Finish"
 msgstr "Konec"
 
-#: src/addrgather.c:645
+#: src/addrgather.c:643
 msgid "Collect email addresses from selected messages"
 msgstr "Získat adresy z vybraných zpráv"
 
-#: src/addrgather.c:649
+#: src/addrgather.c:647
 msgid "Collect email addresses from folder"
 msgstr "Získat adresy ze složky"
 
@@ -942,18 +1085,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:144 src/compose.c:9795
+#: src/alertpanel.c:144 src/compose.c:9783
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:157 src/compose.c:5856 src/compose.c:6401
-#: src/compose.c:12258 src/file_checker.c:84 src/file_checker.c:108
-#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:811
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5091
+#: src/alertpanel.c:157 src/compose.c:5859 src/compose.c:6404
+#: src/compose.c:12183 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:855 src/plugins/pgpcore/sgpgme.c:811
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5066
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5793 src/inc.c:726
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5796 src/inc.c:731
 #: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr "Chyba"
@@ -962,19 +1105,19 @@ msgstr "Chyba"
 msgid "_View log"
 msgstr "_Zobrazit protokol"
 
-#: src/alertpanel.c:346
+#: src/alertpanel.c:350
 msgid "Show this message next time"
 msgstr "Zobrazovat příště tuto zprávu"
 
-#: src/browseldap.c:223
+#: src/browseldap.c:221
 msgid "Browse Directory Entry"
 msgstr "Procházet položku adresáře"
 
-#: src/browseldap.c:243
+#: src/browseldap.c:240
 msgid "Server Name:"
 msgstr "Název serveru:"
 
-#: src/browseldap.c:253
+#: src/browseldap.c:251
 msgid "Distinguished Name (dn):"
 msgstr "Rozlišovací jméno (dn):"
 
@@ -1072,36 +1215,36 @@ 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:1233
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "Inicializace SSL/TLS spojení selhala\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "SMTP AUTH je nedostupná\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Vybraná SMTP AUTH je nedostupná\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "špatná SMTP odpověď\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "nastala chyba v SMTP relaci\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "nastala chyba v autentizaci\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, 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:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "nelze spustit STARTTLS relaci\n"
 
@@ -1207,10 +1350,10 @@ msgstr "Nepodařilo se otevřít soubor P12 certifikátu %s (%s)\n"
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "P12 Certifikát %s chybí (%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:1088 src/gtk/sslcertwindow.c:85
+#: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
+#: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
+#: src/gtk/sslcertwindow.c:134
 msgid "<not in certificate>"
 msgstr "<not in certificate>"
 
@@ -1238,641 +1381,650 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4028
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Neděle"
 
-#: src/common/utils.c:4029
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondělí"
 
-#: src/common/utils.c:4030
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: src/common/utils.c:4031
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Středa"
 
-#: src/common/utils.c:4032
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: src/common/utils.c:4033
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Pátek"
 
-#: src/common/utils.c:4034
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4036
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Leden"
 
-#: src/common/utils.c:4037
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Únor"
 
-#: src/common/utils.c:4038
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Březen"
 
-#: src/common/utils.c:4039
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Duben"
 
-#: src/common/utils.c:4040
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Květen"
 
-#: src/common/utils.c:4041
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Červen"
 
-#: src/common/utils.c:4042
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Červenec"
 
-#: src/common/utils.c:4043
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Srpen"
 
-#: src/common/utils.c:4044
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Září"
 
-#: src/common/utils.c:4045
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Říjen"
 
-#: src/common/utils.c:4046
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Listopad"
 
-#: src/common/utils.c:4047
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Prosinec"
 
-#: src/common/utils.c:4049
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Ne"
 
-#: src/common/utils.c:4050
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Po"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Út"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "St"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Čt"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Pá"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "So"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Led"
 
-#: src/common/utils.c:4058
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Úno"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Bře"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Dub"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Kvě"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Čen"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Čvc"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Srp"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Zář"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Říj"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Lis"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Pro"
 
-#: src/common/utils.c:4079
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP"
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP"
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "dop"
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "odp"
 
-#: src/compose.c:596
+#: src/compose.c:201
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+"Zvolil jste podepsat a/nebo šifrovat zprávu, ale není vybrán systém "
+"soukromí.\n"
+"\n"
+"Podepisování a šifrování není povoleno pro tuto zprávu."
+
+#: src/compose.c:599
 msgid "_Add..."
 msgstr "_Přidat..."
 
-#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:323
+#: src/compose.c:600 src/gtk/gtkutils.c:86
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/compose.c:599 src/folderview.c:254
+#: src/compose.c:602 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:609 src/mainwindow.c:519 src/messageview.c:214
 msgid "_Message"
 msgstr "_Zpráva"
 
-#: src/compose.c:609
+#: src/compose.c:612
 msgid "_Spelling"
 msgstr "_Pravopis"
 
-#: src/compose.c:611 src/compose.c:678
+#: src/compose.c:614 src/compose.c:681
 msgid "_Options"
 msgstr "Nastav_ení"
 
-#: src/compose.c:615
+#: src/compose.c:616 src/mainwindow.c:522 src/messageview.c:216
+msgid "_Help"
+msgstr "Nápo_věda"
+
+#: src/compose.c:618
 msgid "S_end"
 msgstr "_Odeslat"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Send _later"
 msgstr "Poslat _později"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "_Attach file"
 msgstr "Připojit _soubor"
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "_Insert file"
 msgstr "_Vložit soubor"
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Insert si_gnature"
 msgstr "Vložit p_odpis"
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "_Replace signature"
 msgstr "Na_hradit podpis"
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "_Print"
 msgstr "_Tisk"
 
-#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:634 src/gtk/gtkutils.c:76
+#: src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Z_novu"
 
-#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
-#: src/compose.c:639
+#: src/compose.c:642
 msgid "_Special paste"
 msgstr "_Vložit jinak"
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "As _quotation"
 msgstr "Jako _citaci"
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Wrapped"
 msgstr "_Zalomené"
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:644 src/mainwindow.c:558
+#: src/compose.c:647 src/mainwindow.c:552
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vybrat vš_e"
 
-#: src/compose.c:646
+#: src/compose.c:649
 msgid "A_dvanced"
 msgstr "Po_kročilé"
 
-#: src/compose.c:647
+#: src/compose.c:650
 msgid "Move a character backward"
 msgstr "Přesun o znak zpět"
 
-#: src/compose.c:648
+#: src/compose.c:651
 msgid "Move a character forward"
 msgstr "Přesun o znak dále"
 
-#: src/compose.c:649
+#: src/compose.c:652
 msgid "Move a word backward"
 msgstr "Přesun o slovo zpět"
 
-#: src/compose.c:650
+#: src/compose.c:653
 msgid "Move a word forward"
 msgstr "Přesun o slovo dále"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Move to beginning of line"
 msgstr "Přesun na začátek řádku"
 
-#: src/compose.c:652
+#: src/compose.c:655
 msgid "Move to end of line"
 msgstr "Přesun na konec řádku"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Move to previous line"
 msgstr "Přesun na předchozí řádek"
 
-#: src/compose.c:654
+#: src/compose.c:657
 msgid "Move to next line"
 msgstr "Přesun na další řádek"
 
-#: src/compose.c:655
+#: src/compose.c:658
 msgid "Delete a character backward"
 msgstr "Smazat znak zpět"
 
-#: src/compose.c:656
+#: src/compose.c:659
 msgid "Delete a character forward"
 msgstr "Smazat znak vpřed"
 
-#: src/compose.c:657
+#: src/compose.c:660
 msgid "Delete a word backward"
 msgstr "Smazat slovo zpět"
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "Delete a word forward"
 msgstr "Smazat slovo vpřed"
 
-#: src/compose.c:659
+#: src/compose.c:662
 msgid "Delete line"
 msgstr "Smazat řádek"
 
-#: src/compose.c:660
+#: src/compose.c:663
 msgid "Delete to end of line"
 msgstr "Smazat do konce řádku"
 
-#: src/compose.c:663 src/messageview.c:231
+#: src/compose.c:666 src/gtk/gtkutils.c:73 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Najít"
 
-#: src/compose.c:666
+#: src/compose.c:669
 msgid "_Wrap current paragraph"
 msgstr "_Zalomit aktuální odstavec"
 
-#: src/compose.c:667
+#: src/compose.c:670
 msgid "Wrap all long _lines"
 msgstr "Zalomit všechny _dlouhé řádky"
 
-#: src/compose.c:669
+#: src/compose.c:672
 msgid "Edit with e_xternal editor"
 msgstr "Upravit e_xterním editorem"
 
-#: src/compose.c:672
+#: src/compose.c:675
 msgid "_Check all or check selection"
 msgstr "_Zkontrolovat vše nebo výběr"
 
-#: src/compose.c:673
+#: src/compose.c:676
 msgid "_Highlight all misspelled words"
 msgstr "Z_výraznit nesprávná slova"
 
-#: src/compose.c:674
+#: src/compose.c:677
 msgid "Check _backwards misspelled word"
 msgstr "Přejít na _předchozí chybu"
 
-#: src/compose.c:675
+#: src/compose.c:678
 msgid "_Forward to next misspelled word"
 msgstr "Přejít na _následující chybu"
 
-#: src/compose.c:682
+#: src/compose.c:685
 msgid "Reply _mode"
 msgstr "_Mód odpovědi"
 
-#: src/compose.c:684
+#: src/compose.c:687
 msgid "Privacy _System"
 msgstr "Systém _zabezpečení"
 
-#: src/compose.c:688
+#: src/compose.c:691
 msgid "_Priority"
 msgstr "_Priorita"
 
-#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:693 src/mainwindow.c:614 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "_Kódování znaků"
 
-#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:698 src/mainwindow.c:619 src/messageview.c:272
 msgid "Western European"
 msgstr "Západní Evropa"
 
-#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:699 src/mainwindow.c:620 src/messageview.c:273
 msgid "Baltic"
 msgstr "Baltské"
 
-#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:700 src/mainwindow.c:621 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:701 src/mainwindow.c:622 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arabština"
 
-#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:702 src/mainwindow.c:623 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:703 src/mainwindow.c:624 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonština"
 
-#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:704 src/mainwindow.c:625 src/messageview.c:278
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:705 src/mainwindow.c:626 src/messageview.c:279
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:706 src/mainwindow.c:627 src/messageview.c:280
 msgid "Thai"
 msgstr "Thajština"
 
-#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:709 src/mainwindow.c:737 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Kniha adres"
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Template"
 msgstr "Ša_blona"
 
-#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:713 src/mainwindow.c:765 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "Ak_ce"
 
-#: src/compose.c:719
+#: src/compose.c:717 src/mainwindow.c:819 src/messageview.c:340
+msgid "_About"
+msgstr "_O programu"
+
+#: src/compose.c:722
 msgid "Aut_o wrapping"
 msgstr "Aut_omatické zalamování"
 
-#: src/compose.c:720
+#: src/compose.c:723
 msgid "Auto _indent"
 msgstr "Automatické _odsazení"
 
-#: src/compose.c:721
+#: src/compose.c:724
 msgid "Si_gn"
 msgstr "Po_depsat"
 
-#: src/compose.c:722
+#: src/compose.c:725
 msgid "_Encrypt"
 msgstr "Ši_frovat"
 
-#: src/compose.c:723
+#: src/compose.c:726
 msgid "_Request Return Receipt"
 msgstr "_Vyžadovat potvrzení o doručení"
 
-#: src/compose.c:724
+#: src/compose.c:727
 msgid "Remo_ve references"
 msgstr "Odstranit reference"
 
-#: src/compose.c:725
+#: src/compose.c:728
 msgid "Show _ruler"
 msgstr "Zobrazit _pravítko"
 
-#: src/compose.c:730 src/compose.c:740
+#: src/compose.c:733 src/compose.c:743
 msgid "_Normal"
 msgstr "_Normální"
 
-#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
-#: src/summaryview.c:433
+#: src/compose.c:734 src/mainwindow.c:668 src/messageview.c:305
+#: src/summaryview.c:428
 msgid "_All"
 msgstr "_Všem"
 
-#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
-#: src/summaryview.c:434
+#: src/compose.c:735 src/mainwindow.c:669 src/messageview.c:306
+#: src/summaryview.c:429
 msgid "_Sender"
 msgstr "_Odesílateli"
 
-#: src/compose.c:733
+#: src/compose.c:736
 msgid "_Mailing-list"
 msgstr "Kon_ference"
 
-#: src/compose.c:738
+#: src/compose.c:741
 msgid "_Highest"
 msgstr "_Nejvyšší"
 
-#: src/compose.c:739
+#: src/compose.c:742
 msgid "Hi_gh"
 msgstr "Vy_soká"
 
-#: src/compose.c:741
+#: src/compose.c:744
 msgid "Lo_w"
 msgstr "Ní_zká"
 
-#: src/compose.c:742
+#: src/compose.c:745
 msgid "_Lowest"
 msgstr "Ne_jnižsí"
 
-#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:750 src/mainwindow.c:884 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:751 src/mainwindow.c:885 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bitové ASCII (US-ASC_II)"
 
-#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:752 src/mainwindow.c:886 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:756 src/mainwindow.c:890 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:759 src/mainwindow.c:893 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:764 src/mainwindow.c:898 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turečtina (ISO-8859-_9)"
 
-#: src/compose.c:1015 src/compose.c:1697
-msgid ""
-"You have opted to sign and/or encrypt this message but have not selected a "
-"privacy system.\n"
-"\n"
-"Signing and encrypting have been disabled for this message."
-msgstr ""
-"Zvolil jste podepsat a/nebo šifrovat zprávu, ale není vybrán systém "
-"soukromí.\n"
-"\n"
-"Podepisování a šifrování není povoleno pro tuto zprávu."
-
-#: src/compose.c:1051
+#: src/compose.c:1035
 msgid "New message From format error."
 msgstr "Chyba ve formátu pole Od nové zprávy."
 
-#: src/compose.c:1144
+#: src/compose.c:1128
 msgid "New message subject format error."
 msgstr "Chyba v předmětu šablony nové zprávy."
 
-#: src/compose.c:1176 src/quote_fmt.c:563
+#: src/compose.c:1160 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Napsat\" na řádku %d."
 
-#: src/compose.c:1445
+#: src/compose.c:1429
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Není možno odpovědět. Originální email pravděpodobně neexistuje."
 
-#: src/compose.c:1630 src/quote_fmt.c:580
+#: src/compose.c:1614 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "Pole \"Od\" v šabloně \"Odpovědět\" obsahuje neplatnou emailovou adresu."
 
-#: src/compose.c:1679 src/quote_fmt.c:583
+#: src/compose.c:1663 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Odpovědět\" na řádku %d."
 
-#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
+#: src/compose.c:1804 src/compose.c:2005 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Pole \"Od\" v šabloně \"Předat\" obsahuje neplatnou emailovou adresu."
 
-#: src/compose.c:1883 src/quote_fmt.c:603
+#: src/compose.c:1865 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Předat\" na řádku %d."
 
-#: src/compose.c:2059
+#: src/compose.c:2048
 msgid "Fw: multiple emails"
 msgstr "Fw: vice zprav"
 
-#: src/compose.c:2566
+#: src/compose.c:2559
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Přesměrovat\" na řádku %d."
 
-#: src/compose.c:2633 src/gtk/headers.h:14
+#: src/compose.c:2630 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/compose.c:2636 src/gtk/headers.h:15
+#: src/compose.c:2633 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
-#: src/compose.c:2639 src/gtk/headers.h:12
+#: src/compose.c:2636 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovědět komu:"
 
-#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
+#: src/compose.c:2639 src/compose.c:5014 src/compose.c:5016
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusní skupiny:"
 
-#: src/compose.c:2645 src/gtk/headers.h:34
+#: src/compose.c:2642 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračování:"
 
-#: src/compose.c:2648 src/gtk/headers.h:17
+#: src/compose.c:2645 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovědi komu:"
 
-#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
-#: src/gtk/headers.h:13 src/summary_search.c:422
+#: src/compose.c:2649 src/compose.c:5011 src/compose.c:5019
+#: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2842
+#: src/compose.c:2845
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nepodařilo se připojit soubor (konverze znakové sady se nezdařila)."
 
-#: src/compose.c:2848
+#: src/compose.c:2851
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1890,73 +2042,73 @@ msgstr[2] ""
 "Následující soubory byly připojeny: \n"
 "%s"
 
-#: src/compose.c:3128
+#: src/compose.c:3131
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Značka pro citaci\" v šabloně je neplatná."
 
-#: src/compose.c:3657
+#: src/compose.c:3660
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemohu získat velikost souboru '%s'."
 
-#: src/compose.c:3675
+#: src/compose.c:3678
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Chystáte se vložit soubor %s do těla zprávy. Jste si tím jistý?"
 
-#: src/compose.c:3678
+#: src/compose.c:3681
 msgid "Are you sure?"
 msgstr "Jste si jistý?"
 
-#: src/compose.c:3679 src/compose.c:10844 src/compose.c:11738
+#: src/compose.c:3682 src/compose.c:10773 src/compose.c:11665
 msgid "_Insert"
 msgstr "_Vložit"
 
-#: src/compose.c:3804
+#: src/compose.c:3807
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:3805
+#: src/compose.c:3808
 msgid "Empty file"
 msgstr "Prázdný soubor"
 
-#: src/compose.c:3806
+#: src/compose.c:3809
 msgid "_Attach anyway"
 msgstr "_Přesto přiložit"
 
-#: src/compose.c:3815
+#: src/compose.c:3818
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:3842
+#: src/compose.c:3845
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4855 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4862 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:4862 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4865 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[žádný předmět] - Psaní zprávy%s"
 
-#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4867 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Napsat zprávu"
 
-#: src/compose.c:4891 src/messageview.c:887
+#: src/compose.c:4894 src/messageview.c:884
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1964,59 +2116,59 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:5108 src/compose.c:5145
+#: src/compose.c:5111 src/compose.c:5148
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "Jediný adresát je výchozí %s příjemce. Opravdu odeslat?"
 
-#: src/compose.c:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
-#: src/prefs_account.c:3758 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5113 src/compose.c:5150 src/compose.c:5188 src/compose.c:5231
+#: src/prefs_account.c:4072 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
-#: src/compose.c:5794 src/folderview.c:2546 src/messageview.c:859
+#: src/compose.c:5115 src/compose.c:5152 src/compose.c:5189 src/compose.c:5232
+#: src/compose.c:5797 src/folderview.c:2538 src/messageview.c:856
 #: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/compose.c:5166
+#: src/compose.c:5169
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:5181
+#: src/compose.c:5184
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Předmět je prázdný.  %s"
 
-#: src/compose.c:5182 src/compose.c:5225
+#: src/compose.c:5185 src/compose.c:5228
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Přesto odeslat?"
 
-#: src/compose.c:5183 src/compose.c:5226
+#: src/compose.c:5186 src/compose.c:5229
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Opravdu zařadit do fronty?"
 
-#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
+#: src/compose.c:5188 src/compose.c:5231 src/toolbar.c:520
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5189 src/compose.c:5232
 msgid "_Queue"
 msgstr "_Fronta"
 
-#: src/compose.c:5224
+#: src/compose.c:5227
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Posílám %d příjemcům. %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5256
 msgid "Could not queue message."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:5256
+#: src/compose.c:5259
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2027,7 +2179,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5260
+#: src/compose.c:5263
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2038,7 +2190,7 @@ msgstr ""
 "\n"
 "Podepisování se nezdařilo: %s"
 
-#: src/compose.c:5265
+#: src/compose.c:5268
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2049,7 +2201,7 @@ msgstr ""
 "\n"
 "Šifrování selhalo: %s"
 
-#: src/compose.c:5270
+#: src/compose.c:5273
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2059,7 +2211,7 @@ msgstr ""
 "\n"
 "Konverze znakové sady se nezdařila."
 
-#: src/compose.c:5274
+#: src/compose.c:5277
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2069,7 +2221,7 @@ msgstr ""
 "\n"
 "Nepodařilo se získat šifrovací klíč příjemce."
 
-#: src/compose.c:5337 src/compose.c:5397
+#: src/compose.c:5340 src/compose.c:5400
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2077,7 +2229,7 @@ msgstr ""
 "Zpráva byla uložena do fronty ale nemohla být odeslána.\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5393
+#: src/compose.c:5396
 #, c-format
 msgid ""
 "%s\n"
@@ -2086,7 +2238,7 @@ msgstr ""
 "%s\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5790
+#: src/compose.c:5793
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2097,7 +2249,7 @@ msgstr ""
 "na %s.\n"
 "Odeslat v kódování %s?"
 
-#: src/compose.c:5852
+#: src/compose.c:5855
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2110,98 +2262,99 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:6087
+#: src/compose.c:6090
 msgid "Encryption warning"
 msgstr "Varování šifrování"
 
-#: src/compose.c:6088
+#: src/compose.c:6091
 msgid "C_ontinue"
 msgstr "_Pokračovat"
 
-#: src/compose.c:6137
+#: src/compose.c:6140
 msgid "No account for sending mails available!"
 msgstr "Není dostupný žádný účet pro odeslání pošty!"
 
-#: src/compose.c:6146
+#: src/compose.c:6149
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Vybraný účet není NNTP: Odeslání není možné."
 
-#: src/compose.c:6400
+#: src/compose.c:6403
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Příloha %s už neexistuje. Ignorovat?"
 
-#: src/compose.c:6402 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6405 src/mainwindow.c:659 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Zrušit posílání"
 
-#: src/compose.c:6402
+#: src/compose.c:6405
 msgid "Ignore attachment"
 msgstr "Ignorovat přílohu"
 
-#: src/compose.c:6458
+#: src/compose.c:6461
 #, c-format
 msgid "Original %s part"
 msgstr "Část originálu %s"
 
-#: src/compose.c:7058
+#: src/compose.c:7061
 msgid "Add to address _book"
 msgstr "Přidat do knihy adres"
 
-#: src/compose.c:7225
+#: src/compose.c:7216
 msgid "Delete entry contents"
 msgstr "Smazat obsah pole"
 
-#: src/compose.c:7229 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7220 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Použijte <tab> pro automatické dokončení podle knihy adres"
 
-#: src/compose.c:7461
+#: src/compose.c:7455
 msgid "Mime type"
 msgstr "MIME typ"
 
-#: src/compose.c:7467 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
-#: src/prefs_matcher.c:641 src/prefs_summaries.c:633
-#: src/prefs_summary_column.c:84 src/summaryview.c:472
+#: src/compose.c:7461 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: src/prefs_matcher.c:640 src/prefs_summaries.c:633
+#: src/prefs_summary_column.c:84 src/summaryview.c:467
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:7529
+#: src/compose.c:7523
 msgid "Save Message to "
 msgstr "Uložit zprávu do "
 
-#: src/compose.c:7560 src/editjpilot.c:276 src/editldap.c:518
-#: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
-#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
+#: src/compose.c:7556 src/editjpilot.c:277 src/editldap.c:514
+#: src/editvcard.c:193 src/export.c:161 src/gtk/gtkutils.c:77 src/import.c:160
+#: src/importmutt.c:240 src/importpine.c:239
+#: src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:434
+#: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "_Browse"
 msgstr "P_rocházet"
 
-#: src/compose.c:7576
+#: src/compose.c:7572
 msgid "Select folder to save message to"
 msgstr "Vybrat složku pro uložení zprávy"
 
-#: src/compose.c:8033
+#: src/compose.c:8022
 msgid "Hea_der"
 msgstr "_Záhlaví"
 
-#: src/compose.c:8038
+#: src/compose.c:8027
 msgid "_Attachments"
 msgstr "_Přílohy"
 
-#: src/compose.c:8052
+#: src/compose.c:8041
 msgid "Othe_rs"
 msgstr "_Ostatní"
 
-#: src/compose.c:8067
+#: src/compose.c:8056
 msgid "S_ubject:"
 msgstr "Pře_dmět:"
 
-#: src/compose.c:8291
+#: src/compose.c:8280
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2210,19 +2363,19 @@ msgstr ""
 "Nelze spustit kontrolu pravopisu.\n"
 "%s"
 
-#: src/compose.c:8438
+#: src/compose.c:8431
 msgid "_From:"
 msgstr "_Od:"
 
-#: src/compose.c:8455
+#: src/compose.c:8439
 msgid "Account to use for this email"
 msgstr "Účet použitý pro tuto zprávu"
 
-#: src/compose.c:8457
+#: src/compose.c:8441
 msgid "Sender address to be used"
 msgstr "Adresa odesílatele musí být uvedena"
 
-#: src/compose.c:8639
+#: src/compose.c:8623
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2231,73 +2384,98 @@ msgstr ""
 "Systém zabezpečení '%s' se nepodařilo načíst. Nebudete moci digitálně "
 "podepsat nebo šifrovat zprávu."
 
-#: src/compose.c:8750 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8734 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "Žá_dné"
 
-#: src/compose.c:8851 src/prefs_template.c:752
+#: src/compose.c:8835 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Chyba v těle šablony na řádku %d."
 
-#: src/compose.c:8948
+#: src/compose.c:8932
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Chyba formátu %s šablony."
 
-#: src/compose.c:9372
+#: src/compose.c:9356
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:9387
+#: src/compose.c:9371
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:9461
+#: src/compose.c:9442
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9479
+#: src/compose.c:9460
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/compose.c:9512
+#: src/compose.c:9493
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:9532
+#: src/compose.c:9513
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:9533
+#: src/compose.c:9514
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:9792
+#: src/compose.c:9609
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"Nepodařilo se zapsat tělo do souboru:\n"
+"%s"
+
+#: src/compose.c:9667
+#, c-format
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Nepodařilo se vytvořit následující příkaz:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9706
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr "Externí editor ukončen s chybou:%s"
+
+#: src/compose.c:9780
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
 "Externí editor stále pracuje.\n"
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:10265 src/messageview.c:1088
+#: src/compose.c:10187 src/messageview.c:1085
 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:10458
+#: src/compose.c:10389
 msgid "Could not save draft."
 msgstr "Nelze uložit koncept."
 
-#: src/compose.c:10462
+#: src/compose.c:10393
 msgid "Could not save draft"
 msgstr "Nelze uložit koncept"
 
-#: src/compose.c:10463
+#: src/compose.c:10394
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2305,24 +2483,24 @@ msgstr ""
 "Nemohu uložit koncept.\n"
 "Chcete zrušit ukončení nebo zahodit tuto zprávu?"
 
-#: src/compose.c:10465
+#: src/compose.c:10396
 msgid "_Cancel exit"
 msgstr "_Zrušit ukončení"
 
-#: src/compose.c:10465
+#: src/compose.c:10396
 msgid "_Discard email"
 msgstr "_Zahodit zprávu"
 
-#: src/compose.c:10654 src/compose.c:10668
+#: src/compose.c:10585 src/compose.c:10599
 msgid "Select file"
 msgstr "Výběr souboru"
 
-#: src/compose.c:10682
+#: src/compose.c:10613
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Soubor '%s' nelze číst."
 
-#: src/compose.c:10684
+#: src/compose.c:10615
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2331,50 +2509,50 @@ msgstr ""
 "Soubor '%s' obsahuje neplatné znaky\n"
 "pro nastavené kódování, vložení může obsahovat chyby."
 
-#: src/compose.c:10763
+#: src/compose.c:10692
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:10764
+#: src/compose.c:10693
 msgid "This message has been modified. Discard it?"
 msgstr "Zpráva byla modifikována. Chcete ji zahodit?"
 
-#: src/compose.c:10765 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10694 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Zahodit"
 
-#: src/compose.c:10765 src/compose.c:10770
+#: src/compose.c:10694 src/compose.c:10699
 msgid "_Save to Drafts"
 msgstr "Uložit jako _koncept"
 
-#: src/compose.c:10768 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10697 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: src/compose.c:10769
+#: src/compose.c:10698
 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:10770
+#: src/compose.c:10699
 msgid "_Don't save"
 msgstr "_Neukládat"
 
-#: src/compose.c:10841
+#: src/compose.c:10770
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použít šablonu '%s'?"
 
-#: src/compose.c:10843
+#: src/compose.c:10772
 msgid "Apply template"
 msgstr "Použít šablonu"
 
-#: src/compose.c:10844 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
-#: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1018
+#: src/compose.c:10773 src/gtk/gtkutils.c:75 src/prefs_actions.c:326
+#: src/prefs_filtering_action.c:585 src/prefs_matcher.c:796
+#: src/prefs_toolbar.c:1003
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: src/compose.c:11731
+#: src/compose.c:11658
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2392,20 +2570,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:11737
+#: src/compose.c:11664
 msgid "Insert or attach?"
 msgstr "Vložit nebo připojit?"
 
-#: src/compose.c:11738
+#: src/compose.c:11665
 msgid "_Attach"
 msgstr "_Přiložit"
 
-#: src/compose.c:11956
+#: src/compose.c:11881
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba formátu citace na řádku %d."
 
-#: src/compose.c:12252
+#: src/compose.c:12177
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2436,7 +2614,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Debug log"
 
-#: src/crash.c:252 src/toolbar.c:539
+#: src/crash.c:252 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:539
 msgid "Close"
 msgstr "Zavřít"
 
@@ -2512,11 +2690,11 @@ msgstr "Upravit detaily o osobě"
 msgid "An Email address must be supplied."
 msgstr "E-mailová adresa musí být uvedena."
 
-#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:204
 msgid "A Name and Value must be supplied."
 msgstr "Musí být zadáno jméno a hodnota."
 
-#: src/editaddress.c:820 src/prefs_folder_item.c:1784
+#: src/editaddress.c:820 src/prefs_folder_item.c:1761
 msgid "Discard"
 msgstr "_Zahodit"
 
@@ -2549,34 +2727,34 @@ msgstr "_Nastavit obrázek"
 msgid "_Unset picture"
 msgstr "_Zrušit obrázek"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:1048
 msgid "Photo"
 msgstr "Fotografie"
 
-#: src/editaddress.c:1097 src/editaddress.c:1099 src/expldifdlg.c:516
+#: src/editaddress.c:1095 src/editaddress.c:1097 src/expldifdlg.c:506
 #: src/exporthtml.c:762 src/ldif.c:747
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
-#: src/editaddress.c:1108 src/editaddress.c:1112 src/ldif.c:755
+#: src/editaddress.c:1106 src/editaddress.c:1110 src/ldif.c:755
 msgid "Last Name"
 msgstr "Příjmení"
 
-#: src/editaddress.c:1109 src/editaddress.c:1111 src/ldif.c:751
+#: src/editaddress.c:1107 src/editaddress.c:1109 src/ldif.c:751
 msgid "First Name"
 msgstr "Jméno"
 
-#: src/editaddress.c:1115 src/editaddress.c:1117
+#: src/editaddress.c:1113 src/editaddress.c:1115
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: src/editaddress.c:1253 src/editaddress.c:1294
+#: src/editaddress.c:1251 src/editaddress.c:1292
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1479 src/editaddress.c:1512 src/editaddress.c:1528
-#: src/editaddress_other_attributes_ldap.c:376
-#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:223
+#: src/editaddress.c:1480 src/editaddress.c:1507 src/editaddress.c:1526
+#: src/editaddress_other_attributes_ldap.c:374
+#: src/editaddress_other_attributes_ldap.c:411 src/prefs_customheader.c:217
 msgid "Value"
 msgstr "Hodnota"
 
@@ -2601,95 +2779,95 @@ msgstr ""
 "Chyba uložení obrázku: \n"
 "%s"
 
-#: src/editbook.c:109
+#: src/editbook.c:108
 msgid "File appears to be OK."
 msgstr "Soubor se zdá být v pořádku."
 
-#: src/editbook.c:112
+#: src/editbook.c:111
 msgid "File does not appear to be a valid address book format."
 msgstr "Soubor není ve formátu pro knihu adres."
 
-#: src/editbook.c:115 src/editjpilot.c:191 src/editvcard.c:98
+#: src/editbook.c:114 src/editjpilot.c:190 src/editvcard.c:97
 msgid "Could not read file."
 msgstr "Nelze načíst soubor."
 
-#: src/editbook.c:149 src/editbook.c:263
+#: src/editbook.c:147 src/editbook.c:258
 msgid "Edit Addressbook"
 msgstr "Upravit knihu adres"
 
-#: src/editbook.c:178 src/editjpilot.c:264 src/editvcard.c:181
+#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
 msgid " Check File "
 msgstr " 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:2158
-#: src/wizard.c:1198 src/wizard.c:1618
+#: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2442
+#: src/wizard.c:1201 src/wizard.c:1632
 msgid "File"
 msgstr "Soubor"
 
-#: src/editbook.c:282
+#: src/editbook.c:277
 msgid "Add New Addressbook"
 msgstr "Přidat novou knihu adres"
 
-#: src/editgroup.c:101
+#: src/editgroup.c:100
 msgid "A Group Name must be supplied."
 msgstr "Musí být zadáno jméno skupiny."
 
-#: src/editgroup.c:296
+#: src/editgroup.c:294
 msgid "Edit Group Data"
 msgstr "Upravit data o skupině"
 
-#: src/editgroup.c:326 src/exporthtml.c:598
+#: src/editgroup.c:323 src/exporthtml.c:598
 msgid "Group Name"
 msgstr "Jméno skupiny"
 
-#: src/editgroup.c:345
+#: src/editgroup.c:344
 msgid "Addresses in Group"
 msgstr "Adresy ve skupině"
 
-#: src/editgroup.c:379
+#: src/editgroup.c:378
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:453
+#: src/editgroup.c:452
 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr "E-mailové adresy přesuňte do/ze skupiny pomocí tlačítek se šipkami"
 
-#: src/editgroup.c:501
+#: src/editgroup.c:500
 msgid "Edit Group Details"
 msgstr "Upravit detaily o skupině"
 
-#: src/editgroup.c:504
+#: src/editgroup.c:503
 msgid "Add New Group"
 msgstr "Přidat novou skupinu"
 
-#: src/editgroup.c:553
+#: src/editgroup.c:552
 msgid "Edit folder"
 msgstr "Upravit složku"
 
-#: src/editgroup.c:553
+#: src/editgroup.c:552
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:556 src/foldersel.c:572 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: src/editgroup.c:555 src/foldersel.c:571 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:557 src/foldersel.c:573 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: src/editgroup.c:556 src/foldersel.c:572 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editjpilot.c:188
+#: src/editjpilot.c:187
 msgid "File does not appear to be JPilot format."
 msgstr "Soubor není ve formátu pro JPilot."
 
-#: src/editjpilot.c:200
+#: src/editjpilot.c:199
 msgid "Select JPilot File"
 msgstr "Vybrat JPilot soubor"
 
-#: src/editjpilot.c:236 src/editjpilot.c:365
+#: src/editjpilot.c:235 src/editjpilot.c:364
 msgid "Edit JPilot Entry"
 msgstr "Upravit JPilot soubor"
 
@@ -2697,38 +2875,38 @@ msgstr "Upravit JPilot soubor"
 msgid "Additional e-Mail address item(s)"
 msgstr "Další položka(y) e-mail adresy"
 
-#: src/editjpilot.c:372
+#: src/editjpilot.c:371
 msgid "Add New JPilot Entry"
 msgstr "Přidat nový JPilot záznam"
 
-#: src/editldap_basedn.c:153
+#: src/editldap_basedn.c:152
 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:2910
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3189
 #: src/prefs_proxy.c:98
 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:2917
+#: src/editldap_basedn.c:180 src/editldap.c:456
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3196
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap_basedn.c:193 src/editldap.c:502
+#: src/editldap_basedn.c:189 src/editldap.c:497
 msgid "Search Base"
 msgstr "Báze pro hledání"
 
-#: src/editldap_basedn.c:221
+#: src/editldap_basedn.c:219
 msgid "Available Search Base(s)"
 msgstr "Dostupná(é) báze pro hledání"
 
-#: src/editldap_basedn.c:327
+#: src/editldap_basedn.c:325
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Nelze načíst báze pro hledání ze serveru - zadejte je prosím ručně"
 
-#: src/editldap_basedn.c:331 src/editldap.c:281
+#: src/editldap_basedn.c:329 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "Nemohu se spojit se serverem"
 
@@ -2748,15 +2926,15 @@ msgstr "Alespoň jeden atribut musí být uveden."
 msgid "Connected successfully to server"
 msgstr "Úspěšně připojeno k serveru"
 
-#: src/editldap.c:335 src/editldap.c:991
+#: src/editldap.c:335 src/editldap.c:974
 msgid "Edit LDAP Server"
 msgstr "Upravit LDAP server"
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr "Jméno, kterým chcete označit toto LDAP připojení."
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 msgid ""
 "This is the hostname of the server. For example, \"ldap.example.org\" may be "
 "appropriate for the \"example.org\" organization. An IP address may also be "
@@ -2767,15 +2945,15 @@ msgstr ""
 "\". 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
+#: src/editldap.c:467
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:468 src/prefs_account.c:4163
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: src/editldap.c:474
+#: src/editldap.c:472
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2786,7 +2964,7 @@ msgstr ""
 "připojování selže, zkontrolujte nastavení v ldap.conf (volby TLS_CACERTDIR a "
 "TLS_REQCERT)."
 
-#: src/editldap.c:479
+#: src/editldap.c:477
 msgid ""
 "Enable secure connection to the LDAP server via SSL/TLS. If connection "
 "fails, be sure to check the correct configuration in ldap.conf "
@@ -2796,20 +2974,20 @@ msgstr ""
 "připojování selže, zkontrolujte nastavení v ldap.conf (volby TLS_CACERTDIR a "
 "TLS_REQCERT)."
 
-#: src/editldap.c:491
+#: src/editldap.c:487
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr ""
 "Číslo portu, na kterém server naslouchá. Standardní nastavení je port 389."
 
-#: src/editldap.c:494
+#: src/editldap.c:490
 msgid " Check Server "
 msgstr " Otestovat připojení "
 
-#: src/editldap.c:498
+#: src/editldap.c:494
 msgid "Press this button to test the connection to the server."
 msgstr "Stiskem tohoto tlačítka otestujete připojení k serveru."
 
-#: src/editldap.c:511
+#: src/editldap.c:507
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2822,18 +3000,18 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
-#: src/editldap.c:522
+#: src/editldap.c:518
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr ""
 "Stiskem tohoto tlačítka vyhledáte názvy adresářů dostupných na serveru."
 
-#: src/editldap.c:578
+#: src/editldap.c:572
 msgid "Search Attributes"
 msgstr "Prohledávané atributy"
 
-#: src/editldap.c:587
+#: src/editldap.c:582
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
@@ -2841,11 +3019,11 @@ msgstr ""
 "Seznam LDAP atributů, které budou prohledávány při pokusu najít jméno nebo "
 "adresu."
 
-#: src/editldap.c:590
+#: src/editldap.c:585
 msgid " Defaults "
 msgstr " Výchozí "
 
-#: src/editldap.c:594
+#: src/editldap.c:589
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
@@ -2853,11 +3031,11 @@ msgstr ""
 "Nastavuje seznam atributů na výchozí hodnotu, která by měla najít nejvíc "
 "jmen a adres během vyhledávání."
 
-#: src/editldap.c:600
+#: src/editldap.c:594
 msgid "Max Query Age (secs)"
 msgstr "Maximální stáří dotazu (s)"
 
-#: src/editldap.c:614
+#: src/editldap.c:607
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2881,11 +3059,11 @@ msgstr ""
 "dlouhou reakční dobou, ale je to na úkor většího množství paměti "
 "spotřebovaného pro ukládání předchozích výsledků."
 
-#: src/editldap.c:631
+#: src/editldap.c:623
 msgid "Include server in dynamic search"
 msgstr "Zahrnout při automatickém dokončování"
 
-#: src/editldap.c:636
+#: src/editldap.c:627
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2893,11 +3071,11 @@ msgstr ""
 "Při zaškrtnutí bude tento server prohledáván při pokusu o automatické "
 "dokončování adres."
 
-#: src/editldap.c:642
+#: src/editldap.c:632
 msgid "Match names 'containing' search term"
 msgstr "Hledat pomocí 'obsahuje'"
 
-#: src/editldap.c:647
+#: src/editldap.c:636
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2911,11 +3089,11 @@ msgstr ""
 "výkonu používá automatické dokončování adres při vyhledávání vždy podmínku "
 "\"začíná na\" bez ohledu na toto nastavení."
 
-#: src/editldap.c:710
+#: src/editldap.c:697
 msgid "Bind DN"
 msgstr "Připojovací jméno"
 
-#: src/editldap.c:719
+#: src/editldap.c:707
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2927,102 +3105,102 @@ msgstr ""
 "\"cn=user,dc=claws-mail,dc=org\". Pro prohledávání obvykle není nutno "
 "vyplňovat."
 
-#: src/editldap.c:726
+#: src/editldap.c:713
 msgid "Bind Password"
 msgstr "Připojovací heslo"
 
-#: src/editldap.c:736
+#: src/editldap.c:724
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 "Heslo, které bude použito pro připojení spolu s údajem \"Přihlašovací jméno"
 "\"."
 
-#: src/editldap.c:739 src/prefs_account.c:1405 src/prefs_account.c:2003
-#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
-#: src/prefs_proxy.c:146
+#: src/editldap.c:727 src/prefs_account.c:1444 src/prefs_account.c:2073
+#: src/prefs_account.c:3001 src/prefs_account.c:3029 src/prefs_account.c:3230
+#: src/prefs_proxy.c:142
 msgid "Show password"
 msgstr "Zobrazit heslo"
 
-#: src/editldap.c:748
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr "Časový limit (s)"
 
-#: src/editldap.c:761
+#: src/editldap.c:746
 msgid "The timeout period in seconds."
 msgstr "Časový limit v sekundách."
 
-#: src/editldap.c:765
+#: src/editldap.c:749
 msgid "Maximum Entries"
 msgstr "Maximum položek"
 
-#: src/editldap.c:778
+#: src/editldap.c:761
 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:3722
+#: src/editldap.c:776 src/prefs_account.c:4036
 msgid "Basic"
 msgstr "Server"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:778 src/gtk/quicksearch.c:877
 msgid "Extended"
 msgstr "Ostatní"
 
-#: src/editldap.c:996
+#: src/editldap.c:979
 msgid "Add New LDAP Server"
 msgstr "Přidat nový LDAP server"
 
-#: src/edittags.c:192 src/prefs_filtering_action.c:1403
-#: src/prefs_summaries.c:640
+#: src/edittags.c:191 src/gtk/quicksearch.c:865
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:640
 msgid "Tag"
 msgstr "Značka"
 
-#: src/edittags.c:221
+#: src/edittags.c:220
 msgid "Delete tag"
 msgstr "Odstranit značku"
 
-#: src/edittags.c:222
+#: src/edittags.c:221
 msgid "Do you really want to delete this tag?"
 msgstr "Opravdu chcete odstranit tuto značku?"
 
-#: src/edittags.c:257
+#: src/edittags.c:256
 msgid "Delete all tags"
 msgstr "Odstranit všechny značky"
 
-#: src/edittags.c:258
+#: src/edittags.c:257
 msgid "Do you really want to delete all tags?"
 msgstr "Opravdu chcete odstranit všechny značky?"
 
-#: src/edittags.c:430
+#: src/edittags.c:427
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "Vložili jste rezervované jméno tagu, prosím vyberte jiné."
 
-#: src/edittags.c:472
+#: src/edittags.c:469
 msgid "Tag is not set."
 msgstr "Hodnota není nastavena."
 
-#: src/edittags.c:550
+#: src/edittags.c:547
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Použít značky"
 
-#: src/edittags.c:567
+#: src/edittags.c:564
 msgid "New tag:"
 msgstr "Nová značka:"
 
-#: src/edittags.c:600
+#: src/edittags.c:597
 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é."
 
-#: src/editvcard.c:95
+#: src/editvcard.c:94
 msgid "File does not appear to be vCard format."
 msgstr "Soubor není ve formátu vCard."
 
-#: src/editvcard.c:107
+#: src/editvcard.c:106
 msgid "Select vCard File"
 msgstr "Vybrat vCard soubor"
 
-#: src/editvcard.c:152 src/editvcard.c:257
+#: src/editvcard.c:150 src/editvcard.c:257
 msgid "Edit vCard Entry"
 msgstr "Upravit vCard záznam"
 
@@ -3088,99 +3266,99 @@ msgstr "Chyba při vytváření HTML souboru"
 msgid "Select HTML output file"
 msgstr "Vyberte výstupní HTML soubor"
 
-#: src/exphtmldlg.c:383
+#: src/exphtmldlg.c:378
 msgid "HTML Output File"
 msgstr "Výstupní HTML soubor"
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:173 src/import.c:171
-#: src/importldif.c:568
+#: src/exphtmldlg.c:387 src/expldifdlg.c:404 src/export.c:167 src/import.c:166
+#: src/importldif.c:565
 msgid "B_rowse"
 msgstr "_Procházet"
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
+#: src/exphtmldlg.c:436 src/plugins/fancy/fancy_prefs.c:302
 msgid "Stylesheet"
 msgstr "Šablona stylu"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
-#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
-#: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1040
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
+#: src/exphtmldlg.c:443 src/gtk/colorlabel.c:368 src/gtk/colorlabel.c:494
+#: src/gtk/gtkaspell.c:1572 src/gtk/gtkaspell.c:2207 src/gtk/menu.c:126
+#: src/mainwindow.c:1175 src/plugins/archive/archiver_prefs.c:313
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1420 src/summaryview.c:6246
 msgid "None"
 msgstr "Žádná"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
-#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
-#: src/prefs_other.c:129 src/prefs_other.c:417
+#: src/exphtmldlg.c:444 src/prefs_folder_item.c:531
+#: src/prefs_folder_item.c:1178 src/prefs_folder_item.c:1208
+#: src/prefs_other.c:128 src/prefs_other.c:416
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
+#: src/exphtmldlg.c:445 src/plugins/pgpcore/select-keys.c:240
 #: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
 msgid "Full"
 msgstr "Úplná"
 
-#: src/exphtmldlg.c:456
+#: src/exphtmldlg.c:446
 msgid "Custom"
 msgstr "Vlastní"
 
-#: src/exphtmldlg.c:457
+#: src/exphtmldlg.c:447
 msgid "Custom-2"
 msgstr "Vlastní-2"
 
-#: src/exphtmldlg.c:458
+#: src/exphtmldlg.c:448
 msgid "Custom-3"
 msgstr "Vlastní-3"
 
-#: src/exphtmldlg.c:459
+#: src/exphtmldlg.c:449
 msgid "Custom-4"
 msgstr "Vlastní-4"
 
-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:454
 msgid "Full Name Format"
 msgstr "Celé jméno"
 
-#: src/exphtmldlg.c:474
+#: src/exphtmldlg.c:461
 msgid "First Name, Last Name"
 msgstr "Jméno, příjmení"
 
-#: src/exphtmldlg.c:475
+#: src/exphtmldlg.c:462
 msgid "Last Name, First Name"
 msgstr "Příjmení, jméno"
 
-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:467
 msgid "Color Banding"
 msgstr "Barevné značení"
 
-#: src/exphtmldlg.c:488
+#: src/exphtmldlg.c:471
 msgid "Format Email Links"
 msgstr "Formátovat adresy jako odkazy"
 
-#: src/exphtmldlg.c:494
+#: src/exphtmldlg.c:475
 msgid "Format User Attributes"
 msgstr "Exportovat uživatelské atributy"
 
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:850
+#: src/exphtmldlg.c:517 src/expldifdlg.c:593 src/importldif.c:837
 msgid "Address Book:"
 msgstr "Kniha adres:"
 
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:860
+#: src/exphtmldlg.c:526 src/expldifdlg.c:602 src/importldif.c:846
 msgid "File Name:"
 msgstr "Název souboru:"
 
-#: src/exphtmldlg.c:559
+#: src/exphtmldlg.c:535
 msgid "Open with Web Browser"
 msgstr "Otevřít ve webovém prohlížeči"
 
-#: src/exphtmldlg.c:591
+#: src/exphtmldlg.c:567
 msgid "Export Address Book to HTML File"
 msgstr "Exportovat databázi adres do HTML souboru"
 
-#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:980
+#: src/exphtmldlg.c:633 src/expldifdlg.c:701 src/importldif.c:963
 msgid "File Info"
 msgstr "Informace o souboru"
 
-#: src/exphtmldlg.c:658
+#: src/exphtmldlg.c:634
 msgid "Format"
 msgstr "Formát"
 
@@ -3235,11 +3413,11 @@ msgstr "Chyba při vytváření LDIF souboru"
 msgid "Select LDIF output file"
 msgstr "Vyberte výstupní LDIF soubor"
 
-#: src/expldifdlg.c:400
+#: src/expldifdlg.c:395
 msgid "LDIF Output File"
 msgstr "Výstupní LDIF soubor"
 
-#: src/expldifdlg.c:431
+#: src/expldifdlg.c:425
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
@@ -3249,7 +3427,7 @@ msgstr ""
 "knihy adres. Výsledek bude podobný jako:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:437
+#: src/expldifdlg.c:431
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
@@ -3259,7 +3437,7 @@ msgstr ""
 "(display name) z knihy adres. Výsledek bude podobný jako:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:443
+#: src/expldifdlg.c:437
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
@@ -3269,11 +3447,11 @@ msgstr ""
 "patřící uživateli (mail). Výsledek bude podobný jako:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:489
+#: src/expldifdlg.c:481
 msgid "Suffix"
 msgstr "Přípona"
 
-#: src/expldifdlg.c:499
+#: src/expldifdlg.c:491
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
@@ -3287,15 +3465,15 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
-#: src/expldifdlg.c:507
+#: src/expldifdlg.c:498
 msgid "Relative DN"
 msgstr "Relativní DN"
 
-#: src/expldifdlg.c:515
+#: src/expldifdlg.c:505
 msgid "Unique ID"
 msgstr "Unikátní ID (uid)"
 
-#: src/expldifdlg.c:523
+#: src/expldifdlg.c:512
 msgid ""
 "The LDIF file contains several data records that are usually loaded into an "
 "LDAP server. Each data record in the LDIF file is uniquely identified by a "
@@ -3309,11 +3487,11 @@ msgstr ""
 "rozlišovacím jménem\" (rdn) a příponou. Vyberte jedno z možných rdn, které "
 "má být použito pro vytvoření dn."
 
-#: src/expldifdlg.c:543
+#: src/expldifdlg.c:529
 msgid "Use DN attribute if present in data"
 msgstr "Použít DN atribut, pokud je obsažen v datech"
 
-#: src/expldifdlg.c:548
+#: src/expldifdlg.c:533
 msgid ""
 "The addressbook may contain entries that were previously imported from an "
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3325,11 +3503,11 @@ msgstr ""
 "ve vytvářeném LDIF souboru. RDN vybrané výše bude použito, pokud atribut DN "
 "nebude nalezen."
 
-#: src/expldifdlg.c:558
+#: src/expldifdlg.c:542
 msgid "Exclude record if no Email Address"
 msgstr "Vyloučit záznamy bez e-mailových adres"
 
-#: src/expldifdlg.c:563
+#: src/expldifdlg.c:546
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
@@ -3337,47 +3515,47 @@ msgstr ""
 "Kniha adres může obsahovat záznamy bez e-mailových adres. Pokud zaškrtnete "
 "tuto volbu, budou tyto záznamy ignorovány."
 
-#: src/expldifdlg.c:655
+#: src/expldifdlg.c:635
 msgid "Export Address Book to LDIF File"
 msgstr "Exportovat knihu adres do LDIF souboru"
 
-#: src/expldifdlg.c:722
+#: src/expldifdlg.c:702
 msgid "Distinguished Name"
 msgstr "Rozlišovací jméno (dn)"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:112 src/summaryview.c:8456
 msgid "Export to mbox file"
 msgstr "Exportovat do mbox souboru"
 
-#: src/export.c:132
+#: src/export.c:131
 msgid "Locate the folder to export and specify the mbox file."
 msgstr "Určete zdrojovou složku a cílový mbox soubor."
 
-#: src/export.c:143
+#: src/export.c:142
 msgid "Source folder:"
 msgstr "Zdrojová složka:"
 
-#: src/export.c:149 src/import.c:143
+#: src/export.c:146 src/import.c:142
 msgid "Mbox file:"
 msgstr "Mbox soubor:"
 
-#: src/export.c:205
+#: src/export.c:198
 msgid "Target mbox filename can't be left empty."
 msgstr "Cílový mbox soubor musí být určen."
 
-#: src/export.c:210
+#: src/export.c:203
 msgid "Source folder can't be left empty."
 msgstr "Zdrojová složka musí být určena."
 
-#: src/export.c:223
+#: src/export.c:216
 msgid "Couldn't find the source folder."
 msgstr "Zdrojová složka nebyla nalezena."
 
-#: src/export.c:247
+#: src/export.c:240
 msgid "Select exporting file"
 msgstr "Vyberte soubor pro export"
 
-#: src/export.c:270
+#: src/export.c:263
 msgid "Select folder to export"
 msgstr "Vybrat složku pro export"
 
@@ -3385,7 +3563,7 @@ msgstr "Vybrat složku pro export"
 msgid "Full Name"
 msgstr "Celý název"
 
-#: src/exporthtml.c:772 src/importldif.c:981
+#: src/exporthtml.c:772 src/importldif.c:964
 #: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "Atributy"
@@ -3410,17 +3588,17 @@ msgstr "Název je příliš dlouhý."
 msgid "Not specified."
 msgstr "Není uveden."
 
-#: 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 "Soubor %s chybí! Chcete použít zazálohovaný soubor z %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 "Nemohu zkopírovat %s do %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 "
@@ -3527,51 +3705,51 @@ msgstr "akce nemůže být aplikována\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "žádné další zpracování po akci [ %s ]\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "zpracovávání pravidla '%s' [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "zpracovávání pravidla <unnamed> [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "zakázané pravidlo '%s' [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "zakázané pravidlo <unnamed> [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "nedefinované"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "začlenění"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "manuálně"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "zpracování složky"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "před zpracování"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "následné zpracování"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3588,11 +3766,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3601,7 +3779,7 @@ msgstr ""
 "filtrování zprávy (%s%s%s)\n"
 "%ssoubor zprávy: %s\n"
 
-#: src/folder.c:1595 src/prefs_folder_item.c:319
+#: src/folder.c:1595 src/prefs_folder_item.c:318
 msgid "Inbox"
 msgstr "Doručená pošta"
 
@@ -3610,15 +3788,15 @@ msgid "Sent"
 msgstr "Odeslaná pošta"
 
 #: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
-#: src/prefs_folder_item.c:322
+#: src/prefs_folder_item.c:321
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/folder.c:1607 src/prefs_folder_item.c:323
+#: src/folder.c:1607 src/prefs_folder_item.c:322
 msgid "Trash"
 msgstr "Koš"
 
-#: src/folder.c:1611 src/prefs_folder_item.c:321
+#: src/folder.c:1611 src/prefs_folder_item.c:320
 msgid "Drafts"
 msgstr "Koncepty"
 
@@ -3627,66 +3805,74 @@ msgstr "Koncepty"
 msgid "Processing (%s)...\n"
 msgstr "Zpracovávám (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopíruji %s do %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Přesouvám %s do %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizuji vyrovnávací paměť pro %s..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "Zpracovávám zprávy..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizuji %s pro použití offline...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Jméno složky nemůže začínat nebo končit tečkou."
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "Jméno složky nemůže končit tečkou."
 
-#: src/foldersel.c:250
+#: src/foldersel.c:251
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:574 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
+#: src/foldersel.c:349
+msgid "_New"
+msgstr "_Nový"
+
+#: src/foldersel.c:573 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:582 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:574 src/imap_gtk.c:198 src/mh_gtk.c:147
+msgid "Inherit properties and processing rules from parent folder"
+msgstr "Zdědit vlastnosti a pravidla zpracování z rodičovské složky"
+
+#: src/foldersel.c:584 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
+#: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:431
 #: src/plugins/rssyl/rssyl_cb_menu.c:202
 #: src/plugins/vcalendar/vcal_folder.c:2068
 #, 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:597 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
-#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
+#: src/foldersel.c:599 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:270
+#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:214
 #: src/plugins/vcalendar/vcal_folder.c:2075
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Složka '%s' už existuje."
 
-#: src/foldersel.c:604 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
+#: src/foldersel.c:606 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
 msgid "Can't create the folder '%s'."
@@ -3712,7 +3898,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:253 src/mainwindow.c:562
+#: src/folderview.c:253 src/mainwindow.c:556
 msgid "_Search folder..."
 msgstr "_Prohledat složku..."
 
@@ -3734,13 +3920,13 @@ msgstr "Nastavit Zobrazované sloupce"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6518
 msgid "New"
 msgstr "Nové"
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6520
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Nepřečtené"
@@ -3751,19 +3937,19 @@ msgid "Total"
 msgstr "Celkem"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:453 src/summaryview.c:473
+#: src/folderview.c:453 src/summaryview.c:468
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:783
+#: src/folderview.c:781
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:866 src/summaryview.c:4262
 msgid "Mark all as read"
 msgstr "Označit všechny jako přečtené"
 
-#: src/folderview.c:869
+#: src/folderview.c:867
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3771,15 +3957,15 @@ msgstr ""
 "Opravdu chcete označit všechny zprávy v této složce a jejích podsložkách "
 "jako přečtené?"
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:869 src/summaryview.c:4263
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Opravdu chcete označit všechny zprávy v této složce jako přečtené?"
 
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:872 src/summaryview.c:4308
 msgid "Mark all as unread"
 msgstr "Označit všechny jako nepřečtené"
 
-#: src/folderview.c:875
+#: src/folderview.c:873
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
@@ -3787,95 +3973,95 @@ msgstr ""
 "Opravdu chcete označit všechny zprávy v této složce a jejích podsložkách "
 "jako nepřečtené?"
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:875 src/summaryview.c:4309
 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:1067 src/imap.c:4643
+#: src/folderview.c:1065 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prohledávám složku %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4647 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1068 src/imap.c:4690 src/mainwindow.c:5223 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prohledávám složku %s..."
 
-#: src/folderview.c:1101
+#: src/folderview.c:1099
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:1102
+#: src/folderview.c:1100
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnovení stromu složek vyčistí všechny lokální vyrovnávací paměti. Chcete "
 "pokračovat?"
 
-#: src/folderview.c:1112
+#: src/folderview.c:1110
 msgid "Rebuilding folder tree..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:1114
+#: src/folderview.c:1112
 msgid "Scanning folder tree..."
 msgstr "Prohledávám strom složek..."
 
-#: src/folderview.c:1205
+#: src/folderview.c:1202
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nepodařilo se načíst obsah adresáře %s\n"
 
-#: src/folderview.c:1259
+#: src/folderview.c:1256
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:2233
+#: src/folderview.c:2225
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zavírám složku %s..."
 
-#: src/folderview.c:2328
+#: src/folderview.c:2320
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otevírám složku %s..."
 
-#: src/folderview.c:2346
+#: src/folderview.c:2338
 msgid "Folder could not be opened."
 msgstr "Složku nelze otevřít."
 
-#: src/folderview.c:2486 src/mainwindow.c:2896 src/mainwindow.c:2901
+#: src/folderview.c:2478 src/mainwindow.c:2866 src/mainwindow.c:2871
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2487
+#: src/folderview.c:2479
 msgid "Delete all messages in trash?"
 msgstr "Odstranit všechny zprávy v koši?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2480
 msgid "_Empty trash"
 msgstr "_Vyprázdnit koš"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2524 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Varování offline režimu"
 
-#: src/folderview.c:2533 src/toolbar.c:3033
+#: src/folderview.c:2525 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr "Pracujete v režimu offline. Přepnout?"
 
-#: src/folderview.c:2544 src/toolbar.c:3052
+#: src/folderview.c:2536 src/toolbar.c:3052
 msgid "Send queued messages"
 msgstr "Odeslat pozdržené zprávy"
 
-#: src/folderview.c:2545 src/toolbar.c:3053
+#: src/folderview.c:2537 src/toolbar.c:3053
 msgid "Send all queued messages?"
 msgstr "Odeslat všechny zprávy ve frontě pozdržených zpráv?"
 
-#: src/folderview.c:2554 src/toolbar.c:3072
+#: src/folderview.c:2546 src/toolbar.c:3072
 msgid "Some errors occurred while sending queued messages."
 msgstr "Při posílání pozdržených zpráv nastala stejná chyba."
 
-#: src/folderview.c:2557 src/main.c:2812 src/toolbar.c:3075
+#: src/folderview.c:2549 src/main.c:2882 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3884,64 +4070,64 @@ msgstr ""
 "Při odesílání pozdržených zpráv nastala chyba:\n"
 "%s"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2624
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Opravdu chcete složku '%s' zkopírovat do '%s'?"
 
-#: src/folderview.c:2633
+#: src/folderview.c:2625
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Opravdu chcete složku '%s' učinit podsložkou složky '%s'?"
 
-#: src/folderview.c:2635
+#: src/folderview.c:2627
 msgid "Copy folder"
 msgstr "Kopírovat složku"
 
-#: src/folderview.c:2635
+#: src/folderview.c:2627
 msgid "Move folder"
 msgstr "Přesunout složku"
 
-#: src/folderview.c:2646
+#: src/folderview.c:2638
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopíruji %s do %s..."
 
-#: src/folderview.c:2646
+#: src/folderview.c:2638
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Přesouvám %s do %s..."
 
-#: src/folderview.c:2680
+#: src/folderview.c:2672
 msgid "Source and destination are the same."
 msgstr "Zdroj i cíl jsou totožné."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2675
 msgid "Can't copy a folder to one of its children."
 msgstr "Nelze kopírovat složku do své vlastní podsložky."
 
-#: src/folderview.c:2684
+#: src/folderview.c:2676
 msgid "Can't move a folder to one of its children."
 msgstr "Nelze přesunout složku do své vlastní podsložky."
 
-#: src/folderview.c:2687
+#: src/folderview.c:2679
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Složka nemůže být přesouvána mezi různými poštovními schránkami."
 
-#: src/folderview.c:2690
+#: src/folderview.c:2682
 msgid "Copy failed!"
 msgstr "Kopírování se nezdařilo!"
 
-#: src/folderview.c:2690
+#: src/folderview.c:2682
 msgid "Move failed!"
 msgstr "Přesun se nezdařil!"
 
-#: src/folderview.c:2740
+#: src/folderview.c:2732
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Zpracování složky - pravidla pro složku %s"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3155 src/summaryview.c:4717 src/summaryview.c:4823
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Cílová složka může být použita pouze k uložení podsložek."
 
@@ -3953,49 +4139,49 @@ msgstr "Přihlásit diskusní skupiny"
 msgid "Select newsgroups for subscription:"
 msgstr "Vyberte diskuzní skupinu pro přihlášení:"
 
-#: src/grouplistdialog.c:184
+#: src/grouplistdialog.c:192
 msgid "Find groups:"
 msgstr "Najít skupiny:"
 
-#: src/grouplistdialog.c:192
+#: src/grouplistdialog.c:201
 msgid " Search "
 msgstr " Vyhledat "
 
-#: src/grouplistdialog.c:204
+#: src/grouplistdialog.c:215
 msgid "Newsgroup name"
 msgstr "Název diskusní skupiny"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:188
+#: src/grouplistdialog.c:216 src/prefs_send.c:188
 msgid "Messages"
 msgstr "Zprávy"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:217
 msgid "Type"
 msgstr "Typ"
 
-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:357
 msgid "moderated"
 msgstr "moderovaný"
 
-#: src/grouplistdialog.c:348
+#: src/grouplistdialog.c:359
 msgid "readonly"
 msgstr "pouze pro čtení"
 
-#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/grouplistdialog.c:361 src/plugins/att_remover/att_remover.c:303
 #: src/plugins/vcalendar/vcal_manager.c:115
 #: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr "neznámý"
 
-#: src/grouplistdialog.c:424
+#: src/grouplistdialog.c:436
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemohu načíst seznam diskuzních skupin."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1877 src/summaryview.c:1669
 msgid "Done."
 msgstr "Hotovo."
 
-#: src/grouplistdialog.c:494
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskuzních skupin přijato (%s načteno)"
@@ -4021,13 +4207,13 @@ msgstr ""
 "Claws Mail je volně šiřitelný software distribuovaný pod licencí GPL. Pokud "
 "chcete přispět na projekt Claws Mail, můžete tak učinit na:"
 
-#: src/gtk/about.c:163 src/gtk/about.c:852
+#: src/gtk/about.c:163 src/gtk/about.c:857
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "a Hiroyuki Yamamoto"
 
@@ -4062,94 +4248,94 @@ msgstr ""
 "Lokalizace: %s (znaková sada: %s)\n"
 "Operační systém: neznámý"
 
-#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
+#: src/gtk/about.c:249 src/prefs_themes.c:842 src/wizard.c:529
 msgid "The Claws Mail Team"
 msgstr "Tým Claws Mail"
 
-#: src/gtk/about.c:267
+#: src/gtk/about.c:268
 msgid "Previous team members"
 msgstr "Dřívější členové týmu"
 
-#: src/gtk/about.c:286
+#: src/gtk/about.c:287
 msgid "The translation team"
 msgstr "Překladatelský tým"
 
-#: src/gtk/about.c:305
+#: src/gtk/about.c:306
 msgid "Documentation team"
 msgstr "Tým pro dokumentaci"
 
-#: src/gtk/about.c:323
+#: src/gtk/about.c:324
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:342
+#: src/gtk/about.c:343
 msgid "Icons"
 msgstr "Ikony"
 
-#: src/gtk/about.c:361
+#: src/gtk/about.c:362
 msgid "Contributors"
 msgstr "Přispěvatelé"
 
-#: src/gtk/about.c:409
+#: src/gtk/about.c:411
 msgid "Compiled-in Features"
 msgstr "Zakompilované vlastnosti"
 
-#: src/gtk/about.c:426
+#: src/gtk/about.c:428
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "obrázky X-Face v hlavičce zprávy\n"
 
-#: src/gtk/about.c:436
+#: src/gtk/about.c:438
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "přidává podporu pro kontrolu pravopisu\n"
 
-#: src/gtk/about.c:446
+#: src/gtk/about.c:448
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "přidává podporu pro šifrované spojení k severům\n"
 
-#: src/gtk/about.c:456
+#: src/gtk/about.c:458
 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:467
+#: src/gtk/about.c:469
 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:477
+#: src/gtk/about.c:479
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "práce s adresáři PalmOS\n"
 
-#: src/gtk/about.c:487
+#: src/gtk/about.c:489
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "práce s adresáři LDAP\n"
 
-#: src/gtk/about.c:497
+#: src/gtk/about.c:499
 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:507
+#: src/gtk/about.c:509
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "správa X relací\n"
 
-#: src/gtk/about.c:517
+#: src/gtk/about.c:519
 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:527
+#: src/gtk/about.c:529
 msgctxt "librSVG"
 msgid "adds support for SVG themes\n"
 msgstr "přidává podporu SVG témat\n"
 
-#: src/gtk/about.c:559
+#: src/gtk/about.c:562
 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 "
@@ -4160,7 +4346,7 @@ msgstr ""
 "Foundation a to ve verzi 3, nebo (podle vašeho uvážení) v jakékoliv pozdější "
 "verzi."
 
-#: src/gtk/about.c:566
+#: src/gtk/about.c:569
 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 "
@@ -4170,7 +4356,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:585
+#: src/gtk/about.c:587
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4178,145 +4364,145 @@ msgstr ""
 "Kopii GNU General Public License byste měli obdržet společně s tímto "
 "programem. Pokud ne, viz. "
 
-#: src/gtk/about.c:718 src/main.c:2636
+#: src/gtk/about.c:722 src/main.c:2706
 msgid "Session statistics\n"
 msgstr "Statistiky relace\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2646 src/main.c:2649
+#: src/gtk/about.c:732 src/gtk/about.c:735 src/main.c:2716 src/main.c:2719
 #, c-format
 msgid "Started: %s\n"
 msgstr "Spuštěno: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2655
+#: src/gtk/about.c:742 src/main.c:2725
 msgid "Incoming traffic\n"
 msgstr "Příchozí provoz\n"
 
-#: src/gtk/about.c:741 src/main.c:2658
+#: src/gtk/about.c:745 src/main.c:2728
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Přijaté zprávy: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2664
+#: src/gtk/about.c:752 src/main.c:2734
 msgid "Outgoing traffic\n"
 msgstr "Odchozí provoz\n"
 
-#: src/gtk/about.c:751 src/main.c:2667
+#: src/gtk/about.c:755 src/main.c:2737
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/přesměrované zprávy: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2671
+#: src/gtk/about.c:760 src/main.c:2741
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Zodpovězené zprávy: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2675
+#: src/gtk/about.c:765 src/main.c:2745
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Přeposlané zprávy: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2679
+#: src/gtk/about.c:770 src/main.c:2749
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Celkem odchozích zpráv: %d\n"
 
-#: src/gtk/about.c:793
+#: src/gtk/about.c:797
 msgid "About Claws Mail"
 msgstr "O Claws Mail"
 
-#: src/gtk/about.c:866
+#: src/gtk/about.c:872
 msgid "_Info"
 msgstr "_Informace"
 
-#: src/gtk/about.c:872
+#: src/gtk/about.c:878
 msgid "_Authors"
 msgstr "_Autoři"
 
-#: src/gtk/about.c:878
+#: src/gtk/about.c:884
 msgid "_Features"
 msgstr "_Vlastnosti"
 
-#: src/gtk/about.c:884
+#: src/gtk/about.c:890
 msgid "_License"
 msgstr "_Licence"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:898
 msgid "_Release Notes"
 msgstr "_Poznámky k verzi"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:904
 msgid "_Statistics"
 msgstr "_Statistiky"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
+#: src/gtk/colorlabel.c:37 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:369
 msgid "Red"
 msgstr "Červená"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Růžová"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Nebeská modř"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:385
 msgid "Green"
 msgstr "Zelená"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Hnědá"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Šedá"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Světle hnědá"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Tmavě červená"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Tmavě růžová"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Ocelově modrá"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Zlatá"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Světle zelená"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Fialová"
 
-#: src/gtk/foldersort.c:241
+#: src/gtk/foldersort.c:229
 msgid "Set mailbox order"
 msgstr "Nastavit pořadí schránek"
 
-#: src/gtk/foldersort.c:277
+#: src/gtk/foldersort.c:265
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr "Přesouváním schránek nahoru nebo dolů můžete změnit pořadí v seznamu."
 
-#: src/gtk/foldersort.c:311
+#: src/gtk/foldersort.c:299
 msgid "Mailboxes"
 msgstr "Schránky"
 
@@ -4338,20 +4524,20 @@ msgstr "Nelze inicializovat Enchat broker."
 msgid "Couldn't initialize %s dictionary:"
 msgstr "Nelze inicializovat %s slovník:"
 
-#: src/gtk/gtkaspell.c:1070
+#: src/gtk/gtkaspell.c:1067
 msgid "No misspelled word found."
 msgstr "Kontrola pravopisu provedena."
 
-#: src/gtk/gtkaspell.c:1451
+#: src/gtk/gtkaspell.c:1445
 msgid "Replace unknown word"
 msgstr "Nahradit neznámé slovo"
 
-#: src/gtk/gtkaspell.c:1467
+#: src/gtk/gtkaspell.c:1461
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "Nahradit \"%s\": "
 
-#: src/gtk/gtkaspell.c:1510
+#: src/gtk/gtkaspell.c:1505
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -4359,55 +4545,55 @@ msgstr ""
 "Podržení klávesy Control při stisku Enter\n"
 "aktivuje učení z chyby.\n"
 
-#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
+#: src/gtk/gtkaspell.c:1806 src/gtk/gtkaspell.c:1943
 msgid "More..."
 msgstr "Více..."
 
-#: src/gtk/gtkaspell.c:1867
+#: src/gtk/gtkaspell.c:1862
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" neznámé ve slovníku '%s'"
 
-#: src/gtk/gtkaspell.c:1883
+#: src/gtk/gtkaspell.c:1877
 msgid "Accept in this session"
 msgstr "Přijmout pro tuto relaci"
 
-#: src/gtk/gtkaspell.c:1893
+#: src/gtk/gtkaspell.c:1887
 msgid "Add to personal dictionary"
 msgstr "Přidat do vlastního slovníku"
 
-#: src/gtk/gtkaspell.c:1903
+#: src/gtk/gtkaspell.c:1897
 msgid "Replace with..."
 msgstr "Nahradit čím..."
 
-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1910
 #, c-format
 msgid "Check with %s"
 msgstr "Otestovat pomocí %s"
 
-#: src/gtk/gtkaspell.c:1938
+#: src/gtk/gtkaspell.c:1932
 msgid "(no suggestions)"
 msgstr "(nejsou návrhy)"
 
-#: src/gtk/gtkaspell.c:2012
+#: src/gtk/gtkaspell.c:2006
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Slovník: %s"
 
-#: src/gtk/gtkaspell.c:2027
+#: src/gtk/gtkaspell.c:2020
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Použít předchozí (%s)"
 
-#: src/gtk/gtkaspell.c:2038
+#: src/gtk/gtkaspell.c:2031
 msgid "Use both dictionaries"
 msgstr "Použít oba slovníky"
 
-#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2047 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr "Kontrolovat během psaní"
 
-#: src/gtk/gtkaspell.c:2154
+#: src/gtk/gtkaspell.c:2129
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4416,7 +4602,7 @@ msgstr ""
 "Nepodařilo se změnit slovník pro kontrolu pravopisu.\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2210
+#: src/gtk/gtkaspell.c:2185
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4425,40 +4611,109 @@ msgstr ""
 "Nepodařilo se změnit alternativní slovník pro kontrolu pravopisu.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1862
-msgid "Failed: no service record found."
-msgstr "Selhalo: nenalezen záznam o službě."
+#: src/gtk/gtkutils.c:66 src/gtk/quicksearch.c:991 src/gtk/quicksearch.c:1020
+msgid "_Information"
+msgstr "_Informace"
 
-#: src/gtk/gtkutils.c:1865
-msgid "Failed: network error."
-msgstr "Selhalo: chyba sítě."
+#: src/gtk/gtkutils.c:67 src/mimeview.c:221
+msgid "_Open"
+msgstr "_Otevřít"
 
-#: src/gtk/gtkutils.c:1868
-#, c-format
-msgid "Failed: unknown error (%d)."
-msgstr "Selhalo: neznámá chyba (%d)."
+#: src/gtk/gtkutils.c:68
+msgid "_Properties"
+msgstr "_Vlastnosti"
 
-#: src/gtk/gtkutils.c:1938
-msgid "Configuring..."
-msgstr "Nastavování..."
+#: src/gtk/gtkutils.c:70 src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
+msgid "C_lear"
+msgstr "Vyč_istit"
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:646 src/prefs_matcher.c:2217 src/prefs_summaries.c:634
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:471
-msgid "Date"
-msgstr "Datum"
+#: src/gtk/gtkutils.c:72
+msgid "D_elete"
+msgstr "_Smazat"
 
-#: src/gtk/headers.h:9
-msgid "Date:"
-msgstr "Datum:"
+#: src/gtk/gtkutils.c:74
+msgid "Find and _Replace"
+msgstr "Najít a na_hradit"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1222
-#: src/prefs_matcher.c:2214 src/prefs_summaries.c:636
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:469
-msgid "From"
-msgstr "Od"
+#: src/gtk/gtkutils.c:78
+msgid "_Bottom"
+msgstr "_Konec"
+
+#: src/gtk/gtkutils.c:79
+msgid "_Down"
+msgstr "_Dolů"
+
+#: src/gtk/gtkutils.c:80 src/wizard.c:1812
+msgid "_Next"
+msgstr "_Další"
+
+#: src/gtk/gtkutils.c:81 src/wizard.c:1811
+msgid "_Previous"
+msgstr "_Předchozí"
+
+#: src/gtk/gtkutils.c:82
+msgid "_Top"
+msgstr "_Začátek"
+
+#: src/gtk/gtkutils.c:83
+msgid "_Up"
+msgstr "_Nahoru"
+
+#: src/gtk/gtkutils.c:84 src/mainwindow.c:681
+msgid "Help"
+msgstr "Nápověda"
+
+#: src/gtk/gtkutils.c:85
+msgid "_Add"
+msgstr "_Přidat"
+
+#: src/gtk/gtkutils.c:87
+msgid "_Stop"
+msgstr "_Zastavit"
+
+#: src/gtk/gtkutils.c:88
+msgid "_Execute"
+msgstr "_Spustit"
+
+#: src/gtk/gtkutils.c:89
+msgid "_Refresh"
+msgstr "_Obnovit"
+
+#: src/gtk/gtkutils.c:1882
+msgid "Failed: no service record found."
+msgstr "Selhalo: nenalezen záznam o službě."
+
+#: src/gtk/gtkutils.c:1885
+msgid "Failed: network error."
+msgstr "Selhalo: chyba sítě."
+
+#: src/gtk/gtkutils.c:1888
+#, c-format
+msgid "Failed: unknown error (%d)."
+msgstr "Selhalo: neznámá chyba (%d)."
+
+#: src/gtk/gtkutils.c:1958
+msgid "Configuring..."
+msgstr "Nastavování..."
+
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2212 src/prefs_summaries.c:634
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:466
+msgid "Date"
+msgstr "Datum"
+
+#: src/gtk/headers.h:9
+msgid "Date:"
+msgstr "Datum:"
+
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:853
+#: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2209
+#: src/prefs_summaries.c:636 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/summaryview.c:464
+msgid "From"
+msgstr "Od"
 
-#: src/gtk/headers.h:10 src/summary_search.c:415
+#: src/gtk/headers.h:10 src/summary_search.c:423
 msgid "From:"
 msgstr "Od:"
 
@@ -4474,14 +4729,15 @@ msgstr "Odesílatel:"
 msgid "Reply-To"
 msgstr "Odpovědět komu"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1223
-#: src/prefs_matcher.c:2215 src/prefs_summaries.c:637
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:470
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:859
+#: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2210
+#: src/prefs_summaries.c:637 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/summaryview.c:465
 msgid "To"
 msgstr "Komu"
 
 #: 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:2211 src/quote_fmt.c:57
 msgid "Cc"
 msgstr "Kopie"
 
@@ -4490,7 +4746,7 @@ msgid "Bcc"
 msgstr "Skrytá kopie"
 
 #: 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:2213 src/quote_fmt.c:60
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4503,7 +4759,7 @@ msgid "In-Reply-To"
 msgstr "V odpovědi komu"
 
 #: 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:2215 src/quote_fmt.c:59
 msgid "References"
 msgstr "References"
 
@@ -4511,14 +4767,15 @@ msgstr "References"
 msgid "References:"
 msgstr "References:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1221
-#: src/prefs_matcher.c:2213 src/prefs_summaries.c:638
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:468
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:847
+#: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2208
+#: src/prefs_summaries.c:638 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/summaryview.c:463
 msgid "Subject"
 msgstr "Předmět"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
-#: src/summary_search.c:429
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/summary_search.c:435
 msgid "Subject:"
 msgstr "Předmět:"
 
@@ -4534,7 +4791,7 @@ msgstr "Komentáře:"
 msgid "Keywords"
 msgstr "Klíčová slova"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:711
 msgid "Keywords:"
 msgstr "Klíčová slova:"
 
@@ -4611,7 +4868,7 @@ msgid "Received:"
 msgstr "Příjmuto:"
 
 #: 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:2214 src/quote_fmt.c:58
 msgid "Newsgroups"
 msgstr "Diskusní skupiny"
 
@@ -4636,9 +4893,9 @@ msgid "Seen:"
 msgstr "Zobrazen:"
 
 #: 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:188 src/prefs_summaries.c:642
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1031 src/ssl_manager.c:124
+#: src/summaryview.c:2888
 msgid "Status"
 msgstr "Stav"
 
@@ -4710,7 +4967,7 @@ msgstr "Priorita"
 msgid "Precedence:"
 msgstr "Priorita:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1238
 msgid "Organization"
 msgstr "Organizace"
 
@@ -4838,148 +5095,148 @@ msgstr "Od, Komu nebo Předmět"
 msgid "From, To or Subject:"
 msgstr "Od, Komu nebo Předmět:"
 
-#: src/gtk/icon_legend.c:67
+#: src/gtk/icon_legend.c:66
 msgid "New message"
 msgstr "Nová zpráva"
 
-#: src/gtk/icon_legend.c:68
+#: src/gtk/icon_legend.c:67
 msgid "Unread message"
 msgstr "Nepřečtená zpráva"
 
-#: src/gtk/icon_legend.c:69
+#: src/gtk/icon_legend.c:68
 msgid "Message has been replied to"
 msgstr "Zpráva, na kterou bylo odpovězeno"
 
-#: src/gtk/icon_legend.c:70
+#: src/gtk/icon_legend.c:69
 msgid "Message has been forwarded"
 msgstr "Zpráva byla předána"
 
-#: src/gtk/icon_legend.c:71
+#: src/gtk/icon_legend.c:70
 msgid "Message has been forwarded and replied to"
 msgstr "Zpráva byla přeposlána a bylo na ni odpovězeno"
 
-#: src/gtk/icon_legend.c:72
+#: src/gtk/icon_legend.c:71
 msgid "Message is in an ignored thread"
 msgstr "Zpráva je v ignorovaném vlákně"
 
-#: src/gtk/icon_legend.c:73
+#: src/gtk/icon_legend.c:72
 msgid "Message is in a watched thread"
 msgstr "Zpráva je ve sledovaném vlákně"
 
-#: src/gtk/icon_legend.c:74
+#: src/gtk/icon_legend.c:73
 msgid "Message is spam"
 msgstr "Nevyžádaná zpráva (spam)"
 
-#: src/gtk/icon_legend.c:76
+#: src/gtk/icon_legend.c:75
 msgid "Message has attachment(s)"
 msgstr "Zpráva má přílohu/přílohy"
 
-#: src/gtk/icon_legend.c:77
+#: src/gtk/icon_legend.c:76
 msgid "Digitally signed message"
 msgstr "Digitálně podepsaná zpráva"
 
-#: src/gtk/icon_legend.c:78
+#: src/gtk/icon_legend.c:77
 msgid "Encrypted message"
 msgstr "Šifrovaná zpráva"
 
-#: src/gtk/icon_legend.c:79
+#: src/gtk/icon_legend.c:78
 msgid "Message is signed and has attachment(s)"
 msgstr "Zpráva je digitálně podepsaná a má přílohu/přílohy"
 
-#: src/gtk/icon_legend.c:80
+#: src/gtk/icon_legend.c:79
 msgid "Message is encrypted and has attachment(s)"
 msgstr "Zpráva je šifrovaná a má přílohu/přílohy"
 
-#: src/gtk/icon_legend.c:82
+#: src/gtk/icon_legend.c:81
 msgid "Marked message"
 msgstr "Označená zpráva"
 
-#: src/gtk/icon_legend.c:83
+#: src/gtk/icon_legend.c:82
 msgid "Message is marked for deletion"
 msgstr "Zpráva je označena k odstranění"
 
-#: src/gtk/icon_legend.c:84
+#: src/gtk/icon_legend.c:83
 msgid "Message is marked for moving"
 msgstr "Zpráva je označena pro přesun"
 
-#: src/gtk/icon_legend.c:85
+#: src/gtk/icon_legend.c:84
 msgid "Message is marked for copying"
 msgstr "Zpráva je označena pro kopírování"
 
-#: src/gtk/icon_legend.c:87
+#: src/gtk/icon_legend.c:86
 msgid "Locked message"
 msgstr "Zamknutá zpráva"
 
-#: src/gtk/icon_legend.c:89
+#: src/gtk/icon_legend.c:88
 msgid "Folder (normal, opened)"
 msgstr "Složka (normální, otevřená)"
 
-#: src/gtk/icon_legend.c:90
+#: src/gtk/icon_legend.c:89
 msgid "Folder with read messages hidden"
 msgstr "Složka se skrytými přečtenými zprávami"
 
-#: src/gtk/icon_legend.c:91
+#: src/gtk/icon_legend.c:90
 msgid "Folder contains marked messages"
 msgstr "Složka obsahuje označené zprávy"
 
-#: src/gtk/icon_legend.c:92
+#: src/gtk/icon_legend.c:91
 msgid "IMAP folder which contains sub-folders only"
 msgstr "IMAP složka obsahující jen podsložky"
 
-#: src/gtk/icon_legend.c:93
+#: src/gtk/icon_legend.c:92
 msgid "IMAP mailbox showing only subscribed folders"
 msgstr "Zobrazovat pouze odebírané složky IMAP"
 
-#: src/gtk/icon_legend.c:127
+#: src/gtk/icon_legend.c:126
 msgid "Icon Legend"
 msgstr "Význam ikon"
 
-#: src/gtk/icon_legend.c:146
+#: src/gtk/icon_legend.c:145
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr "Následující ikony jsou používány pro zobrazení stavu zpráv a složek:"
 
-#: src/gtk/inputdialog.c:228 src/gtk/inputdialog.c:250
+#: src/gtk/inputdialog.c:227 src/gtk/inputdialog.c:249
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Zadejte heslo pro %s na %s:"
 
-#: src/gtk/inputdialog.c:231 src/gtk/inputdialog.c:234
-#: src/gtk/inputdialog.c:253 src/gtk/inputdialog.c:256
+#: src/gtk/inputdialog.c:230 src/gtk/inputdialog.c:233
+#: src/gtk/inputdialog.c:252 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s:"
 msgstr "Zadejte heslo pro %s:"
 
-#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:259
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:258
 msgid "Input password:"
 msgstr "Zadejte heslo:"
 
-#: src/gtk/inputdialog.c:238 src/gtk/inputdialog.c:266
-#: src/gtk/inputdialog.c:278
+#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:265
+#: src/gtk/inputdialog.c:277
 msgid "Input password"
 msgstr "Zadejte heslo"
 
-#: src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:267
 msgid "Remember password for this session"
 msgstr "Pamatovat heslo pro tuto relaci"
 
-#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
+#: src/gtk/inputdialog.c:364 src/gtk/inputdialog.c:411
 msgid "Remember this"
 msgstr "Zapamatovat"
 
-#: src/gtk/logwindow.c:450
+#: src/gtk/logwindow.c:419
 msgid "_Go to last error"
 msgstr "_Jít na poslední chybu"
 
-#: src/gtk/logwindow.c:457
+#: src/gtk/logwindow.c:426
 msgid "Clear _Log"
 msgstr "Vyčistit _protokol"
 
-#: src/gtk/menu.c:139
+#: src/gtk/menu.c:138
 msgid "Warning:"
 msgstr "Varování:"
 
-#: src/gtk/menu.c:140
+#: src/gtk/menu.c:139
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5022,290 +5279,297 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
-#: src/plugins/address_keeper/address_keeper_prefs.c:273
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:776
+#: src/plugins/address_keeper/address_keeper_prefs.c:280
 #: src/plugins/archive/archiver_prefs.c:106
-#: src/plugins/attachwarner/attachwarner_prefs.c:229
+#: src/plugins/attachwarner/attachwarner_prefs.c:230
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
 #: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:137
-#: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/gdata/cm_gdata_prefs.c:141
+#: src/plugins/libravatar/libravatar_prefs.c:563
+#: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
-#: src/plugins/notification/notification_prefs.c:398
-#: src/plugins/notification/notification_prefs.c:413
-#: src/plugins/notification/notification_prefs.c:432
-#: src/plugins/notification/notification_prefs.c:450
-#: src/plugins/notification/notification_prefs.c:468
-#: src/plugins/notification/notification_prefs.c:486
-#: src/plugins/notification/notification_prefs.c:504
-#: src/plugins/notification/notification_prefs.c:522
+#: src/plugins/notification/notification_prefs.c:403
+#: src/plugins/notification/notification_prefs.c:419
+#: src/plugins/notification/notification_prefs.c:438
+#: src/plugins/notification/notification_prefs.c:456
+#: src/plugins/notification/notification_prefs.c:474
+#: src/plugins/notification/notification_prefs.c:492
+#: src/plugins/notification/notification_prefs.c:510
+#: src/plugins/notification/notification_prefs.c:528
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:670
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
+#: src/plugins/spamassassin/spamassassin_gtk.c:665
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:923
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:338
 msgid "_Load..."
 msgstr "_Zavést..."
 
-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:339
 msgid "_Unload"
 msgstr "_Odebrat"
 
-#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:237
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:237
 msgid "Description"
 msgstr "Popis"
 
-#: src/gtk/pluginwindow.c:376
+#: src/gtk/pluginwindow.c:378
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
 "Pro více informací o zásuvných modulech navštivte %stránku Claws Mail%s."
 
-#: src/gtk/pluginwindow.c:417
+#: src/gtk/pluginwindow.c:419
 msgid "Click here to load one or more plugins"
 msgstr "Klikněte zde pro načtení jednoho nebo více modulů"
 
-#: src/gtk/pluginwindow.c:420
+#: src/gtk/pluginwindow.c:422
 msgid "Unload the selected plugin"
 msgstr "Odebrat vybraný zásuvný modul"
 
-#: src/gtk/pluginwindow.c:485
+#: src/gtk/pluginwindow.c:488
 msgid "Loaded plugins"
 msgstr "Zavedené moduly"
 
-#: src/gtk/prefswindow.c:640
+#: src/gtk/prefswindow.c:503 src/gtk/prefswindow.c:508
+#: src/plugins/archive/archiver_gtk.c:946
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
+msgid "_Apply"
+msgstr "_Použít"
+
+#: src/gtk/prefswindow.c:639
 msgid "Page Index"
 msgstr "Index stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:847
 msgid "_Hide"
 msgstr "_Skrýt"
 
 #: 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:4035 src/prefs_account.c:4053 src/prefs_account.c:4071
+#: src/prefs_account.c:4089 src/prefs_account.c:4107 src/prefs_account.c:4125
+#: src/prefs_account.c:4143 src/prefs_account.c:4162 src/prefs_account.c:4255
+#: src/prefs_account.c:4273 src/prefs_filtering_action.c:1380
+#: src/prefs_filtering.c:395 src/prefs_filtering.c:1863
 msgid "Account"
 msgstr "Účet"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:407
 msgid "all messages"
 msgstr "všechny zprávy"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:408
 msgid "messages whose age is greater than # days"
 msgstr "zprávy starší než # dnů"
 
-#: src/gtk/quicksearch.c:474
+#: src/gtk/quicksearch.c:409
 msgid "messages whose age is less than # days"
 msgstr "zprávy mladší než # dnů"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:410
 msgid "messages whose age is greater than # hours"
 msgstr "zprávy starší než # hodin"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:411
 msgid "messages whose age is less than # hours"
 msgstr "zprávy mladší než # hodin"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:412
 msgid "messages which contain S in the message body"
 msgstr "zprávy obsahující S v těle zprávy"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:413
 msgid "messages which contain S in the whole message"
 msgstr "zprávy obsahující S v celé zprávě"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:414
 msgid "messages carbon-copied to S"
 msgstr "zpráva obsahující S v poli \"Kopie\""
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:415
 msgid "message is either To: or Cc: to S"
 msgstr "zpráva obsahující S v poli \"Komu\" nebo \"Kopie\""
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:416
 msgid "deleted messages"
 msgstr "odstraněné zprávy"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:417
 msgid "messages whose date is after requested date (time is optional)"
 msgstr "zprávy jejichž datum je po požadovaném (čas je volitelný)"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:419
 msgid "messages whose date is before requested date (time is optional)"
 msgstr "zprávy jejichž datum je před požadovaným (čas je volitelný)"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:421
 msgid "messages which contain S in the Sender field"
 msgstr "zpráva obsahující S v poli \"Odesílatel\""
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:422
 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, pokud bylo provedení \"S\" úspěšné"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:423
 msgid "messages originating from user S"
 msgstr "zprávy pocházející od uživatele S"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:424
 msgid "forwarded messages"
 msgstr "přeposlané zprávy"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:425
 msgid "messages which have attachments"
 msgstr "zprávy, které mají přílohy"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr "zprávy obsahující S ve jméně nebo hodnotě záhlaví"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:427
 msgid "messages which contain S in the value of any header"
 msgstr "zprávy obsahující S v hodnotě záhlaví"
 
-#: src/gtk/quicksearch.c:493
+#: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "zprávy obsahující S v záhlaví \"Message-ID\""
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:429
 msgid "messages which contain S in In-Reply-To header"
 msgstr "zprávy obsahující S v záhlaví In-Reply-To"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:430
 msgid "messages which are marked with color #"
 msgstr "zprávy obarvené barvou č. #"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:431
 msgid "locked messages"
 msgstr "zamknuté zprávy"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:432
 msgid "messages which are in newsgroup S"
 msgstr "zprávy, které jsou v diskusní skupině S"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:433
 msgid "new messages"
 msgstr "nové zprávy"
 
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:434
 msgid "old messages"
 msgstr "staré zprávy"
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:435
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "nekompletní zprávy (zprávy neúplně stažené)"
 
-#: src/gtk/quicksearch.c:501
+#: src/gtk/quicksearch.c:436
 msgid "messages which you have replied to"
 msgstr "zprávy, na které bylo odpovězeno"
 
-#: src/gtk/quicksearch.c:502
+#: src/gtk/quicksearch.c:437
 msgid "read messages"
 msgstr "přečtené zprávy"
 
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:438
 msgid "messages which contain S in subject"
 msgstr "zprávy obsahující S v poli \"Předmět\""
 
-#: src/gtk/quicksearch.c:504
+#: src/gtk/quicksearch.c:439
 msgid "messages whose score is equal to # points"
 msgstr "zprávy, jejichž ohodnocení je rovné # bodům"
 
-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:440
 msgid "messages whose score is greater than # points"
 msgstr "zprávy, jejichž ohodnocení je větší než # bodů"
 
-#: src/gtk/quicksearch.c:506
+#: src/gtk/quicksearch.c:441
 msgid "messages whose score is lower than # points"
 msgstr "zprávy, jejichž ohodnocení je menší než # bodů"
 
-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:442
 msgid "messages whose size is equal to # bytes"
 msgstr "zprávy, jejichž velikost je rovna # bytů"
 
-#: src/gtk/quicksearch.c:508
+#: src/gtk/quicksearch.c:443
 msgid "messages whose size is greater than # bytes"
 msgstr "zprávy, jejichž velikost je větší než # bytů"
 
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:444
 msgid "messages whose size is smaller than # bytes"
 msgstr "zprávy, jejichž velikost je menší než # bytů"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:445
 msgid "messages which have been sent to S"
 msgstr "zprávy, které byly odeslány S"
 
-#: src/gtk/quicksearch.c:511
+#: src/gtk/quicksearch.c:446
 msgid "messages which tags contain S"
 msgstr "zprávy se značkami obsahujícími S"
 
-#: src/gtk/quicksearch.c:512
+#: src/gtk/quicksearch.c:447
 msgid "messages which have tag(s)"
 msgstr "zprávy, se značkami"
 
-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:448
 msgid "marked messages"
 msgstr "označené zprávy"
 
-#: src/gtk/quicksearch.c:514
+#: src/gtk/quicksearch.c:449
 msgid "unread messages"
 msgstr "nepřečtené zprávy"
 
-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:450
 msgid "messages which contain S in References header"
 msgstr "zprávy obsahující S v záhlaví \"References\""
 
-#: src/gtk/quicksearch.c:516
+#: src/gtk/quicksearch.c:451
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "zprávy vracející 0, jsou-li předány příkazu - %F je soubor se zprávou"
 
-#: src/gtk/quicksearch.c:517
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in X-Label header"
 msgstr "zprávy obsahující S v záhlaví \"X-Label\""
 
-#: src/gtk/quicksearch.c:519
+#: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "logický operátor A (AND)"
 
-#: src/gtk/quicksearch.c:520
+#: src/gtk/quicksearch.c:455
 msgid "logical OR operator"
 msgstr "logický operátor NEBO (OR)"
 
-#: src/gtk/quicksearch.c:521
+#: src/gtk/quicksearch.c:456
 msgid "logical NOT operator"
 msgstr "logický operátor NENÍ PRAVDA, ŽE (NOT)"
 
-#: src/gtk/quicksearch.c:522
+#: src/gtk/quicksearch.c:457
 msgid "case sensitive search"
 msgstr "vyhledávání rozlišuje malá a velká písmena"
 
-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:458
 msgid "match using regular expressions instead of substring search"
 msgstr "shodné pomocí regulárních výrazů místo hledání části řetězce"
 
-#: src/gtk/quicksearch.c:525
+#: src/gtk/quicksearch.c:460
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
 msgstr ""
 "výrazy pro filtrování jsou povoleny, ale nemůžou být mixovány ve výrazu výše"
 
-#: src/gtk/quicksearch.c:535 src/summary_search.c:462
+#: src/gtk/quicksearch.c:470 src/summary_search.c:465
 msgid "Extended Search"
 msgstr "Rozšířené vyhledávání"
 
-#: src/gtk/quicksearch.c:536
+#: src/gtk/quicksearch.c:471
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5315,107 +5579,99 @@ msgstr ""
 "splňovat, aby byla zobrazena v seznamu zpráv.\n"
 "Následující symboly mohou být použity:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:587
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Něco selhalo během hledání. Prosím zkontrolujte záznamy."
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:871
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Od/Komu/Kopie/Předmět/Značka"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:889 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Včetně podsložek"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:895
 msgid "Sticky"
 msgstr "Zachovat i při změně složky"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:901
 msgid "Type-ahead"
 msgstr "Vyhledávat během psaní"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:907
 msgid "Run on select"
 msgstr "Spustit na vybrané"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:934
 msgid "Clear the current search"
 msgstr "Odstranit nastavenou podmínku"
 
-#: src/gtk/quicksearch.c:790 src/summary_search.c:413
+#: src/gtk/quicksearch.c:944 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Upravit vyhledávací kritéria"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:953
 msgid "Information about extended symbols"
 msgstr "Informace o rozšířených možnostech vyhledávání"
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
-msgid "_Information"
-msgstr "_Informace"
-
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:992 src/gtk/quicksearch.c:1021
+#: src/gtk/quicksearch.c:1027
 msgid "E_dit"
 msgstr "U_pravit"
 
-#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:349
-#: src/prefs_filtering.c:496 src/prefs_template.c:330
-msgid "C_lear"
-msgstr "Vyč_istit"
-
-#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:301
+#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:302
 #, c-format
 msgid "Correct%s"
 msgstr "Správně%s"
 
-#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
-#: src/ssl_manager.c:301 src/ssl_manager.c:305
+#: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:181
+#: src/ssl_manager.c:302 src/ssl_manager.c:306
 msgid " (expired)"
 msgstr " (vypršel)"
 
-#: src/gtk/sslcertwindow.c:188
+#: src/gtk/sslcertwindow.c:186
 msgid "Owner"
 msgstr "Vlastník"
 
-#: src/gtk/sslcertwindow.c:189
+#: src/gtk/sslcertwindow.c:187
 msgid "Signer"
 msgstr "Podepsal"
 
-#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
+#: src/gtk/sslcertwindow.c:194 src/gtk/sslcertwindow.c:233
 msgid "Name: "
 msgstr "Jméno: "
 
-#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:207 src/gtk/sslcertwindow.c:246
 msgid "Organization: "
 msgstr "Organizace: "
 
-#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
+#: src/gtk/sslcertwindow.c:220 src/gtk/sslcertwindow.c:259
 msgid "Location: "
 msgstr "Umístění: "
 
-#: src/gtk/sslcertwindow.c:244
+#: src/gtk/sslcertwindow.c:272
 msgid "Fingerprint: \n"
 msgstr "Fingerprint: \n"
 
-#: src/gtk/sslcertwindow.c:254
+#: src/gtk/sslcertwindow.c:288
 msgid "Signature status: "
 msgstr "Stav podpisu: "
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:301
 msgid "Expired on: "
 msgstr "Vyprší: "
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:301
 msgid "Expires on: "
 msgstr "Datum vypršení: "
 
-#: src/gtk/sslcertwindow.c:328
+#: src/gtk/sslcertwindow.c:373
 #, c-format
 msgid "SSL/TLS certificate for %s"
 msgstr "SSL/TLS certifikát pro %s"
 
-#: src/gtk/sslcertwindow.c:344
+#: src/gtk/sslcertwindow.c:389
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5426,7 +5682,7 @@ msgstr ""
 "Můžete být připojen k ničemnému serveru.\n"
 "\n"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:409
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5435,39 +5691,39 @@ msgstr ""
 "Certifikát pro %s je neznámý.\n"
 "%sChcete jej přijmout?"
 
-#: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
-#: src/gtk/sslcertwindow.c:488
+#: src/gtk/sslcertwindow.c:419 src/gtk/sslcertwindow.c:469
+#: src/gtk/sslcertwindow.c:533
 msgid "Correct"
 msgstr "Správný"
 
-#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
-#: src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:421 src/gtk/sslcertwindow.c:471
+#: src/gtk/sslcertwindow.c:535
 #, c-format
 msgid "Signature status: %s"
 msgstr "Stav podpisu: %s"
 
-#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
+#: src/gtk/sslcertwindow.c:429 src/gtk/sslcertwindow.c:479
 msgid "_View certificate"
 msgstr "_Zobrazit certifikát"
 
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:435
 msgid "SSL/TLS certificate is invalid"
 msgstr "SSL/TLS certifikát je neplatný"
 
-#: src/gtk/sslcertwindow.c:392
+#: src/gtk/sslcertwindow.c:437
 msgid "SSL/TLS certificate is unknown"
 msgstr "SSL/TLS certifikát je neznámý"
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:445
-#: src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:552
 msgid "_Cancel connection"
 msgstr "_Zrušit připojení"
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:552
 msgid "_Accept and save"
 msgstr "_Přijmout a uložit"
 
-#: src/gtk/sslcertwindow.c:413
+#: src/gtk/sslcertwindow.c:458
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5476,27 +5732,27 @@ msgstr ""
 "Platnost certifikátu pro %s skončila.\n"
 "%sChcete pokračovat?"
 
-#: src/gtk/sslcertwindow.c:440
+#: src/gtk/sslcertwindow.c:485
 msgid "SSL/TLS certificate is invalid and expired"
 msgstr "SSL/TLS certifikát je neplatný a vypršel"
 
-#: src/gtk/sslcertwindow.c:442
+#: src/gtk/sslcertwindow.c:487
 msgid "SSL/TLS certificate is expired"
 msgstr "SSL/TLS certifikát vypršel"
 
-#: src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:490
 msgid "_Accept"
 msgstr "_Přijmout"
 
-#: src/gtk/sslcertwindow.c:465
+#: src/gtk/sslcertwindow.c:510
 msgid "New certificate:"
 msgstr "Nový certifikát:"
 
-#: src/gtk/sslcertwindow.c:470
+#: src/gtk/sslcertwindow.c:515
 msgid "Known certificate:"
 msgstr "Známý certifikát:"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:522
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5505,15 +5761,15 @@ msgstr ""
 "Certifikát pro %s se změnil.\n"
 "%sChcete jej přijmout?"
 
-#: src/gtk/sslcertwindow.c:498
+#: src/gtk/sslcertwindow.c:543
 msgid "_View certificates"
 msgstr "_Zobrazit certifikáty"
 
-#: src/gtk/sslcertwindow.c:503
+#: src/gtk/sslcertwindow.c:548
 msgid "SSL/TLS certificate changed and is invalid"
 msgstr "SSL/TLS certifikát změněn a je neplatný"
 
-#: src/gtk/sslcertwindow.c:505
+#: src/gtk/sslcertwindow.c:550
 msgid "SSL/TLS certificate changed"
 msgstr "SSL/TLS certifikát změněn"
 
@@ -5523,15 +5779,15 @@ msgstr "Značky:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3499
-#: src/summaryview.c:3517 src/summaryview.c:3556
+#: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3484
+#: src/summaryview.c:3502 src/summaryview.c:3541
 msgid "(No From)"
 msgstr "(Neznámý odesílatel)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3568
-#: src/summaryview.c:3571
+#: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3553
+#: src/summaryview.c:3556
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
@@ -5539,207 +5795,207 @@ msgstr "(Žádný předmět)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
-#: src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/image_viewer.c:316 src/mimeview.c:2672
+#: src/plugins/att_remover/att_remover.c:307
+#: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Název souboru:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:321
 msgid "Filesize:"
 msgstr "Velikost souboru:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Načíst obrázek"
 
-#: src/imap.c:577
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr "Přerušeno IMAP spojení\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: 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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP chyba na %s:"
 
-#: src/imap.c:622
+#: src/imap.c:628
 msgid "authenticated"
 msgstr "autentizován"
 
-#: src/imap.c:625
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "ne autentizován"
 
-#: src/imap.c:628
+#: src/imap.c:634
 msgid "bad state"
 msgstr "špatný stav"
 
-#: src/imap.c:631
+#: src/imap.c:637
 msgid "stream error"
 msgstr "chyba proudu"
 
-#: src/imap.c:634
+#: src/imap.c:640
 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:638
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "spojení odmítnuto"
 
-#: src/imap.c:641
+#: src/imap.c:647
 msgid "memory error"
 msgstr "chyba paměti"
 
-#: src/imap.c:644
+#: src/imap.c:650
 msgid "fatal error"
 msgstr "fatální chyba"
 
-#: src/imap.c:647
+#: src/imap.c:653
 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:651
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr "spojení nepřijato"
 
-#: src/imap.c:654
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr "APPEND chyba"
 
-#: src/imap.c:657
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr "NOOP chyba"
 
-#: src/imap.c:660
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr "LOGOUT chyba"
 
-#: src/imap.c:663
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr "CAPABILITY chyba"
 
-#: src/imap.c:666
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr "CHECK chyba"
 
-#: src/imap.c:669
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr "CLOSE chyba"
 
-#: src/imap.c:672
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr "EXPUNGE chyba"
 
-#: src/imap.c:675
+#: src/imap.c:681
 msgid "COPY error"
 msgstr "COPY chyba"
 
-#: src/imap.c:678
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr "UID COPY chyba"
 
-#: src/imap.c:681
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr "CREATE chyba"
 
-#: src/imap.c:684
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr "DELETE chyba"
 
-#: src/imap.c:687
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr "EXAMINE chyba"
 
-#: src/imap.c:690
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr "FETCH chyba"
 
-#: src/imap.c:693
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr "UID FETCH chyba"
 
-#: src/imap.c:696
+#: src/imap.c:702
 msgid "LIST error"
 msgstr "LIST chyba"
 
-#: src/imap.c:699
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr "LOGIN chyba"
 
-#: src/imap.c:702
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr "LSUB chyba"
 
-#: src/imap.c:705
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr "RENAME chyba"
 
-#: src/imap.c:708
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr "SEARCH chyba"
 
-#: src/imap.c:711
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr "UID SEARCH chyba"
 
-#: src/imap.c:714
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr "SELECT chyba"
 
-#: src/imap.c:717
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr "STATUS chyba"
 
-#: src/imap.c:720
+#: src/imap.c:726
 msgid "STORE error"
 msgstr "STORE chyba"
 
-#: src/imap.c:723
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr "UID STORE chyba"
 
-#: src/imap.c:726
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr "SUBSCRIBE chyba"
 
-#: src/imap.c:729
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr "UNSUBSCRIBE chyba"
 
-#: src/imap.c:732
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr "STARTTLS chyba"
 
-#: src/imap.c:735
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr "INVAL chyba"
 
-#: src/imap.c:738
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr "EXTENSION chyba"
 
-#: src/imap.c:741
+#: src/imap.c:747
 msgid "SASL error"
 msgstr "SASL chyba"
 
-#: src/imap.c:745
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr "SSL/TLS chyba"
 
-#: src/imap.c:749
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Neznámá chyba [%d]"
 
-#: src/imap.c:955
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5751,7 +6007,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:961
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5763,7 +6019,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:967
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5775,7 +6031,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:973
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5787,7 +6043,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:979
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5799,37 +6055,37 @@ msgstr ""
 "Přihlášení pomocí LOGIN pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul LOGIN SASL."
 
-#: src/imap.c:986
+#: src/imap.c:999
 #, 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:990
+#: src/imap.c:1003
 #, 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:1008
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Připojení k %s selhalo"
 
-#: src/imap.c:1015 src/imap.c:1018
+#: src/imap.c:1028 src/imap.c:1031
 #, 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:1048 src/imap.c:3693 src/imap.c:4352 src/imap.c:4446
-#: src/imap.c:4624 src/imap.c:5435
+#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 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:1158 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Nezabezpečené připojení"
 
-#: src/imap.c:1159 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5842,108 +6098,108 @@ msgstr ""
 "\n"
 "Chcete pokračovat v připojování k serveru? Komunikace nebude zabezpečena."
 
-#: src/imap.c:1165 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "_Pokračovat v připojování"
 
-#: src/imap.c:1174
+#: src/imap.c:1187
 #, 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:1239
+#: src/imap.c:1252
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Nemohu se spojit s IMAP serverem: %s:%d"
 
-#: src/imap.c:1242
+#: src/imap.c:1255
 #, 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:1274 src/imap.c:4114
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nelze spustit STARTTLS relaci.\n"
 
-#: src/imap.c:1343
+#: src/imap.c:1359
 #, 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:1346
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s."
 
-#: src/imap.c:1774
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "Přidávám zprávy..."
 
-#: src/imap.c:1979 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopíruji zprávy..."
 
-#: src/imap.c:2504
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr "Hledání selhalo kvůli chybě serveru."
 
-#: src/imap.c:2586
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "nelze nastavit příznak odstranění\n"
 
-#: src/imap.c:2593 src/imap.c:5065
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: src/imap.c:2944
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Vyhledávám odhlášené složky v %s..."
 
-#: src/imap.c:2947
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hledám podsložky %s..."
 
-#: src/imap.c:3235
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit mailbox: selhal příkaz LIST\n"
 
-#: src/imap.c:3248
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit mailbox\n"
 
-#: src/imap.c:3379
+#: src/imap.c:3422
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat mailbox: %s na %s\n"
 
-#: src/imap.c:3492
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "nelze odstranit mailbox\n"
 
-#: src/imap.c:3771
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "LIST selhal\n"
 
-#: src/imap.c:3856
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr "Označuji zprávy..."
 
-#: src/imap.c:3959
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:4111
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server vyžaduje STARTTLS pro přihlášení.\n"
 
-#: src/imap.c:4121
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodařilo se načíst údaje o schopnostech serveru IMAP.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5952,20 +6208,20 @@ msgstr ""
 "Připojení k %s selhalo: server požaduje STARTTLS, ale Claws Mail je "
 "zkompilován bez podpory STARTTLS.\n"
 
-#: src/imap.c:4134
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr "Přihlašování k serveru je mimo provoz.\n"
 
-#: src/imap.c:4357
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: src/imap.c:5058
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nelze nastavit příznak odstranění: %d\n"
 
-#: src/imap.c:6093
+#: src/imap.c:6136
 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"
@@ -5977,24 +6233,24 @@ msgstr ""
 "\n"
 "Pravděpodobně bude třeba nainstalovat libetpan a překompilovat Claws Mail."
 
-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:59
+#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:60
 msgid "Create _new folder..."
 msgstr "Vytvořit _novou složku..."
 
 #: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61
-#: src/plugins/mailmbox/plugin_gtk.c:60
+#: src/plugins/mailmbox/plugin_gtk.c:61
 msgid "_Rename folder..."
 msgstr "Pře_jmenovat složku..."
 
-#: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:61
+#: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:62
 msgid "M_ove folder..."
 msgstr "Pře_sunout složku..."
 
-#: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:62
+#: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:63
 msgid "Cop_y folder..."
 msgstr "Z_kopírovat složku..."
 
-#: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:63
+#: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
 #: src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "_Odstranit složku..."
@@ -6020,15 +6276,15 @@ msgid "_Unsubscribe..."
 msgstr "_Odhlásit..."
 
 #: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
-#: src/plugins/mailmbox/plugin_gtk.c:64
+#: src/plugins/mailmbox/plugin_gtk.c:65
 msgid "_Check for new messages"
 msgstr "_Přijmout poštu"
 
-#: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:65
+#: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:66
 msgid "C_heck for new folders"
 msgstr "_Vyhledat nové složky"
 
-#: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:66
+#: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "R_ebuild folder tree"
 msgstr "O_bnovit strom složek"
 
@@ -6046,25 +6302,21 @@ msgstr ""
 "(Pokud chcete vytvořit složku, která bude obsahovat\n"
 "pouze podsložky a žádné zprávy, přidejte nakonec názvu '/')"
 
-#: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties and processing rules from parent folder"
-msgstr "Zdědit vlastnosti a pravidla zpracování z rodičovské složky"
-
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
+#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:196
 #: src/plugins/vcalendar/vcal_folder.c:2060
 #, 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:197
 #: src/plugins/vcalendar/vcal_folder.c:2061
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
+#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:220
 #: src/plugins/vcalendar/vcal_folder.c:2081
 msgid ""
 "The folder could not be renamed.\n"
@@ -6073,12 +6325,12 @@ 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'"
@@ -6096,7 +6348,7 @@ msgstr ""
 "\n"
 "Chcete je opravdu odstranit?"
 
-#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:348
 #: src/plugins/rssyl/rssyl_cb_menu.c:172
 #: src/plugins/vcalendar/vcal_folder.c:2014
 #, c-format
@@ -6125,7 +6377,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:689
+#: src/imap_gtk.c:536 src/mainwindow.c:683
 msgid "Subscribe"
 msgstr "Odebírat"
 
@@ -6158,8 +6410,8 @@ msgstr "odebírat"
 msgid "unsubscribe"
 msgstr "odhlásit"
 
-#: 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:1514 src/prefs_folder_item.c:1542
+#: src/prefs_folder_item.c:1570
 msgid "Apply to subfolders"
 msgstr "Nastavit u podsložek"
 
@@ -6171,23 +6423,23 @@ msgstr "_Odebírat"
 msgid "_Unsubscribe"
 msgstr "_Odhlásit"
 
-#: src/import.c:113 src/import.c:208
+#: src/import.c:112 src/import.c:203
 msgid "Import mbox file"
 msgstr "Importovat mbox soubor"
 
-#: src/import.c:132
+#: src/import.c:131
 msgid "Locate the mbox file and specify the destination folder."
 msgstr "Určete zdrojový mbox soubor a cílovou složku."
 
-#: src/import.c:149
+#: src/import.c:146
 msgid "Destination folder:"
 msgstr "Cílová složka:"
 
-#: src/import.c:203
+#: src/import.c:198
 msgid "Source mbox filename can't be left empty."
 msgstr "Zdrojový mbox soubor musí být určen."
 
-#: src/import.c:208
+#: src/import.c:203
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6195,15 +6447,19 @@ msgstr ""
 "Cílová složka není určena.\n"
 "Importovat mbox soubor do složky \"Doručená pošta\"?"
 
-#: src/import.c:230
+#: src/import.c:225
 msgid "Can't find the destination folder."
 msgstr "Cílová složka nebyla nalezena."
 
-#: src/import.c:263
+#: src/import.c:230
+msgid "Importing mbox file..."
+msgstr "Importuji mbox soubor..."
+
+#: src/import.c:252
 msgid "Select importing file"
 msgstr "Vybrat soubor pro import"
 
-#: src/import.c:281
+#: src/import.c:270
 msgid "Select folder to import to"
 msgstr "Vybrat složku pro import"
 
@@ -6235,50 +6491,50 @@ msgstr "Import LDIF soubor byl úspěšný."
 msgid "Select LDIF File"
 msgstr "Výběr LDIF souboru"
 
-#: src/importldif.c:551
+#: src/importldif.c:549
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr ""
 "Zadejte jméno knihy adres, která bude vytvořena z dat tohoto LDIF souboru."
 
-#: src/importldif.c:556
+#: src/importldif.c:553
 msgid "File Name"
 msgstr "Název souboru"
 
-#: src/importldif.c:566
+#: src/importldif.c:563
 msgid "The full file specification of the LDIF file to import."
 msgstr "Úplná specifikace LDIF souboru pro import."
 
-#: src/importldif.c:573
+#: src/importldif.c:569
 msgid "Select the LDIF file to import."
 msgstr "Vyberte LDIF soubor k importování."
 
-#: src/importldif.c:705
+#: src/importldif.c:700
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:710 src/summaryview.c:466
+#: src/importldif.c:705 src/summaryview.c:461
 msgid "S"
 msgstr "V"
 
-#: src/importldif.c:716
+#: src/importldif.c:711
 msgid "LDIF Field Name"
 msgstr "Název LDIF položky"
 
-#: src/importldif.c:721
+#: src/importldif.c:716
 msgid "Attribute Name"
 msgstr "Název atributu"
 
-#: src/importldif.c:740
+#: src/importldif.c:734
 msgid "LDIF Field"
 msgstr "Položka LDIF"
 
-#: src/importldif.c:752
+#: src/importldif.c:745
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:764
+#: src/importldif.c:756
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6296,35 +6552,35 @@ msgstr ""
 "Dvojklik kdekoli v řádku vybere položku pro přejmenování a zároveň pro "
 "import."
 
-#: src/importldif.c:779
+#: src/importldif.c:772
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "LDIF položka může být přejmenována na uživatelský atribut."
 
-#: src/importldif.c:784
+#: src/importldif.c:775
 msgid "Select for Import"
 msgstr "Vybrat pro import"
 
-#: src/importldif.c:789
+#: src/importldif.c:779
 msgid "Select the LDIF field for import into the address book."
 msgstr "Vybere LDIF položku pro import do knihy adres."
 
-#: src/importldif.c:791
+#: src/importldif.c:781
 msgid " Modify "
 msgstr " Změnit "
 
-#: src/importldif.c:796
+#: src/importldif.c:785
 msgid "This button will update the list above with the data supplied."
 msgstr "Změní položku seznamu nahoře dle dat zadaných zde dole."
 
-#: src/importldif.c:870
+#: src/importldif.c:855
 msgid "Records Imported:"
 msgstr "Importováno záznamů:"
 
-#: src/importldif.c:902
+#: src/importldif.c:887
 msgid "Import LDIF file into Address Book"
 msgstr "Importovat LDIF soubor do knihy adres"
 
-#: src/importldif.c:940
+#: src/importldif.c:925
 msgid "Proceed"
 msgstr "Pokračovat"
 
@@ -6336,11 +6592,11 @@ msgstr "Chyba při importu souborů z MUTT."
 msgid "Select MUTT File"
 msgstr "Vyberte MUTT soubor"
 
-#: src/importmutt.c:203
+#: src/importmutt.c:202
 msgid "Import MUTT file into Address Book"
 msgstr "Importovat MUTT soubor do knihy adres"
 
-#: src/importmutt.c:289 src/importpine.c:289
+#: src/importmutt.c:290 src/importpine.c:290
 msgid "Please select a file to import."
 msgstr "Vyberte prosím soubor pro import."
 
@@ -6352,36 +6608,36 @@ msgstr "Chyba při importu souborů z Pine."
 msgid "Select Pine File"
 msgstr "Vyberte Pine soubor"
 
-#: src/importpine.c:202
+#: src/importpine.c:201
 msgid "Import Pine file into Address Book"
 msgstr "Importovat Pine soubor do knihy adres"
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 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:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "%s selhal\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "Načítám nové zprávy"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Načítám"
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6389,28 +6645,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:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "Hotovo (Nejsou žádné nové zprávy)"
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: 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:724 src/prefs_matcher.c:406 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:87 src/summaryview.c:2884 src/summaryview.c:6544
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:394
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:389
 msgid "Timeout"
 msgstr "Časový limit"
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6418,66 +6674,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:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "Dokončeno (nejsou nové zprávy)"
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Načítám nové zprávy"
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, 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:923
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d"
 
-#: src/inc.c:927
+#: src/inc.c:932
 #, 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:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Získávám zprávy z %s (%s)..."
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuji počet nových zpráv (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuji počet nových zpráv (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuji počet nových zpráv (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuji počet zpráv (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "Ukončuji"
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Načítám zprávu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6485,16 +6741,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:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Připojení k %s:%d selhalo."
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "Nastala chyba během zpracovávání pošty."
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6503,37 +6759,37 @@ msgstr ""
 "Nastala chyba během zpracovávání pošty:\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "Nezbylo žádné místo na disku."
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "Nemohu zapisovat do souboru."
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba socketu v připojení k %s:%d."
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "Připojení bylo ukončeno vzdáleným počítačem."
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, 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:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknut."
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6542,11 +6798,11 @@ msgstr ""
 "Mailbox je uzamčen:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "Autentizace selhala."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6555,7 +6811,7 @@ msgstr ""
 "Autentizace selhala:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6563,48 +6819,48 @@ msgstr ""
 "Čas relace vypršel. Můžete ji obnovit zvýšením hodnoty ve Volby/Ostatní/"
 "Různé."
 
-#: src/inc.c:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Časový limit připojení k %s:%d vypršel."
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
-#: src/plugins/notification/notification_prefs.c:1367
-#: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1766
-#: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:551
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1071
+#: src/plugins/notification/notification_prefs.c:1362
+#: src/plugins/notification/notification_prefs.c:1668
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1834
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:551
 msgid "seconds"
 msgstr "sekund"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodina"
 msgstr[1] "hodiny"
 msgstr[2] "hodin"
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, 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:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sPracujete v režimu offline. Přepnout?"
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "Pouze _jednou"
 
@@ -6641,7 +6897,7 @@ msgstr "LDAP chyba (hledání): %d (%s)\n"
 msgid "Nick Name"
 msgstr "Přezdívka"
 
-#: src/main.c:250
+#: src/main.c:251
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6650,7 +6906,7 @@ msgstr ""
 "Soubor '%s' už existuje.\n"
 "Nemohu vytvořit složku."
 
-#: src/main.c:375
+#: src/main.c:381
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6659,7 +6915,7 @@ msgstr ""
 "Byla nalezena konfigurace pro %s.\n"
 "Chcete převést tuto konfiguraci?"
 
-#: src/main.c:377
+#: src/main.c:383
 #, c-format
 msgid ""
 "\n"
@@ -6672,11 +6928,11 @@ msgstr ""
 "Vaše pravidla filtrování Sylpheed mohou být převedena pomocí\n"
 "skriptu dostupného na %s."
 
-#: src/main.c:389
+#: src/main.c:395
 msgid "Keep old configuration"
 msgstr "Ponechat původní nastavení"
 
-#: src/main.c:392
+#: src/main.c:398
 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 "
@@ -6687,31 +6943,31 @@ msgstr ""
 "pro IMAP nebo diskuzní skupiny. Záloha také vyžaduje určité místo na vašem "
 "disku."
 
-#: src/main.c:400
+#: src/main.c:406
 msgid "Migration of configuration"
 msgstr "Převedení konfigurace"
 
-#: src/main.c:411
+#: src/main.c:417
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopíruji konfiguraci... Může to chvíli trvat..."
 
-#: src/main.c:420
+#: src/main.c:426
 msgid "Migration failed!"
 msgstr "Převedení selhalo!"
 
-#: src/main.c:429
+#: src/main.c:435
 msgid "Migrating configuration..."
 msgstr "Převádím konfiguraci..."
 
-#: src/main.c:1141
+#: src/main.c:1130
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread není v glib podporován.\n"
 
-#: src/main.c:1161 src/main.c:1165 src/main.c:1169
+#: src/main.c:1150 src/main.c:1154 src/main.c:1158
 msgid "(or older)"
 msgstr "(nebo starší)"
 
-#: src/main.c:1510
+#: src/main.c:1499
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6731,7 +6987,7 @@ msgstr[2] ""
 "Následující zásuvné moduly se nepodařilo načíst. Zkontrolujte nastavení.\n"
 "%s"
 
-#: src/main.c:1552
+#: src/main.c:1541
 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 "
@@ -6741,7 +6997,7 @@ msgstr ""
 "Pravděpodobně chyba IMAP účtu. Použijte \"Obnovit strom složek\" v menu "
 "rodičovské složky pro opravu."
 
-#: src/main.c:1558
+#: src/main.c:1547
 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 "
@@ -6751,36 +7007,76 @@ msgstr ""
 "pochází od zastaralého externího modulu. Prosím přeinstalujte modul a zkuste "
 "to znovu."
 
-#: src/main.c:1799
+#: src/main.c:1791
 msgid "Missing filename\n"
 msgstr "Chybějící jméno souboru\n"
 
-#: src/main.c:1806
+#: src/main.c:1798
 msgid "Cannot open filename for reading\n"
 msgstr "Nepodařilo se otevřít soubor pro čtení\n"
 
-#: src/main.c:1817
+#: src/main.c:1809
 msgid "Malformed header\n"
 msgstr "Poškozená hlavička\n"
 
-#: src/main.c:1824
+#: src/main.c:1816
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplikovaná hlavička 'To:'\n"
 
-#: src/main.c:1835
+#: src/main.c:1827
 msgid "Missing required 'To:' header\n"
 msgstr "Chybějící požadovaná hlavička 'To:'\n"
 
-#: src/main.c:1980
+#: src/main.c:1853
+#, c-format
+msgid "%s. Try -h or --help for usage.\n"
+msgstr "%s. Zkuste -h nebo --help pro zobrazení platných.\n"
+
+#: src/main.c:1880 src/main.c:1943
+#, c-format
+msgid "Missing file argument for option %s"
+msgstr "Schází argument souboru pro volbu %s"
+
+#: src/main.c:1902
+#, c-format
+msgid "Missing or empty uri argument for option %s"
+msgstr "Schází nebo je prázdný uri argument pro volbu %s"
+
+#: src/main.c:1905
+#, c-format
+msgid "Missing uri argument for option %s"
+msgstr "Schází uri argument pro volbu %s"
+
+#: src/main.c:1938
+#, c-format
+msgid "Missing at least one non-empty file argument for option %s"
+msgstr "Schází nejméně jeden neprázdný argument souboru pro volbu %s"
+
+#: src/main.c:2007
+#, c-format
+msgid "Missing folder, type and request arguments for option %s"
+msgstr "Schází složka, typ a požadovaný argument pro volbu %s"
+
+#: src/main.c:2010
+#, c-format
+msgid "Missing type and request arguments for option %s"
+msgstr "Schází typ a požadovaný argument pro volbu %s"
+
+#: src/main.c:2013
+#, c-format
+msgid "Missing request argument for option %s"
+msgstr "Schází požadovaný argument pro volbu %s"
+
+#: src/main.c:2029
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/main.c:1982
+#: src/main.c:2031
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]             otevře okno pro psaní nové zprávy"
 
-#: src/main.c:1983
+#: src/main.c:2032
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6799,12 +7095,12 @@ msgstr ""
 "do\n"
 "                         prázdné řádky, pak tělo do konce souboru."
 
-#: src/main.c:1988
+#: src/main.c:2037
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe uri        přihlásí se k odběru zadaného URI pokud to lze"
 
-#: src/main.c:1989
+#: src/main.c:2038
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6814,7 +7110,7 @@ msgstr ""
 "                         otevře okno pro psaní zprávy s připojeným\n"
 "                         souborem(y)"
 
-#: src/main.c:1992
+#: src/main.c:2041
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6824,23 +7120,23 @@ msgstr ""
 "                         otevře okno pro psaní zprávy s vloženým\n"
 "                         souborem(y)"
 
-#: src/main.c:1995
+#: src/main.c:2044
 msgid "  --receive              receive new messages"
 msgstr "  --receive                      načte nové zprávy"
 
-#: src/main.c:1996
+#: src/main.c:2045
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all                  načte nové zprávy ze všech účtů"
 
-#: src/main.c:1997
+#: src/main.c:2046
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     zrušit přijímání zpráv"
 
-#: src/main.c:1998
+#: src/main.c:2047
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       zrušit odesílání zpráv"
 
-#: src/main.c:1999
+#: src/main.c:2048
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6859,15 +7155,15 @@ msgstr ""
 "                         rekurzivně: nepravda když argument startuje s 0, n, "
 "N, f nebo F"
 
-#: src/main.c:2006
+#: src/main.c:2055
 msgid "  --send                 send all queued messages"
 msgstr "  --send                         pošle všechny pozdržené zprávy"
 
-#: src/main.c:2007
+#: src/main.c:2056
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [složka]...           zobrazit celkový počet zpráv"
 
-#: src/main.c:2008
+#: src/main.c:2057
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6875,63 +7171,64 @@ msgstr ""
 "  --status-full [složka]...\n"
 "                         zobrazí status každé složky"
 
-#: src/main.c:2010
+#: src/main.c:2059
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           zobrazí statistiky relace"
 
-#: src/main.c:2011
+#: src/main.c:2060
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     resetuje statistiky relace"
 
-#: src/main.c:2012
+#: src/main.c:2061
 msgid ""
-"  --select folder[/msg]  jumps to the specified folder/message\n"
-"                         folder is a folder id like 'folder/sub_folder'"
+"  --select folder[/msg]  jump to the specified folder/message\n"
+"                         folder is a folder id like 'folder/sub_folder', a "
+"file:// uri or an absolute path"
 msgstr ""
 "  --select složka[/msg]  přejde na uvedenou složku/zprávu\n"
-"                         složka je id složky, např. 'složka/podsložka'"
+"                         složka je id složky, např. 'složka/podsložka', "
+"file:// nebo absolutní cesta"
 
-#: src/main.c:2014
+#: src/main.c:2063
 msgid "  --online               switch to online mode"
 msgstr "  --online                       přejde do online režimu"
 
-#: src/main.c:2015
+#: src/main.c:2064
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline                      přejde do offline režimu"
 
-#: src/main.c:2016
+#: src/main.c:2065
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit  --quit -q                       ukončí Claws Mail"
 
-#: src/main.c:2017
-msgid "  --debug                debug mode"
-msgstr "  --debug                        režim trasování"
+#: src/main.c:2066
+msgid "  --debug -d             debug mode"
+msgstr "  --debug -d             režim trasování"
 
-#: src/main.c:2018
+#: src/main.c:2067
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug                        přepne režim trasování"
 
-#: src/main.c:2019
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h                         vypíše tuto nápovědu a skončí"
+#: src/main.c:2068
+msgid "  --help -h              display this help"
+msgstr "  --help -h              vypíše tuto nápovědu a skončí"
 
-#: src/main.c:2020
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v                   vypíše informace o verzi a skončí"
+#: src/main.c:2069
+msgid "  --version -v           output version information"
+msgstr "  --version -v           vypíše informace o verzi a skončí"
 
-#: src/main.c:2021
+#: src/main.c:2070
 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     vypíše informace o verzi a vestavěných vlastnostech "
+"  --version-full -V      vypíše informace o verzi a vestavěných vlastnostech "
 "a skončí"
 
-#: src/main.c:2022
+#: src/main.c:2071
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir                   vypíše název adresáře s konfigurací"
 
-#: src/main.c:2023
+#: src/main.c:2072
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -6939,863 +7236,875 @@ msgstr ""
 "  --alternate-config-dir adresář\n"
 "                  použije zadaný adresář s konfigurací"
 
-#: src/main.c:2025
+#: src/main.c:2074
 msgid ""
-"  --geometry -geometry WxH+X+Y\n"
+"  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 msgstr ""
-"  --geometry -geometry WxH+X+Y\n"
+"  --geometry -geometry [WxH][+X+Y]\n"
 "                         nastaví polohu a velikost hlavního okna"
 
-#: src/main.c:2078
-msgid "Unknown option. Try -h or --help for usage.\n"
-msgstr "Neznámá volba. Zkuste -h nebo --help pro zobrazení platných.\n"
+#: src/main.c:2091
+#, c-format
+msgid "Missing directory argument for option %s"
+msgstr "Schází argument adresáře pro volbu %s"
+
+#: src/main.c:2099
+#, c-format
+msgid "Missing geometry argument for option %s"
+msgstr "Schází argument geometrie pro volbu %s"
+
+#: src/main.c:2110
+#, c-format
+msgid "Missing folder argument for option %s"
+msgstr "Schází argument složky pro volbu %s"
+
+#: src/main.c:2143 src/main.c:2146
+#, c-format
+msgid "Unknown option %s"
+msgstr "Neznámá volba %s"
 
-#: src/main.c:2096
+#: src/main.c:2162
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Zpracovávám (%s)..."
 
-#: src/main.c:2099
+#: src/main.c:2165
 msgid "top level folder"
 msgstr "nejvyšší složka v hierarchii"
 
-#: src/main.c:2181
+#: src/main.c:2247
 msgid "Queued messages"
 msgstr "Pozdržené zprávy"
 
-#: src/main.c:2182
+#: src/main.c:2248
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ve frontě jsou neodeslaně zprávy. Skončit nyní?"
 
-#: src/main.c:2940
+#: src/main.c:3010
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: network is online.\n"
 
-#: src/main.c:2946
+#: src/main.c:3016
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: síť je odpojena.\n"
 
-#: src/mainwindow.c:522 src/messageview.c:211
+#: src/mainwindow.c:516 src/messageview.c:211
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:447
+#: src/mainwindow.c:518 src/messageview.c:213 src/summaryview.c:442
 msgid "_View"
 msgstr "Z_obrazit"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:521
 msgid "_Configuration"
 msgstr "Nastav_ení"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:525
 msgid "_Add mailbox"
 msgstr "_Přidat mailbox"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:526
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:529
 msgid "Change mailbox order..."
 msgstr "Změnit pořadí schránek..."
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:532
 msgid "_Import mbox file..."
 msgstr "_Importovat mbox soubor..."
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:533
 msgid "_Export to mbox file..."
 msgstr "_Exportovat do mbox souboru..."
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:534
 msgid "_Export selected to mbox file..."
 msgstr "Exportovat _vybrané do mbox souboru..."
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:536
 msgid "Empty all _Trash folders"
 msgstr "Vyprázdnit všechny _koše"
 
-#: src/mainwindow.c:545 src/messageview.c:220
+#: src/mainwindow.c:539 src/messageview.c:220
 msgid "_Save email as..."
 msgstr "Uložit email j_ako..."
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:540 src/messageview.c:221
 msgid "_Save part as..."
 msgstr "Uložit část j_ako..."
 
-#: src/mainwindow.c:549 src/messageview.c:222
+#: src/mainwindow.c:543 src/messageview.c:222
 msgid "Page setup..."
 msgstr "Nastavení stránky..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:544 src/messageview.c:223
 msgid "_Print..."
 msgstr "_Tisk..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:546
 msgid "Synchronise folders"
 msgstr "Synchronizovat složky"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:548
 msgid "E_xit"
 msgstr "_Konec"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:553
 msgid "Select _thread"
 msgstr "Vybrat _vlákno"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:555
 msgid "_Find in current message..."
 msgstr "_Hledat v aktuální zprávě..."
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:557
 msgid "_Quick search"
 msgstr "_Rychlé vyhledávání"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:560
 msgid "Show or hi_de"
 msgstr "Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:561
 msgid "_Toolbar"
 msgstr "Nástrojová lišta"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:563
 msgid "Set displayed _columns"
 msgstr "Zobrazované _sloupce"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:564
 msgid "In _folder list..."
 msgstr "V seznamu _složek..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:565
 msgid "In _message list..."
 msgstr "V seznamu _zpráv..."
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:570
 msgid "La_yout"
 msgstr "Us_pořádání"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:572
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:574
 msgid "_Attract by subject"
 msgstr "_Seskupit dle předmětu"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:576
 msgid "E_xpand all threads"
 msgstr "Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:577
 msgid "Co_llapse all threads"
 msgstr "_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:585 src/messageview.c:234
+#: src/mainwindow.c:579 src/messageview.c:234
 msgid "_Go to"
 msgstr "_Jít na"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:580 src/messageview.c:235
 msgid "_Previous message"
 msgstr "_Předchozí zpráva"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:581 src/messageview.c:236
 msgid "_Next message"
 msgstr "_Další zpráva"
 
-#: src/mainwindow.c:589 src/messageview.c:238
+#: src/mainwindow.c:583 src/messageview.c:238
 msgid "P_revious unread message"
 msgstr "Pře_dchozí nepřečtenou zpráva"
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:584 src/messageview.c:239
 msgid "N_ext unread message"
 msgstr "Da_lší nepřečtená zpráva"
 
-#: src/mainwindow.c:592 src/messageview.c:241
+#: src/mainwindow.c:586 src/messageview.c:241
 msgid "Previous ne_w message"
 msgstr "Předchozí no_vá zpráva"
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:587 src/messageview.c:242
 msgid "Ne_xt new message"
 msgstr "D_alší nová zpráva"
 
-#: src/mainwindow.c:595 src/messageview.c:244
+#: src/mainwindow.c:589 src/messageview.c:244
 msgid "Previous _marked message"
 msgstr "Předchozí _označená zpráva"
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:590 src/messageview.c:245
 msgid "Next m_arked message"
 msgstr "Další o_značená zpráva"
 
-#: src/mainwindow.c:598 src/messageview.c:247
+#: src/mainwindow.c:592 src/messageview.c:247
 msgid "Previous _labeled message"
 msgstr "Předchozí _obarvená zpráva"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:593 src/messageview.c:248
 msgid "Next la_beled message"
 msgstr "Další o_barvená zpráva"
 
-#: src/mainwindow.c:601 src/messageview.c:250
+#: src/mainwindow.c:595 src/messageview.c:250
 msgid "Previous opened message"
 msgstr "Předchozí otevřená zpráva"
 
-#: src/mainwindow.c:602 src/messageview.c:251
+#: src/mainwindow.c:596 src/messageview.c:251
 msgid "Next opened message"
 msgstr "Další otevřená zpráva"
 
-#: src/mainwindow.c:604 src/messageview.c:253
+#: src/mainwindow.c:598 src/messageview.c:253
 msgid "Parent message"
 msgstr "Rodičovská zpráva"
 
-#: src/mainwindow.c:606 src/messageview.c:255
+#: src/mainwindow.c:600 src/messageview.c:255
 msgid "Next unread _folder"
 msgstr "Následující nepřečtená _složka"
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:601 src/messageview.c:256
 msgid "F_older..."
 msgstr "Sl_ožka..."
 
-#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:230
+#: src/mainwindow.c:603 src/messageview.c:258 src/mimeview.c:230
 msgid "Next part"
 msgstr "Další část"
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:231
+#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Předchozí část"
 
-#: src/mainwindow.c:613 src/messageview.c:260
+#: src/mainwindow.c:607 src/messageview.c:260
 msgid "Message scroll"
 msgstr "Rolování zpráv"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:608 src/messageview.c:261
 msgid "Previous line"
 msgstr "Předchozí řádek"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:609 src/messageview.c:262
 msgid "Next line"
 msgstr "Další řádek"
 
-#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:476
+#: src/mainwindow.c:610 src/messageview.c:263 src/printing.c:482
 msgid "Previous page"
 msgstr "Předchozí stránka"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:488
 msgid "Next page"
 msgstr "Další stránka"
 
-#: src/mainwindow.c:635 src/messageview.c:282
+#: src/mainwindow.c:629 src/messageview.c:282
 msgid "Decode"
 msgstr "Dekódovat"
 
-#: src/mainwindow.c:642
+#: src/mainwindow.c:636
 msgid "Open in new _window"
 msgstr "Otevřít v _novém okně"
 
-#: src/mainwindow.c:643 src/messageview.c:289
+#: src/mainwindow.c:637 src/messageview.c:289
 msgid "Mess_age source"
 msgstr "Zd_roj zprávy"
 
-#: src/mainwindow.c:645 src/messageview.c:290
+#: src/mainwindow.c:639 src/messageview.c:290
 msgid "Message part"
 msgstr "Část zprávy"
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:640 src/messageview.c:291
 msgid "View as text"
 msgstr "Zobrazit jako text"
 
-#: src/mainwindow.c:647 src/messageview.c:292 src/toolbar.c:494
+#: src/mainwindow.c:641 src/messageview.c:292 src/toolbar.c:494
 msgid "Open"
 msgstr "Otevřít"
 
-#: src/mainwindow.c:649 src/messageview.c:294
+#: src/mainwindow.c:643 src/messageview.c:294
 msgid "Open with..."
 msgstr "Otevřít čím..."
 
-#: src/mainwindow.c:653 src/messageview.c:297
+#: src/mainwindow.c:647 src/messageview.c:297
 msgid "Quotes"
 msgstr "Citace"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:649
 msgid "_Update summary"
 msgstr "_Aktualizace souhrnu"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:652
 msgid "Recei_ve"
 msgstr "Přij_mout"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:653
 msgid "Get from _current account"
 msgstr "Přijmout z _aktuálního účtu"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:654
 msgid "Get from _all accounts"
 msgstr "Přijmout ze _všech účtů"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:655
 msgid "Cancel receivin_g"
 msgstr "Přerušit stahování zprá_v"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:658
 msgid "_Send queued messages"
 msgstr "_Odeslat pozdržené zprávy"
 
-#: src/mainwindow.c:669
+#: src/mainwindow.c:663
 msgid "Compose a_n email message"
 msgstr "_Napsat nový mail"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:664
 msgid "Compose a news message"
 msgstr "_Napsat news zprávu"
 
-#: src/mainwindow.c:672 src/messageview.c:303
-#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:431
+#: src/mainwindow.c:666 src/messageview.c:303
+#: src/plugins/notification/notification_banner.c:97 src/summaryview.c:426
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:432
+#: src/mainwindow.c:667 src/messageview.c:304 src/summaryview.c:427
 msgid "Repl_y to"
 msgstr "Odpovědět ko_mu"
 
-#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:435
+#: src/mainwindow.c:670 src/messageview.c:307 src/summaryview.c:430
 msgid "Mailing _list"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:671
 msgid "Follow-up and reply to"
 msgstr "Postoupit a odpovědět"
 
-#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:437
+#: src/mainwindow.c:674 src/messageview.c:310 src/summaryview.c:432
 #: src/toolbar.c:2449
 msgid "_Forward"
 msgstr "Pře_dat"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
 #: src/toolbar.c:2450
 msgid "For_ward as attachment"
 msgstr "Předat jako pří_lohu"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
 #: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr "Pře_směrovat"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:678
 msgid "Mailing-_List"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:679
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:687
-msgid "Help"
-msgstr "Nápověda"
-
-#: src/mainwindow.c:691
+#: src/mainwindow.c:685
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:687
 msgid "View archive"
 msgstr "Zobrazit archív"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:689
 msgid "Contact owner"
 msgstr "Kontaktovat vlastníka"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:693
 msgid "M_ove..."
 msgstr "Přesunou_t..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:694
 msgid "_Copy..."
 msgstr "_Kopírovat..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:695
 msgid "Move to _trash"
 msgstr "Přesuno_ut do koše"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:696
 msgid "_Delete..."
 msgstr "_Odstranit..."
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:697
 msgid "Move thread to tr_ash"
 msgstr "Přesunout vlákno do _koše"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:698
 msgid "Delete t_hread"
 msgstr "Odstranit _vlákno"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:699
 msgid "Cancel a news message"
 msgstr "Stornovat news zprávu"
 
-#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:440
+#: src/mainwindow.c:702 src/mainwindow.c:703 src/summaryview.c:435
 msgid "_Mark"
 msgstr "Označ_it"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:704
 msgid "_Unmark"
 msgstr "Odo_značit"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:707
 msgid "Mark as rea_d"
 msgstr "Označit jako _přečtené"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:708
 msgid "Mark as unr_ead"
 msgstr "Označit jako _nepřečtené"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:710
 msgid "Mark all read in folder"
 msgstr "Označit všechny přečtené ve složce"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:711
 msgid "Mark all unread in folder"
 msgstr "Označit všechny nepřečtené ve složce"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
+#: src/mainwindow.c:713 src/prefs_filtering_action.c:191 src/toolbar.c:242
 #: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr "Ignorovat vlákno"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:714
 msgid "Unignore thread"
 msgstr "Přestat ignorovat vlákno"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:194 src/toolbar.c:243
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:192 src/toolbar.c:243
 #: src/toolbar.c:504
 msgid "Watch thread"
 msgstr "Sledovat vlákno"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:716
 msgid "Unwatch thread"
 msgstr "Nesledovat vlákno"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:719
 msgid "Mark as _spam"
 msgstr "Označit jako _spam"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:720
 msgid "Mark as _ham"
 msgstr "Označit jako n_e spam"
 
-#: src/mainwindow.c:729 src/prefs_filtering_action.c:177 src/toolbar.c:507
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:175 src/toolbar.c:507
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:178 src/toolbar.c:508
+#: src/mainwindow.c:724 src/prefs_filtering_action.c:176 src/toolbar.c:508
 msgid "Unlock"
 msgstr "Odemknout"
 
-#: src/mainwindow.c:732 src/summaryview.c:441
+#: src/mainwindow.c:726 src/summaryview.c:436
 msgid "Color la_bel"
 msgstr "O_barvit"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:727 src/summaryview.c:437
 msgid "Ta_gs"
 msgstr "Zn_ačky"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:730
 msgid "Re-_edit"
 msgstr "Znovu _upravit"
 
-#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1048
+#: src/mainwindow.c:733 src/messageview.c:313 src/mimeview.c:1051
 msgid "Check signature"
 msgstr "Zkontrolovat podpis"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:738 src/messageview.c:317
 msgid "Add sender to address boo_k"
 msgstr "Přidat odesílatele do kni_hy adres"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:740
 msgid "C_ollect addresses"
 msgstr "S_bírat adresy"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:741
 msgid "From current _folder..."
 msgstr "Z aktuální _složky..."
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:742
 msgid "From selected _messages..."
 msgstr "Z vybraných _zpráv..."
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:745
 msgid "_Filter all messages in folder"
 msgstr "Pře_filtrovat všechny zprávy ve složce"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:746
 msgid "Filter _selected messages"
 msgstr "Přefiltrovat _vybrané zprávy"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:747
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustit pravidl_o zpracování složky"
 
-#: src/mainwindow.c:755 src/messageview.c:320
+#: src/mainwindow.c:749 src/messageview.c:320
 msgid "_Create filter rule"
 msgstr "Vytvořit pravidlo _filtru"
 
-#: src/mainwindow.c:756 src/mainwindow.c:762 src/messageview.c:321
+#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
 #: src/messageview.c:327
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:757 src/mainwindow.c:763 src/mainwindow.c:870
+#: src/mainwindow.c:751 src/mainwindow.c:757 src/mainwindow.c:864
 #: src/messageview.c:322 src/messageview.c:328
 msgid "By _From"
 msgstr "Podle _Od"
 
-#: src/mainwindow.c:758 src/mainwindow.c:764 src/mainwindow.c:871
+#: src/mainwindow.c:752 src/mainwindow.c:758 src/mainwindow.c:865
 #: src/messageview.c:323 src/messageview.c:329
 msgid "By _To"
 msgstr "Podle _Komu"
 
-#: src/mainwindow.c:759 src/mainwindow.c:765 src/messageview.c:324
+#: src/mainwindow.c:753 src/mainwindow.c:759 src/messageview.c:324
 #: src/messageview.c:330
 msgid "By _Subject"
 msgstr "Podle _Předmětu"
 
-#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:445
+#: src/mainwindow.c:755 src/messageview.c:326 src/summaryview.c:440
 msgid "Create processing rule"
 msgstr "Vytvořit pravidlo zpracování"
 
-#: src/mainwindow.c:768 src/messageview.c:333
+#: src/mainwindow.c:762 src/messageview.c:333
 msgid "List _URLs..."
 msgstr "Seznam _URLs..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:769
 msgid "Ch_eck for new messages in all folders"
 msgstr "_Zjistit nové zprávy ve všech složkách"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:770
 msgid "Delete du_plicated messages"
 msgstr "_Odstranit duplikáty zpráv"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:771
 msgid "In selected folder"
 msgstr "Ve vybrané složce"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:772
 msgid "In all folders"
 msgstr "Ve všech složkách"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:775
 msgid "E_xecute"
 msgstr "S_pustit"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:776
 msgid "Exp_unge"
 msgstr "Vy_mazat"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:779
 msgid "SSL/TLS cer_tificates"
 msgstr "SSL/TLS cer_tifikáty"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:782
 msgid "Filtering Lo_g"
 msgstr "Záznam filtrování"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:783
 msgid "Network _Log"
 msgstr "Záznam o připojení"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:785
 msgid "Debug _Log"
 msgstr "Debug _log"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:788
 msgid "_Forget all session passwords"
 msgstr "_Zapomenout všechna hesla relace"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:790
 msgid "Forget _master passphrase"
 msgstr "Zapomenout _hlavní heslo"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:794
 msgid "C_hange current account"
 msgstr "_Zvolit aktuální účet"
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:796
 msgid "_Preferences for current account..."
 msgstr "Upravit a_ktuální účet..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:797
 msgid "Create _new account..."
 msgstr "Vytvořit _nový účet..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:798
 msgid "_Edit accounts..."
 msgstr "U_pravit účty..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:801
 msgid "P_references..."
 msgstr "_Volby..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:802
 msgid "Pre-pr_ocessing..."
 msgstr "Před zpracování..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:803
 msgid "Post-pro_cessing..."
 msgstr "Následné zpracování..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:804
 msgid "_Filtering..."
 msgstr "_Filtrování..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:805
 msgid "_Templates..."
 msgstr "Ša_blony..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:806
 msgid "_Actions..."
 msgstr "_Akce..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:807
 msgid "Tag_s..."
 msgstr "Znač_ky..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:809
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:812
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:813
 msgid "_Online User-contributed FAQ"
 msgstr "FAQ (online)"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:814
 msgid "Icon _Legend"
 msgstr "_Význam ikon"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:816
 msgid "Set as default client"
 msgstr "Nastavit jako výchozí klient"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:823
 msgid "Offline _mode"
 msgstr "Offline _mód"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:824
 msgid "Men_ubar"
 msgstr "Řádek men_u"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:825
 msgid "_Message view"
 msgstr "_Náhled zprávy"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:827
 msgid "Status _bar"
 msgstr "_Stavový řádek"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:829
 msgid "Column headers"
 msgstr "Záhlaví sloupců"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:830
 msgid "Th_read view"
 msgstr "Zobrazit _vlákna"
 
-#: src/mainwindow.c:837 src/prefs_summaries.c:667
+#: src/mainwindow.c:831 src/prefs_summaries.c:667
 msgid "Hide read threads"
 msgstr "Skrýt přečtená vlákna"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:832
 msgid "_Hide read messages"
 msgstr "Skrýt přeč_tené zprávy"
 
-#: src/mainwindow.c:839 src/prefs_summaries.c:673
+#: src/mainwindow.c:833 src/prefs_summaries.c:673
 msgid "Hide deleted messages"
 msgstr "Skrýt odstraněné zprávy"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:834
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:841 src/messageview.c:345
+#: src/mainwindow.c:835 src/messageview.c:345
 msgid "Show all _headers"
 msgstr "Zobrazit všechny _hlavičky"
 
-#: src/mainwindow.c:842 src/messageview.c:346
+#: src/mainwindow.c:836 src/messageview.c:346
 msgid "_Collapse all"
 msgstr "_Sbalit vše"
 
-#: src/mainwindow.c:843 src/messageview.c:347
+#: src/mainwindow.c:837 src/messageview.c:347
 msgid "Collapse from level _2"
 msgstr "Sbalit od úrovně _2"
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:838 src/messageview.c:348
 msgid "Collapse from level _3"
 msgstr "Sbalit od úrovně _3"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:842
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:843
 msgid "Text be_side icons"
 msgstr "Text _vedle ikon"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:844
 msgid "_Icons only"
 msgstr "Jen _ikony"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:845
 msgid "_Text only"
 msgstr "Jen _text"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:852
 msgid "_Standard"
 msgstr "_Standartní"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:853
 msgid "_Three columns"
 msgstr "_Tři sloupce"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:854
 msgid "_Wide message"
 msgstr "Široký náhled _zpráv"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:855
 msgid "W_ide message list"
 msgstr "Široký _seznam zpráv"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:856
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:860
 msgid "By _number"
 msgstr "Podle čí_sla"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:861
 msgid "By s_ize"
 msgstr "Podle _velikosti"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:862
 msgid "By _date"
 msgstr "Podle _data"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:863
 msgid "By thread date"
 msgstr "Podle data vlákna"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:866
 msgid "By s_ubject"
 msgstr "Podle _předmětu"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:867
 msgid "By _color label"
 msgstr "Podle _barevného označení zprávy"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:868
 msgid "By tag"
 msgstr "Podle tag"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:869
 msgid "By _mark"
 msgstr "Podle _značky"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:870
 msgid "By _status"
 msgstr "Podle _stavu"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:871
 msgid "By a_ttachment"
 msgstr "Podle _přílohy"
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:872
 msgid "By score"
 msgstr "Podle skóre"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:873
 msgid "By locked"
 msgstr "Podle zamknuto"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:874
 msgid "D_on't sort"
 msgstr "N_eřadit"
 
-#: src/mainwindow.c:884 src/prefs_summaries.c:654
+#: src/mainwindow.c:878 src/prefs_summaries.c:654
 msgid "Ascending"
 msgstr "Vzestupně"
 
-#: src/mainwindow.c:885 src/prefs_summaries.c:655
+#: src/mainwindow.c:879 src/prefs_summaries.c:655
 msgid "Descending"
 msgstr "Sestupně"
 
-#: src/mainwindow.c:927 src/messageview.c:390
+#: src/mainwindow.c:921 src/messageview.c:390
 msgid "_Auto detect"
 msgstr "_Autodetekce"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1299 src/summaryview.c:6472
 msgid "Apply tags..."
 msgstr "Použít značky..."
 
-#: src/mainwindow.c:1961
+#: src/mainwindow.c:1940
 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:1976
+#: src/mainwindow.c:1959
 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:1979
+#: src/mainwindow.c:1962
 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:1993
+#: src/mainwindow.c:1976
 msgid "Select account"
 msgstr "Vybrat účet"
 
-#: src/mainwindow.c:2020 src/prefs_logging.c:136
+#: src/mainwindow.c:2003 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Síťový protokol"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2007
 msgid "Filtering/Processing debug log"
 msgstr "Protokol filtrování zpráv a zpracování složek"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:378
+#: src/mainwindow.c:2026 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "protokolování filtrů zapnuto\n"
 
-#: src/mainwindow.c:2045 src/prefs_logging.c:380
+#: src/mainwindow.c:2028 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "protokolování filtrů vypnuto\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:2449 src/mainwindow.c:2456 src/mainwindow.c:2499
+#: src/mainwindow.c:2532 src/mainwindow.c:2564 src/mainwindow.c:2609
 #: 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:1075
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2610 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:2897 src/mainwindow.c:2902
+#: src/mainwindow.c:2867 src/mainwindow.c:2872
 msgid "Delete all messages in trash folders?"
 msgstr "Odstranit všechny zprávy ve VŠECH koších?"
 
-#: src/mainwindow.c:2898
+#: src/mainwindow.c:2868
 msgid "Don't quit"
 msgstr "Neukončit"
 
-#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2899 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Přidat mailbox"
 
-#: src/mainwindow.c:2930
+#: src/mainwindow.c:2900
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7809,18 +8118,18 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox '%s' již existuje."
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2913 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
 #: src/wizard.c:742
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2918 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7830,47 +8139,51 @@ msgstr ""
 "Může to být tím, že mailbox již existuje, nebo nemáte dostatečná práva pro "
 "zápis."
 
-#: src/mainwindow.c:3415
+#: src/mainwindow.c:3385
 msgid "No posting allowed"
 msgstr "Zasílání zpráv do konference není povoleno"
 
-#: src/mainwindow.c:3997
+#: src/mainwindow.c:3940
 msgid "Mbox import has failed."
 msgstr "Import souboru mbox se nezdařil."
 
-#: src/mainwindow.c:4006 src/mainwindow.c:4015
+#: src/mainwindow.c:3949 src/mainwindow.c:3958
 msgid "Export to mbox has failed."
 msgstr "Export do mbox souboru se nezdařil."
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:3999 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:3999 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Ukončit Claws Mail?"
 
-#: src/mainwindow.c:4257
+#: src/mainwindow.c:4000
+msgid "_Quit"
+msgstr "_Ukončit"
+
+#: src/mainwindow.c:4200
 msgid "Folder synchronisation"
 msgstr "Synchronizace složek"
 
-#: src/mainwindow.c:4258
+#: src/mainwindow.c:4201
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete nyní synchronizovat složky?"
 
-#: src/mainwindow.c:4259
+#: src/mainwindow.c:4202
 msgid "_Synchronise"
 msgstr "_Synchronizovat"
 
-#: src/mainwindow.c:4737
+#: src/mainwindow.c:4680
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/mainwindow.c:4747
+#: src/mainwindow.c:4690
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Žádná duplicitní zpráva ve vybrané složce.\n"
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -7878,7 +8191,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:4757
+#: src/mainwindow.c:4700
 #, 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"
@@ -7886,11 +8199,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:4795
+#: src/mainwindow.c:4738
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Vymazávám duplikované zprávy ve všech složkách..."
 
-#: src/mainwindow.c:4801
+#: src/mainwindow.c:4744
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -7898,47 +8211,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:4806
+#: src/mainwindow.c:4749
 #, 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:4968 src/messageview.c:2634
+#: src/mainwindow.c:4911 src/messageview.c:2631
 msgid "Select folder to go to"
 msgstr "Vybrat složku pro přejití"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5012 src/summaryview.c:5913
 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:5077
+#: src/mainwindow.c:5020
 msgid "Processing rules to apply after folder rules"
 msgstr "Zpracování složky - pravidla prováděná po pravidlech složky"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5028 src/summaryview.c:5924
 msgid "Filtering configuration"
 msgstr "Filtr pro příjem - nastavení pravidel"
 
-#: src/mainwindow.c:5200
+#: src/mainwindow.c:5143
 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:5259
+#: src/mainwindow.c:5202
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail byl zaregistrován jako výchozí klient."
 
-#: src/mainwindow.c:5261
+#: src/mainwindow.c:5204
 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:5275 src/setup.c:91
+#: src/mainwindow.c:5218 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prohledávám složku %s%c%s..."
 
-#: src/mainwindow.c:5419
+#: src/mainwindow.c:5362
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7969,7 +8282,7 @@ msgid "tag"
 msgstr "značka"
 
 #: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
-#: src/message_search.c:215 src/prefs_matcher.c:752 src/summary_search.c:455
+#: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
@@ -8029,7 +8342,7 @@ msgstr "Přepsat mbox soubor"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento soubor již existuje. Chcete ho přepsat?"
 
-#: src/mbox.c:552 src/mimeview.c:1897 src/prefs_themes.c:596
+#: src/mbox.c:552 src/mimeview.c:1905 src/prefs_themes.c:596
 msgid "Overwrite"
 msgstr "Přepsat"
 
@@ -8054,11 +8367,11 @@ msgstr "Hledat text v aktuální zprávě"
 msgid "Find text:"
 msgstr "Hledaný text:"
 
-#: src/message_search.c:318 src/summary_search.c:779
+#: src/message_search.c:318 src/summary_search.c:783
 msgid "Search failed"
 msgstr "Neúspěšné hledání"
 
-#: src/message_search.c:319 src/summary_search.c:780
+#: src/message_search.c:319 src/summary_search.c:784
 msgid "Search string not found."
 msgstr "Hledaný řetězec nebyl nalezen."
 
@@ -8070,23 +8383,23 @@ msgstr "Dosažen začátek zprávy, pokračovat od konce?"
 msgid "End of message reached; continue from beginning?"
 msgstr "Dosažen konec zprávy, pokračovat od začátku?"
 
-#: src/message_search.c:334 src/summary_search.c:791
+#: src/message_search.c:334 src/summary_search.c:795
 msgid "Search finished"
 msgstr "Hledání ukončeno"
 
-#: src/messageview.c:300 src/textview.c:249
+#: src/messageview.c:300 src/textview.c:225
 msgid "Compose _new message"
 msgstr "_Napsat novou zprávu"
 
-#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
+#: src/messageview.c:711 src/messageview.c:1433 src/messageview.c:1584
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Náhled zprávy"
 
-#: src/messageview.c:845
+#: src/messageview.c:842
 msgid "<No Return-Path found>"
 msgstr "<návratová adresa nebyla nalezena>"
 
-#: src/messageview.c:852
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8101,52 +8414,52 @@ msgstr ""
 "Návratová adresa: %s\n"
 "Doporučuje se neodesílat potvrzení o doručení."
 
-#: src/messageview.c:859
+#: src/messageview.c:856
 msgid "_Don't Send"
 msgstr "_Neodesílat"
 
-#: src/messageview.c:1366
+#: src/messageview.c:1363
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Přijímaní zprávy (%s)..."
 
-#: src/messageview.c:1402 src/procmime.c:957
+#: src/messageview.c:1399 src/procmime.c:996
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nepodařilo se rozšifrovat: %s"
 
-#: src/messageview.c:1483 src/messageview.c:1491
+#: src/messageview.c:1480 src/messageview.c:1488
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Zpráva nevyhovuje MIME standardu. Může být špatně zobrazena."
 
-#: src/messageview.c:1868
+#: src/messageview.c:1865
 #, c-format
 msgid "Show all %s."
 msgstr "Zobrazit všechny %s."
 
-#: src/messageview.c:1870
+#: src/messageview.c:1867
 msgid "Only the first megabyte of text is shown."
 msgstr "Je zobrazen jen první megabyte textu."
 
-#: src/messageview.c:1901
+#: src/messageview.c:1898
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "Obdržel potvrzení pro tuto zprávu: byla zobrazena příjemcem."
 
-#: src/messageview.c:1904
+#: src/messageview.c:1901
 msgid "You asked for a return receipt in this message."
 msgstr "U této zprávy jste vyžádal(a) potvrzení o doručení."
 
-#: src/messageview.c:1910
+#: src/messageview.c:1907
 msgid "This message asks for a return receipt."
 msgstr "Tato zpráva vyžaduje potvrzení o duručení."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1908
 msgid "Send receipt"
 msgstr "Odeslat potvrzení"
 
-#: src/messageview.c:1954
+#: src/messageview.c:1951
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8154,7 +8467,7 @@ msgstr ""
 "Tato zpráva byla částečně stažena\n"
 "a byla odstraněna ze serveru."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1957
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8163,15 +8476,15 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s."
 
-#: src/messageview.c:1964 src/messageview.c:1986
+#: src/messageview.c:1961 src/messageview.c:1983
 msgid "Mark for download"
 msgstr "Označit ke stažení"
 
-#: src/messageview.c:1965 src/messageview.c:1977
+#: src/messageview.c:1962 src/messageview.c:1974
 msgid "Mark for deletion"
 msgstr "Označit k odstranění"
 
-#: src/messageview.c:1970
+#: src/messageview.c:1967
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8180,12 +8493,12 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude stažena úplně."
 
-#: src/messageview.c:1975 src/messageview.c:1988
-#: src/prefs_filtering_action.c:176 src/toolbar.c:506
+#: src/messageview.c:1972 src/messageview.c:1985
+#: src/prefs_filtering_action.c:174 src/toolbar.c:506
 msgid "Unmark"
 msgstr "Odoznačit"
 
-#: src/messageview.c:1981
+#: src/messageview.c:1978
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8194,7 +8507,7 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude odstraněna."
 
-#: src/messageview.c:2058
+#: src/messageview.c:2055
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8207,20 +8520,15 @@ msgstr ""
 "v záhlaví nejste oficiálním adresátem.\n"
 "Doporučuje se neodesílat potvrzení o doručení."
 
-#: src/messageview.c:2066 src/messageview.c:2074
+#: src/messageview.c:2063 src/messageview.c:2071
 msgid "Return Receipt Notification"
 msgstr "Oznámení o doručení"
 
-#: src/messageview.c:2068 src/messageview.c:2079
-#: src/plugins/rssyl/rssyl_feed_props.c:496
-msgid "_Cancel"
-msgstr "_Zrušit"
-
-#: src/messageview.c:2068 src/messageview.c:2079
+#: src/messageview.c:2065 src/messageview.c:2076
 msgid "_Send Notification"
 msgstr "_Odeslat oznámení"
 
-#: src/messageview.c:2075
+#: src/messageview.c:2072
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8230,11 +8538,11 @@ msgstr ""
 "Tato zpráva byla doručena do více vašich účtů.\n"
 "Vyberte si prosím účet, ze kterého bude odesláno potvrzení o doručení:"
 
-#: src/messageview.c:2171 src/messageview.c:2190
+#: src/messageview.c:2168 src/messageview.c:2187
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemohu tisknout: zpráva neobsahuje text."
 
-#: src/messageview.c:2944
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8242,7 +8550,7 @@ msgstr ""
 "\n"
 "  Ve složce nejsou žádné zprávy"
 
-#: src/messageview.c:2952
+#: src/messageview.c:2949
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8250,7 +8558,7 @@ msgstr ""
 "\n"
 "  Zpráva smazána"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2950
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8258,8 +8566,8 @@ msgstr ""
 "\n"
 "  Zpráva byla smazána nebo přesunuta do jiné složky"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2983 src/messageview.c:2989 src/summaryview.c:4394
+#: src/summaryview.c:7271
 msgid "An error happened while learning.\n"
 msgstr "Během učení došlo k chybě.\n"
 
@@ -8271,7 +8579,7 @@ msgstr "Přesouvám zprávy..."
 msgid "Deleting messages..."
 msgstr "Odstraňuji zprávy..."
 
-#: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:67
+#: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:68
 msgid "Remove _mailbox..."
 msgstr "Odstranit _mailbox..."
 
@@ -8286,7 +8594,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8295,19 +8603,15 @@ msgstr ""
 "Opravdu odstranit mailbox '%s' ?\n"
 "(Zprávy NEBUDOU odstraněny z disku)"
 
-#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:301
 msgid "Remove mailbox"
 msgstr "Odstranit mailbox"
 
-#: src/mimeview.c:221
-msgid "_Open"
-msgstr "_Otevřít"
-
 #: src/mimeview.c:223
 msgid "Open _with..."
 msgstr "Otevřít čím..."
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:172
+#: src/mimeview.c:225 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "Kopírovat"
 
@@ -8331,31 +8635,31 @@ msgstr "Uložit _vše..."
 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:1056 src/mimeview.c:1061 src/mimeview.c:1066
+#: src/mimeview.c:1071
 msgid "View full information"
 msgstr "Zobrazit úplnou informaci"
 
-#: src/mimeview.c:1074
+#: src/mimeview.c:1077
 msgid "Check again"
 msgstr "Zkontrolovat znovu"
 
-#: src/mimeview.c:1086
+#: src/mimeview.c:1089
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "Stiskněte ikonu %s pro zkontrolování."
 
-#: src/mimeview.c:1088
+#: src/mimeview.c:1091
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "Stiskněte ikonu %s nebo '%s' pro zkontrolování."
 
-#: src/mimeview.c:1098
+#: src/mimeview.c:1101
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Vypršel časový limit pro kontrolu podpisu. Stiskněte ikonu pro nový pokus."
 
-#: src/mimeview.c:1100
+#: src/mimeview.c:1103
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8363,26 +8667,27 @@ msgstr ""
 "Vypršel časový limit pro kontrolu podpisu. Stiskněte ikonu nebo '%s' pro "
 "nový pokus."
 
-#: src/mimeview.c:1345
+#: src/mimeview.c:1348
 msgid "Checking signature..."
 msgstr "Kontroluji podpis..."
 
-#: src/mimeview.c:1386
+#: src/mimeview.c:1389
 msgid "Go back to email"
 msgstr "Zpět na zprávu"
 
-#: 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:1823 src/mimeview.c:1915 src/mimeview.c:2157
+#: src/mimeview.c:2193 src/mimeview.c:2305 src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:530
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nepodařilo se uložit tuto část zprávy: %s"
 
-#: src/mimeview.c:1894
+#: src/mimeview.c:1902
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Přepsat existující soubor '%s'?"
 
-#: src/mimeview.c:1918
+#: src/mimeview.c:1926
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8391,19 +8696,19 @@ msgstr ""
 "Nastala chyba při ukládání části zprávy #%d. Chcete operaci zrušit nebo "
 "přeskočit chybu a pokračovat?"
 
-#: src/mimeview.c:1921
+#: src/mimeview.c:1929
 msgid "Error saving all message parts"
 msgstr "Chyba při ukládání všech částí zprávy"
 
-#: src/mimeview.c:1922
+#: src/mimeview.c:1930
 msgid "Skip"
 msgstr "Přeskočit"
 
-#: src/mimeview.c:1922
+#: src/mimeview.c:1930
 msgid "Skip all"
 msgstr "Vše přeskočit"
 
-#: src/mimeview.c:1932
+#: src/mimeview.c:1940
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8411,7 +8716,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:1940
+#: src/mimeview.c:1948
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8419,7 +8724,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:1945
+#: src/mimeview.c:1953
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8427,26 +8732,26 @@ msgstr[0] "%s, %d soubor selhal."
 msgstr[1] "%s, %d soubory selhaly."
 msgstr[2] "%s, %d souborů selhalo."
 
-#: src/mimeview.c:1978 src/plugins/archive/archiver_prefs.c:142
+#: src/mimeview.c:1986 src/plugins/archive/archiver_prefs.c:142
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Vybrat cílovou složku"
 
-#: src/mimeview.c:1985 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1993 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' není adresář."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2110 src/plugins/fancy/fancy_viewer.c:800
+#: src/summaryview.c:5006
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/mimeview.c:2232 src/mimeview.c:2239
+#: src/mimeview.c:2240 src/mimeview.c:2247
 msgid "Open with"
 msgstr "Otevřít čím"
 
-#: src/mimeview.c:2233 src/mimeview.c:2240
+#: src/mimeview.c:2241 src/mimeview.c:2248
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8455,7 +8760,7 @@ msgstr ""
 "Vložte příkazovou řádku pro otevření souboru:\n"
 "('%s' bude nahrazeno jménem souboru)"
 
-#: src/mimeview.c:2335
+#: src/mimeview.c:2343
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8466,11 +8771,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2343
+#: src/mimeview.c:2351
 msgid "Execute untrusted binary?"
 msgstr "Spustit nedůvěryhodný binární soubor?"
 
-#: src/mimeview.c:2344
+#: src/mimeview.c:2352
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8482,22 +8787,22 @@ msgstr ""
 "\n"
 "Chcete ho spustit?"
 
-#: src/mimeview.c:2348
+#: src/mimeview.c:2356
 msgid "Run binary"
 msgstr "Spustit binární soubor"
 
-#: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2657 src/plugins/att_remover/att_remover.c:305
 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:2658 src/plugins/att_remover/att_remover.c:306
+#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2778
 msgid "Size:"
 msgstr "Velikost:"
 
-#: 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:2672 src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1618
 msgid "Description:"
 msgstr "Popis:"
 
@@ -8607,6 +8912,75 @@ msgstr "Odhlásit diskusní skupinu"
 msgid "Rename newsgroup folder"
 msgstr "Přejmenovat složku diskuzní skupiny"
 
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr "OAuth2 - chybějící autorizační kód\n"
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr "OAuth2 - chyba spojení\n"
+
+#: src/oauth2.c:253 src/oauth2.c:367
+msgid "OAuth2 SSL connection error\n"
+msgstr "Chyba připojení OAuth2 SSL\n"
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr "OAuth2 - přístupový token získán\n"
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr "OAuth2 - přístupový token nebyl získán\n"
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr "OAuth2 - obnovený token získán\n"
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "OAuth2 - obnovený token nebyl získán\n"
+
+#: src/oauth2.c:452
+msgid "OAuth2 socket write error\n"
+msgstr "OAuth2 - chyba při psaní do soketu\n"
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr "OAuth2 - chyba soketu vypršení času\n"
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr "OAuth2 - přístupový stále aktuální\n"
+
+#: src/oauth2.c:534
+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:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr "OAuth2 - pokus o aktuální token s autorizačním kódem\n"
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr "OAuth2 - přístupový token updatován\n"
+
+#: src/oauth2.c:583
+#, c-format
+msgid "OAuth2 original: %s\n"
+msgstr "OAuth2 originál: %s\n"
+
+#: src/oauth2.c:584
+#, c-format
+msgid "OAuth2 encoded: %s\n"
+msgstr "OAuth2 kódováno: %s\n"
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr "OAuth2 dekódováno: %s\n"
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr "Vložit hlavní heslo"
@@ -8615,11 +8989,11 @@ msgstr "Vložit hlavní heslo"
 msgid "Incorrect master passphrase."
 msgstr "Nesprávná hlavní heslo."
 
-#: src/password_gtk.c:67
+#: src/password_gtk.c:66
 msgid "New passphrases do not match, try again."
 msgstr "Hesla se neshodují, zkuste znovu."
 
-#: src/password_gtk.c:80
+#: src/password_gtk.c:79
 msgid "Incorrect old master passphrase entered, try again."
 msgstr "Vloženo neplatné předchozí hlavní heslo, zkuste znovu."
 
@@ -8639,19 +9013,19 @@ msgstr ""
 msgid "Old passphrase:"
 msgstr "Předchozí heslo:"
 
-#: src/password_gtk.c:191
+#: src/password_gtk.c:189
 msgid "New passphrase:"
 msgstr "Nové heslo:"
 
-#: src/password_gtk.c:202
+#: src/password_gtk.c:200
 msgid "Confirm passphrase:"
 msgstr "Potvrdit heslo:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:53
+#: src/plugins/acpi_notifier/acpi_notifier.c:55
 msgid "Acpi Notifier"
 msgstr "ACPI oznamovač"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8659,7 +9033,7 @@ msgstr ""
 "Ujistěte se, že je v jádře zaveden modul 'acerhk'.\n"
 "Můžete ho získat na adrese http://www.cakey.de/acerhk/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -8667,19 +9041,19 @@ msgstr ""
 "Ujistěte se, že je v jádře zaveden modul 'acer_acpi'.\n"
 "Můžete ho získat na adrese http://code.google.com/p/aceracpi/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "Ujistěte se, že je v jádře zaveden modul 'asus_laptop'."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "Ujistěte se, že je v jádře zaveden modul 'asus_acpi'."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:75
+#: src/plugins/acpi_notifier/acpi_notifier.c:77
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "Ujistěte se, že je v jádře zaveden modul 'ibm_acpi'."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:76
+#: src/plugins/acpi_notifier/acpi_notifier.c:78
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8687,73 +9061,73 @@ msgstr ""
 "Ujistěte se, že máte nainstalován apanelc.\n"
 "Můžete ho získat na adrese 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:211
+#: src/plugins/acpi_notifier/acpi_notifier.c:217
+#: src/plugins/acpi_notifier/acpi_notifier.c:419
 msgid "Control file doesn't exist."
 msgstr "Řídící soubor neexistuje."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:300
 msgid " : no new or unread mail"
 msgstr " :  žádná nová nebo nepřečtená pošta"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:308
+#: src/plugins/acpi_notifier/acpi_notifier.c:301
 msgid " : unread mail"
 msgstr " :  nepřečtená pošta"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:302
 msgid " : new mail"
 msgstr " :  nová pošta"
 
-#: 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:304
+#: src/plugins/acpi_notifier/acpi_notifier.c:310
+#: src/plugins/acpi_notifier/acpi_notifier.c:316
 msgid "off"
 msgstr "svítí"
 
-#: 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:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:312
+#: src/plugins/acpi_notifier/acpi_notifier.c:318
 msgid "blinking"
 msgstr "bliká"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
-#: src/plugins/acpi_notifier/acpi_notifier.c:321
-#: src/plugins/acpi_notifier/acpi_notifier.c:327
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
+#: src/plugins/acpi_notifier/acpi_notifier.c:314
+#: src/plugins/acpi_notifier/acpi_notifier.c:320
 msgid "on"
 msgstr "zhasnutá"
 
-#: 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:341
+#: src/plugins/acpi_notifier/acpi_notifier.c:350
+#: src/plugins/acpi_notifier/acpi_notifier.c:365
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:388
+#: src/plugins/acpi_notifier/acpi_notifier.c:380
 msgid "ACPI type: "
 msgstr "Typ ACPI: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:397
+#: src/plugins/acpi_notifier/acpi_notifier.c:389
 msgid "ACPI file: "
 msgstr "ACPI soubor: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:408
+#: src/plugins/acpi_notifier/acpi_notifier.c:400
 msgid "values - On: "
 msgstr "hodnoty - zapnuto: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:413
+#: src/plugins/acpi_notifier/acpi_notifier.c:405
 msgid " - Off: "
 msgstr " - vypnuto: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:435
+#: src/plugins/acpi_notifier/acpi_notifier.c:427
 msgid "Blink when user interaction is required"
 msgstr "Blikat, pokud je vyžadován zásah uživatele"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:869
+#: src/plugins/acpi_notifier/acpi_notifier.c:853
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "Tento oznamuje poštu pomocí ACPI diod."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:890
+#: src/plugins/acpi_notifier/acpi_notifier.c:874
 msgid "Laptop LED"
 msgstr "LED dioda laptopu"
 
@@ -8768,44 +9142,44 @@ msgstr "Udržuje všechny adresy příjemců v knize adres."
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
-#: src/plugins/address_keeper/address_keeper_prefs.c:274
+#: src/plugins/address_keeper/address_keeper_prefs.c:281
 msgid "Address Keeper"
 msgstr "Údržbář adresář"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:108
+#: src/plugins/address_keeper/address_keeper_prefs.c:111
 msgid "Address book location"
 msgstr "Cesta ke knize adres"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:113
+#: src/plugins/address_keeper/address_keeper_prefs.c:116
 msgid "Keep to folder"
 msgstr "Uchovat do složky"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:121
+#: src/plugins/address_keeper/address_keeper_prefs.c:124
 msgid "Address book path where addresses are kept"
 msgstr "Cesta knihy adres kde jsou adresy uloženy"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:123
+#: src/plugins/address_keeper/address_keeper_prefs.c:126
 #: src/plugins/bogofilter/bogofilter_gtk.c:262
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:463
-#: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
-#: src/prefs_matcher.c:690
+#: src/plugins/spamassassin/spamassassin_gtk.c:458
+#: src/prefs_filtering_action.c:548 src/prefs_filtering_action.c:555
+#: src/prefs_matcher.c:688
 msgid "Select..."
 msgstr "Vybírám..."
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:139
+#: src/plugins/address_keeper/address_keeper_prefs.c:142
 msgid "Fields to keep addresses from"
 msgstr "Pole z kterých uchovávat adresy"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:147
-#: src/plugins/address_keeper/address_keeper_prefs.c:161
-#: src/plugins/address_keeper/address_keeper_prefs.c:175
+#: src/plugins/address_keeper/address_keeper_prefs.c:150
+#: src/plugins/address_keeper/address_keeper_prefs.c:164
+#: src/plugins/address_keeper/address_keeper_prefs.c:178
 #, c-format
 msgctxt "address keeper: %s stands for a header name"
 msgid "Keep addresses which appear in '%s' headers"
 msgstr "Uchová adresy, které jsou v '%s' hlavičce"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:185
+#: src/plugins/address_keeper/address_keeper_prefs.c:188
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
@@ -9016,16 +9390,16 @@ msgstr "Úroveň komprese"
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
-#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
+#: src/plugins/pdf_viewer/poppler_viewer.c:725 src/prefs_folder_item.c:533
+#: src/prefs_folder_item.c:1180 src/prefs_folder_item.c:1210
 msgid "Yes"
 msgstr "Ano"
 
 #: 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/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:532
+#: src/prefs_folder_item.c:1179 src/prefs_folder_item.c:1209
 #: src/prefs_summaries.c:409
 msgid "No"
 msgstr "Ne"
@@ -9255,7 +9629,6 @@ msgstr ""
 "potřebný pro vytvoření archivu"
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:771
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -9263,25 +9636,25 @@ 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:337
+#: src/plugins/att_remover/att_remover.c:338
 msgid "Remove attachments"
 msgstr "Odebrat přílohy"
 
-#: 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:364
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:337
 msgid "Remove"
 msgstr "Odstranit"
 
-#: 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:372 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:79 src/summaryview.c:2872
 msgid "Attachment"
 msgstr "Příloha"
 
-#: src/plugins/att_remover/att_remover.c:425
+#: src/plugins/att_remover/att_remover.c:426
 msgid "Destroy attachments"
 msgstr "Zničit přílohy"
 
-#: src/plugins/att_remover/att_remover.c:426
+#: src/plugins/att_remover/att_remover.c:427
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -9291,34 +9664,34 @@ msgstr ""
 "\n"
 "Smazaná data budou neobnovitelná."
 
-#: src/plugins/att_remover/att_remover.c:469
+#: src/plugins/att_remover/att_remover.c:470
 msgid "The selected messages don't have any attachments."
 msgstr "Vybrané zprávy nemají žádné přílohy."
 
-#: src/plugins/att_remover/att_remover.c:472
+#: src/plugins/att_remover/att_remover.c:473
 #, c-format
 msgid "Attachments removed from %d of the %d selected messages."
 msgstr "Přílohy odstraněny z %d celkem %d vybraných zpráv."
 
-#: src/plugins/att_remover/att_remover.c:475
+#: src/plugins/att_remover/att_remover.c:476
 #, c-format
 msgid "Attachments removed from all %d selected messages."
 msgstr "Přílohy odstraněny ze všech %d vybraných zpráv."
 
-#: src/plugins/att_remover/att_remover.c:504
+#: src/plugins/att_remover/att_remover.c:505
 msgid "This message doesn't have any attachments."
 msgstr "Tyto zprávy nemají žádné přílohy."
 
-#: src/plugins/att_remover/att_remover.c:517
+#: src/plugins/att_remover/att_remover.c:518
 msgid "Remove attachments..."
 msgstr "Odebrat přílohy..."
 
-#: src/plugins/att_remover/att_remover.c:529
-#: src/plugins/att_remover/att_remover.c:589
+#: src/plugins/att_remover/att_remover.c:530
+#: src/plugins/att_remover/att_remover.c:590
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:594
+#: src/plugins/att_remover/att_remover.c:595
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9330,7 +9703,7 @@ msgstr ""
 "Varování: operace bude nezrušitelná a smazané přílohy bude ztraceny navždy "
 "opravdu navždy."
 
-#: src/plugins/att_remover/att_remover.c:618
+#: src/plugins/att_remover/att_remover.c:619
 msgid "Attachment handling"
 msgstr "Zpracování přílohy"
 
@@ -9373,19 +9746,19 @@ msgstr "přiložit"
 msgid "One of the following regular expressions is matched (one per line)"
 msgstr "Jeden z regulárních výrazů splněn (každý na samostatném řádku)"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:87
+#: src/plugins/attachwarner/attachwarner_prefs.c:88
 msgid "Expressions are case sensitive"
 msgstr "Výrazy zohledňují velikost písmen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:93
+#: src/plugins/attachwarner/attachwarner_prefs.c:94
 msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr "Velikost písmen při shodě s regulárními výrazy v seznamu"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:115
+#: src/plugins/attachwarner/attachwarner_prefs.c:116
 msgid "Lines starting with quotation marks"
 msgstr "Řádky začínající uvozovkami"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:122
+#: src/plugins/attachwarner/attachwarner_prefs.c:123
 msgid ""
 "Exclude quoted lines from checking for the regular expressions above. Note "
 "that handmade quotes cannot be distinguished from quotes generated by "
@@ -9394,22 +9767,22 @@ msgstr ""
 "Vyjmout citované řádky z regulárního výrazu výše. Ručně vložené uvozovky "
 "nemohou být rozlišeny od generovaných odpovědí."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:125
+#: src/plugins/attachwarner/attachwarner_prefs.c:126
 msgid "Forwarded or redirected messages"
 msgstr "Přeposlané nebo přesměrované zprávy"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:132
+#: src/plugins/attachwarner/attachwarner_prefs.c:133
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 "Text zpráv, které předáváte (forward) nebo přesměrováváte (redirect) nebude "
 "kontrolován"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:310
+#: src/plugins/attachwarner/attachwarner_prefs.c:136 src/prefs_msg_colors.c:308
 msgid "Signatures"
 msgstr "Podpisy"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:142
+#: src/plugins/attachwarner/attachwarner_prefs.c:143
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -9417,15 +9790,15 @@ msgstr ""
 "Vyjmout řádky od prvního oddělovače podpisu dopředu z kontroly regulárních "
 "výrazů výše"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:148
+#: src/plugins/attachwarner/attachwarner_prefs.c:149
 msgid "Warn when"
 msgstr "Varovat při"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:152
+#: src/plugins/attachwarner/attachwarner_prefs.c:153
 msgid "Excluding"
 msgstr "Vyloučení"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:230
+#: src/plugins/attachwarner/attachwarner_prefs.c:231
 msgid "Attach Warner"
 msgstr "Kontrola příloh"
 
@@ -9442,12 +9815,12 @@ msgstr "Bogofilter"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:118
-#: src/plugins/spamassassin/spamassassin_gtk.c:459
-#: src/plugins/spamassassin/spamassassin_gtk.c:508
-#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:686
-#: src/prefs_matcher.c:719 src/prefs_matcher.c:1661 src/prefs_matcher.c:1668
-#: src/prefs_matcher.c:1676 src/prefs_matcher.c:1678 src/prefs_matcher.c:2586
-#: src/prefs_matcher.c:2590
+#: src/plugins/spamassassin/spamassassin_gtk.c:454
+#: src/plugins/spamassassin/spamassassin_gtk.c:503
+#: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1656 src/prefs_matcher.c:1663
+#: src/prefs_matcher.c:1671 src/prefs_matcher.c:1673 src/prefs_matcher.c:2580
+#: src/prefs_matcher.c:2584
 msgid "Any"
 msgstr "Kterákoliv"
 
@@ -9542,25 +9915,25 @@ msgstr "Učení se rozpoznávat spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:411
 msgid "Process messages on receiving"
 msgstr "Zpracovat zprávy při příjmu"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:374
+#: src/plugins/spamassassin/spamassassin_gtk.c:369
 msgid "Maximum size"
 msgstr "Maximální velikost"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:383
+#: src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Messages larger than this will not be checked"
 msgstr "Zprávy větší než tato velikost nebudou kontrolovány"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1616
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1684
 msgid "KB"
 msgstr "KB"
 
@@ -9578,7 +9951,7 @@ msgstr "Jenom označit jako spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:432
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9587,7 +9960,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:438
+#: src/plugins/spamassassin/spamassassin_gtk.c:433
 msgid "Click this button to select a folder for storing spam"
 msgstr "Vybrat složku pro ukládání nevyžádaných zpráv"
 
@@ -9619,13 +9992,13 @@ msgstr "Provádět jen pro zprávy v MH složkách"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:453
+#: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Whitelist senders found in address book/folder"
 msgstr "Důvěryhodné odesílatelé nalezeni v knize adres/složce"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:457
+#: src/plugins/spamassassin/spamassassin_gtk.c:452
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9635,7 +10008,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:467
+#: src/plugins/spamassassin/spamassassin_gtk.c:462
 msgid "Click this button to select a book or folder in the address book"
 msgstr "Kliknutím na tlačítko vyberte knihu nebo složku v knize adres"
 
@@ -9662,7 +10035,7 @@ msgstr "Cesta k bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:445
+#: src/plugins/spamassassin/spamassassin_gtk.c:440
 msgid "Mark spam as read"
 msgstr "Označit spam jako přečtený"
 
@@ -9729,7 +10102,7 @@ msgstr ""
 "Volby jsou dostupné v /Nastavení/Volby/Zásuvné moduly/Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:424
+#: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Save spam in"
 msgstr "Uložit spam do"
 
@@ -10068,15 +10441,15 @@ msgid "Render embedded objects using plugins"
 msgstr "Renderovat vložené objekty pomocí zásuvných modulů"
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in Viewer (remote content is enabled)"
+msgid "Open in viewer (remote content is enabled)"
 msgstr "Otevřít v prohlížeči (vzdálený obsah je povolen)"
 
 #: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "Nedělat nic (vzdálený obsah je zakázán)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
-#: src/prefs_proxy.c:241
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4256
+#: src/prefs_proxy.c:235
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -10089,6 +10462,7 @@ msgid "Use proxy"
 msgstr "Použít proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Vzdálené zdroje"
 
@@ -10106,117 +10480,118 @@ msgstr ""
 "Java appletů můžou být povoleno, pokud jsou přiloženy\n"
 "v emailu."
 
-#: src/plugins/fancy/fancy_prefs.c:245
+#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "Povolit načtení vzdáleného obsahu"
 
-#: src/plugins/fancy/fancy_prefs.c:277
+#: src/plugins/fancy/fancy_prefs.c:278
 msgid "When clicking on a link, by default"
 msgstr "Při kliknutí na odkaz"
 
-#: src/plugins/fancy/fancy_prefs.c:285
-msgid "Open in External Browser"
+#: src/plugins/fancy/fancy_prefs.c:286
+msgid "Open in external browser"
 msgstr "Otevřít v externím prohlížeči"
 
-#: src/plugins/fancy/fancy_prefs.c:299
+#: src/plugins/fancy/fancy_prefs.c:300
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "CSS 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/fancy/fancy_prefs.c:310
+#: src/plugins/notification/notification_prefs.c:1341
 #: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
-#: src/prefs_customheader.c:236
+#: src/prefs_account.c:1587 src/prefs_account.c:1706 src/prefs_account.c:2474
+#: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "_Procházet"
 
-#: src/plugins/fancy/fancy_prefs.c:351
+#: src/plugins/fancy/fancy_prefs.c:352
 msgid "Select stylesheet"
 msgstr "Vyberte šablona stylu"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Remote content loading is disabled."
 msgstr "Načítání vzdáleného obsahu je zakázáno."
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:578
 msgid "Load images"
 msgstr "Načíst obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:580
 msgid "Enable remote content"
 msgstr "Odblokovat externí obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:582
 msgid "Enable Javascript"
 msgstr "Povolit Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:584
 msgid "Enable Plugins"
 msgstr "Povolit zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:586
 msgid "Enable Java"
 msgstr "Povolit Javu"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:588
 msgid "Open links with external browser"
 msgstr "Otevřít odkazy v externím prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:780
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:840
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s je poškozený nebo není podporovaný kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:851
 msgid "Search the Web"
 msgstr "Prohledat web"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:862
 msgid "Open in Viewer"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:871
 msgid "Open in Browser"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:881
 msgid "Open Image"
 msgstr "Otevřít obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:890
 msgid "Copy Link"
 msgstr "Kopírovat odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Download Link"
 msgstr "Stáhnout odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Save Image As"
 msgstr "Uložit obrázek jako"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:915
 msgid "Copy Image"
 msgstr "Kopírovat obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:953
 msgid "Import feed"
 msgstr "Načíst kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1245
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1273
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML prohlížeč"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1278
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10345,13 +10720,13 @@ msgstr "Krok 2:"
 msgid "Enter code:"
 msgstr "Vložte kód:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:329
+#: src/plugins/gdata/cm_gdata_contacts.c:331
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Zásuvný modul GData: Chyba při dotazu na kontakty: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:345
+#: src/plugins/gdata/cm_gdata_contacts.c:347
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10360,7 +10735,7 @@ msgstr[1] "Přidány %d z"
 msgstr[2] "Přidáno %d z"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
+#: src/plugins/gdata/cm_gdata_contacts.c:349
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
@@ -10368,41 +10743,41 @@ msgstr[0] "1 kontakt pro uložení"
 msgstr[1] "%d kontakty pro uložení"
 msgstr[2] "%d kontaktů pro uložení"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:357
+#: src/plugins/gdata/cm_gdata_contacts.c:359
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Zásuvný modul GData: Spuštěn asynchronní dotaz na kontakty\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:378
+#: src/plugins/gdata/cm_gdata_contacts.c:380
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Zásuvný modul GData: Chyba při dotazu na skupiny: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:415
+#: src/plugins/gdata/cm_gdata_contacts.c:417
 msgid "GData plugin: Groups received\n"
 msgstr "Zásuvný modul GData: Skupiny obdrženy\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:422
+#: src/plugins/gdata/cm_gdata_contacts.c:424
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Zásuvný modul GData: Spuštěn asynchronní dotaz na skupiny\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:447
+#: src/plugins/gdata/cm_gdata_contacts.c:449
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Zásuvný modul GData: Chyba autentizace: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:454
+#: src/plugins/gdata/cm_gdata_contacts.c:456
 msgid "GData plugin: Authorization successful\n"
 msgstr "Zásuvný modul GData: Autentizace úspěšná\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:474
+#: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Zásuvný modul GData: Spuštěna interaktivní autentizace\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:481
+#: src/plugins/gdata/cm_gdata_contacts.c:483
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "Zásuvný modul GData: Obdržen autorizační kód, vyžadující autorizaci\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:488
+#: src/plugins/gdata/cm_gdata_contacts.c:490
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10410,7 +10785,7 @@ msgstr ""
 "Zásuvný modul GData: Nezískán autorizační kód, požadavek na autorizaci "
 "zrušen\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:494
+#: src/plugins/gdata/cm_gdata_contacts.c:496
 msgid ""
 "GData plugin: Interactive authorization still running, no additional session "
 "started\n"
@@ -10418,45 +10793,45 @@ msgstr ""
 "Zásuvný modul GData: Interaktivní autorizace stále běží, nebyla spuštěna "
 "další relace\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:511
+#: src/plugins/gdata/cm_gdata_contacts.c:513
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Zásuvný modul GData: Chyba obnovení autentizace: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:535
+#: src/plugins/gdata/cm_gdata_contacts.c:537
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Zásuvný modul GData: Obnovení autentizace úspěšné\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:595
+#: src/plugins/gdata/cm_gdata_contacts.c:597
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
 msgstr ""
 "Zásuvný modul GData: Čas od posledního obnovení: %d minut, obnovuji teď\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:603
+#: src/plugins/gdata/cm_gdata_contacts.c:605
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "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:1921
+#: src/plugins/gdata/cm_gdata_prefs.c:80
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1990
 msgid "Authentication"
 msgstr "Autentizace"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
+#: src/plugins/gdata/cm_gdata_prefs.c:86
+#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1570
 msgid "Username:"
 msgstr "Uživatelské jméno:"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:95
+#: src/plugins/gdata/cm_gdata_prefs.c:99
 msgid "Polling interval (seconds):"
 msgstr "Interval hlasování (sekundy):"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:102
+#: src/plugins/gdata/cm_gdata_prefs.c:106
 msgid "Maximum number of results:"
 msgstr "Maximální počet výsledků:"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:138 src/plugins/gdata/gdata_plugin.c:102
+#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
 #: src/plugins/gdata/gdata_plugin.c:165
 msgid "GData"
 msgstr "GData"
@@ -10491,30 +10866,30 @@ msgstr ""
 msgid "GData integration"
 msgstr "GData integrace"
 
-#: src/plugins/libravatar/libravatar.c:332
-#: src/plugins/libravatar/libravatar.c:397
-#: src/plugins/libravatar/libravatar.c:457
-#: src/plugins/libravatar/libravatar_prefs.c:546
+#: src/plugins/libravatar/libravatar.c:334
+#: src/plugins/libravatar/libravatar.c:399
+#: src/plugins/libravatar/libravatar.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:564
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: src/plugins/libravatar/libravatar.c:339
+#: src/plugins/libravatar/libravatar.c:341
 msgid "Failed to register avatar header update hook"
 msgstr "Selhala registrace update hlaviček avatarů"
 
-#: src/plugins/libravatar/libravatar.c:348
+#: src/plugins/libravatar/libravatar.c:350
 msgid "Failed to register avatar image render hook"
 msgstr "Selhala registrace renderování avatarů"
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:356
 msgid "Failed to create avatar image cache directory"
 msgstr "Vytvoření adresáře pro vyrovnávací paměť avatarů selhalo"
 
-#: src/plugins/libravatar/libravatar.c:364
+#: src/plugins/libravatar/libravatar.c:366
 msgid "Failed to load missing items cache"
 msgstr "Selhalo načtení chybějících položek z vyrovnávací paměti"
 
-#: src/plugins/libravatar/libravatar.c:407
+#: src/plugins/libravatar/libravatar.c:409
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10542,33 +10917,33 @@ msgstr ""
 "\n"
 "Zpětná vazba na <ricardo at mones.org> vítána.\n"
 
-#: src/plugins/libravatar/libravatar_prefs.c:137
+#: src/plugins/libravatar/libravatar_prefs.c:146
 msgid "Error reading cache stats"
 msgstr "Chyba při čtení statistik vyrovnávací paměti"
 
-#: src/plugins/libravatar/libravatar_prefs.c:141
+#: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr "Použití %s v %d souborech, %d adresářích,  %d dalších a %d chybách"
 
-#: src/plugins/libravatar/libravatar_prefs.c:150
+#: src/plugins/libravatar/libravatar_prefs.c:159
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
 msgstr "Použití %s v %d souborech, %d adresářích a %d dalších"
 
-#: src/plugins/libravatar/libravatar_prefs.c:164
+#: src/plugins/libravatar/libravatar_prefs.c:173
 msgid "Clear icon cache"
 msgstr "Vyčistit vyrovnávací paměť ikon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:165
+#: src/plugins/libravatar/libravatar_prefs.c:174
 msgid "Are you sure you want to remove all cached avatar icons?"
 msgstr "Opravdu chcete odstranit všechny ikony avatarů z vyrovnávací paměti?"
 
-#: src/plugins/libravatar/libravatar_prefs.c:178
+#: src/plugins/libravatar/libravatar_prefs.c:187
 msgid "Not enough memory for operation"
 msgstr "Nedostatek paměti pro operaci"
 
-#: src/plugins/libravatar/libravatar_prefs.c:183
+#: src/plugins/libravatar/libravatar_prefs.c:192
 #, c-format
 msgid ""
 "Icon cache successfully cleared:\n"
@@ -10579,11 +10954,11 @@ msgstr ""
 "• %u chybějících vstupů odstraněno.\n"
 "• %u souborů odstraněno."
 
-#: src/plugins/libravatar/libravatar_prefs.c:188
+#: src/plugins/libravatar/libravatar_prefs.c:197
 msgid "Icon cache successfully cleared!"
 msgstr "Vyrovnávací paměť ikon úspěšně vyčištěna!"
 
-#: src/plugins/libravatar/libravatar_prefs.c:191
+#: src/plugins/libravatar/libravatar_prefs.c:200
 #, c-format
 msgid ""
 "Errors clearing icon cache:\n"
@@ -10598,83 +10973,99 @@ msgstr ""
 "• %u souborů selhalo při čtení.\n"
 "• %u souborů nemohlo být odstraněno."
 
-#: src/plugins/libravatar/libravatar_prefs.c:198
+#: src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Error clearing icon cache."
 msgstr "Chyba při čištění vyrovnávací paměti ikon."
 
-#: src/plugins/libravatar/libravatar_prefs.c:213
+#: src/plugins/libravatar/libravatar_prefs.c:222
 msgid "_Use cached icons"
 msgstr "_Použít ikony z vyrovnávací paměti"
 
-#: src/plugins/libravatar/libravatar_prefs.c:214
+#: src/plugins/libravatar/libravatar_prefs.c:223
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 "Uložit ikony na disku pro pře použití namísto dalšího síťového požadavku"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
+#: src/plugins/libravatar/libravatar_prefs.c:238
 msgid "Cache refresh interval"
 msgstr "Interval obnovy vyrovnávací paměti"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
-#: 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/libravatar/libravatar_prefs.c:238
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1663
+#: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "hodin"
 
-#: src/plugins/libravatar/libravatar_prefs.c:305
+#: src/plugins/libravatar/libravatar_prefs.c:316
 msgid "Mystery man"
 msgstr "Mystery man"
 
-#: src/plugins/libravatar/libravatar_prefs.c:306
+#: src/plugins/libravatar/libravatar_prefs.c:317
 msgid "Identicon"
 msgstr "Identicon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:307
+#: src/plugins/libravatar/libravatar_prefs.c:318
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: src/plugins/libravatar/libravatar_prefs.c:308
+#: src/plugins/libravatar/libravatar_prefs.c:319
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: src/plugins/libravatar/libravatar_prefs.c:309
+#: src/plugins/libravatar/libravatar_prefs.c:320
 msgid "Retro"
 msgstr "Retro"
 
-#: src/plugins/libravatar/libravatar_prefs.c:310
+#: src/plugins/libravatar/libravatar_prefs.c:321
+msgid "Robohash"
+msgstr "Robohash"
+
+#: src/plugins/libravatar/libravatar_prefs.c:322
+msgid "Pagan"
+msgstr "Pagan"
+
+#: src/plugins/libravatar/libravatar_prefs.c:323
 msgid "Custom URL"
 msgstr "Vlastní URL"
 
-#: src/plugins/libravatar/libravatar_prefs.c:313
+#: src/plugins/libravatar/libravatar_prefs.c:326
 msgid "A blank image"
 msgstr "Prázdný obázek"
 
-#: src/plugins/libravatar/libravatar_prefs.c:314
+#: src/plugins/libravatar/libravatar_prefs.c:327
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "Decentní šedavá silueta s nízkým kontrastem"
 
-#: src/plugins/libravatar/libravatar_prefs.c:315
+#: src/plugins/libravatar/libravatar_prefs.c:328
 msgid "A generated geometric pattern"
 msgstr "Vygenerovaný geometrický vzor"
 
-#: src/plugins/libravatar/libravatar_prefs.c:316
+#: src/plugins/libravatar/libravatar_prefs.c:329
 msgid "A generated full-body monster"
 msgstr "Vygenerovaný full-body monstrum"
 
-#: src/plugins/libravatar/libravatar_prefs.c:317
+#: src/plugins/libravatar/libravatar_prefs.c:330
 msgid "A generated almost unique face"
 msgstr "Vygenerovaná víceméně unikátní tvář"
 
-#: src/plugins/libravatar/libravatar_prefs.c:318
+#: src/plugins/libravatar/libravatar_prefs.c:331
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "Vygenerovaný 8-bitový pixelový obrázek ve stylu arkád"
 
-#: src/plugins/libravatar/libravatar_prefs.c:319
+#: src/plugins/libravatar/libravatar_prefs.c:332
+msgid "A generated robotic character"
+msgstr "Vygenerovaný charakter robota"
+
+#: src/plugins/libravatar/libravatar_prefs.c:333
+msgid "A generated retro adventure game character"
+msgstr "Vygenerovaný retro adventure game charakter"
+
+#: src/plugins/libravatar/libravatar_prefs.c:334
 msgid "Redirect to a user provided URL"
 msgstr "Přesměrovat na uživatelem zadané URL"
 
-#: src/plugins/libravatar/libravatar_prefs.c:333
+#: src/plugins/libravatar/libravatar_prefs.c:348
 msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
@@ -10682,11 +11073,11 @@ msgstr ""
 "Vložte URL na kterou chcete být přesměrován, pokud ikona není dostupná. "
 "Ponechte prázdné pro použití výchozí libravatar ikony."
 
-#: src/plugins/libravatar/libravatar_prefs.c:382
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "_Povolit přesměrování na jiné zdroje"
 
-#: src/plugins/libravatar/libravatar_prefs.c:383
+#: src/plugins/libravatar/libravatar_prefs.c:399
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -10694,23 +11085,23 @@ msgstr ""
 "Následovat přesměrované odpovědi z serveru libravatar  na jiné služby jako "
 "gravatar.com"
 
-#: src/plugins/libravatar/libravatar_prefs.c:392
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "_Povolit federované servery"
 
-#: src/plugins/libravatar/libravatar_prefs.c:393
+#: src/plugins/libravatar/libravatar_prefs.c:409
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "Pokusit se získat avatar ze libravatar serveru odesílatele"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr "Časový limit požadavku vypršel"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "sekunda(sekund)"
 
-#: src/plugins/libravatar/libravatar_prefs.c:411
+#: 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."
@@ -10718,18 +11109,56 @@ msgstr ""
 "Nastavte na 0 pro použití globálního timeoutu I/O soketu. Maximální hodnota "
 "musí být menší než globální."
 
-#: src/plugins/libravatar/libravatar_prefs.c:455
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Vyrovnávací paměť ikon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "Výchozí mód chybějících ikon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:463
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Síť"
 
+#: src/plugins/litehtml_viewer/lh_prefs.c:116
+msgid ""
+"Loading remote resources can lead to some privacy issues.\n"
+"When remote content loading is disabled, nothing will be requested\n"
+"from the network."
+msgstr ""
+"Načítání vzdáleného obsahu může přinést problémy s bezpečností.\n"
+"Když je načítání vzdáleného obsahu zakázáno, nic nebude požadováno\n"
+"ze sítě."
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:134
+msgid "Size of image cache in megabytes"
+msgstr "Velikost vyrovnávací paměti pro obrázky v megabytech"
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:149
+msgid "Default font"
+msgstr "Výchozí font"
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+msgid "Open Link"
+msgstr "Otevřít odkaz"
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+msgid "Copy Link Location"
+msgstr "Kopírovat odkaz"
+
+#: src/plugins/litehtml_viewer/plugin.c:50
+msgid "LiteHTML viewer"
+msgstr "LiteHTML prohlížeč"
+
+#: src/plugins/litehtml_viewer/plugin.c:55
+msgid ""
+"Viewer plugin for HTML emails, using the litehtml library (http://www."
+"litehtml.com/)."
+msgstr ""
+"Zásuvný modul pro prohlížení HTML emailů, používající litehtml library "
+"(http://www.litehtml.com/)."
+
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder"
 msgstr "mailmbox složka"
@@ -10742,7 +11171,7 @@ msgstr "Zásuvný modul pro obsluhu mailboxy ve formátu mbox."
 msgid "MBOX"
 msgstr "MBOX"
 
-#: src/plugins/mailmbox/plugin_gtk.c:190
+#: src/plugins/mailmbox/plugin_gtk.c:191
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -10752,7 +11181,7 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/plugins/mailmbox/plugin_gtk.c:330
+#: src/plugins/mailmbox/plugin_gtk.c:331
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be deleted.\n"
@@ -10819,7 +11248,7 @@ msgstr "Metoda autentizace nedostupná"
 msgid "sending error on Sieve session: %s\n"
 msgstr "chyba odesílání na Sieve relaci: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5805
 msgid "_Filter"
 msgstr "_Filtrovat"
 
@@ -10876,7 +11305,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve Filtr%s"
 
 #: src/plugins/managesieve/sieve_editor.c:744
-#: src/plugins/pdf_viewer/poppler_viewer.c:1315
+#: src/plugins/pdf_viewer/poppler_viewer.c:1326
 msgid "Loading..."
 msgstr "Načítám..."
 
@@ -10926,6 +11355,10 @@ msgstr "Připojení..."
 msgid "Manage Sieve Filters"
 msgstr "Spravovat Sieve filtry"
 
+#: src/plugins/managesieve/sieve_manager.c:771
+msgid "_Rename"
+msgstr "Pře_jmenovat"
+
 #: src/plugins/managesieve/sieve_manager.c:806
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "Pro použití Sieve ho povolte v nastavení účtů."
@@ -10947,7 +11380,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:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1261
 msgid "Server information"
 msgstr "Informace o serveru"
 
@@ -10998,29 +11431,29 @@ msgstr "Nastavit autentizaci"
 
 #: 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:510 src/prefs_account.c:1432
+#: src/prefs_account.c:2037
 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: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:518 src/prefs_account.c:1437
+#: src/prefs_account.c:2060 src/prefs_account.c:2997 src/prefs_account.c:3025
+#: src/prefs_account.c:3220 src/prefs_proxy.c:132 src/wizard.c:1222
+#: src/wizard.c:1652
 msgid "Password"
 msgstr "Heslo"
 
-#: 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:1615
+#: src/prefs_account.c:1745 src/prefs_account.c:2008
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: 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:1755
+#: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1116
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -11070,7 +11503,7 @@ msgstr ""
 msgid "Log file"
 msgstr "Soubor záznamu"
 
-#: src/plugins/notification/notification_banner.c:357
+#: src/plugins/notification/notification_banner.c:358
 msgid "Folder:"
 msgstr "Složka:"
 
@@ -11086,70 +11519,70 @@ msgstr "vybírat i s podsložkami"
 msgid "No new messages"
 msgstr "Žádné nové zprávy"
 
-#: src/plugins/notification/notification_plugin.c:216
-#: src/plugins/notification/notification_plugin.c:420
-#: src/plugins/notification/notification_prefs.c:399
-#: src/plugins/notification/notification_prefs.c:414
-#: src/plugins/notification/notification_prefs.c:433
-#: src/plugins/notification/notification_prefs.c:451
-#: src/plugins/notification/notification_prefs.c:469
-#: src/plugins/notification/notification_prefs.c:487
-#: src/plugins/notification/notification_prefs.c:505
-#: src/plugins/notification/notification_prefs.c:523
+#: src/plugins/notification/notification_plugin.c:220
+#: src/plugins/notification/notification_plugin.c:424
+#: src/plugins/notification/notification_prefs.c:404
+#: src/plugins/notification/notification_prefs.c:420
+#: src/plugins/notification/notification_prefs.c:439
+#: src/plugins/notification/notification_prefs.c:457
+#: src/plugins/notification/notification_prefs.c:475
+#: src/plugins/notification/notification_prefs.c:493
+#: src/plugins/notification/notification_prefs.c:511
+#: src/plugins/notification/notification_prefs.c:529
 msgid "Notification"
 msgstr "Upozorňování"
 
-#: src/plugins/notification/notification_plugin.c:221
+#: src/plugins/notification/notification_plugin.c:225
 msgid "The Notification plugin needs threading support."
 msgstr ""
 "Zásuvný modul \"Upozorňování\" potřebuje podporu vláken (threading support)."
 
-#: src/plugins/notification/notification_plugin.c:228
+#: src/plugins/notification/notification_plugin.c:232
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
 "Zásuvnému modulu \"Upozorňování\" se nepodařilo se zaregistrovat funkci pro "
 "obsluhu události \"item update\""
 
-#: src/plugins/notification/notification_plugin.c:236
+#: src/plugins/notification/notification_plugin.c:240
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr ""
 "Zásuvnému modulu \"Upozorňování\" se nepodařilo se zaregistrovat update "
 "složky"
 
-#: src/plugins/notification/notification_plugin.c:246
+#: src/plugins/notification/notification_plugin.c:250
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
 "Zásuvnému modulu \"Upozorňování\" se nepodařilo se zaregistrovat funkci pro "
 "obsluhu události \"msginfo update\""
 
-#: src/plugins/notification/notification_plugin.c:256
+#: src/plugins/notification/notification_plugin.c:260
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr ""
 "Zásuvnému modulu \"Upozorňování\" se nepodařilo se zaregistrovat přepínání "
 "offline"
 
-#: src/plugins/notification/notification_plugin.c:267
+#: src/plugins/notification/notification_plugin.c:271
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
 "Zásuvnému modulu \"Upozorňování\" se nepodařilo se zaregistrovat zavření "
 "hlavního okna"
 
-#: src/plugins/notification/notification_plugin.c:280
+#: src/plugins/notification/notification_plugin.c:284
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr ""
 "Zásuvnému modulu \"Upozorňování\" se nepodařilo se zaregistrovat "
 "ikonifikování"
 
-#: src/plugins/notification/notification_plugin.c:293
+#: src/plugins/notification/notification_plugin.c:297
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
 "Zásuvnému modulu \"Upozorňování\" se nepodařilo se zaregistrovat seznam účtů"
 
-#: src/plugins/notification/notification_plugin.c:306
+#: src/plugins/notification/notification_plugin.c:310
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr "Selhala registrace změny tématu pro zásuvný modul Upozorňování"
 
-#: src/plugins/notification/notification_plugin.c:425
+#: src/plugins/notification/notification_plugin.c:429
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -11164,7 +11597,7 @@ msgstr ""
 "\n"
 "Připomínky a návrhy zaslané na <berndth at gmx.de> jsou vítány."
 
-#: src/plugins/notification/notification_plugin.c:450
+#: src/plugins/notification/notification_plugin.c:454
 msgid "Various tools"
 msgstr "Různé nástroje"
 
@@ -11185,7 +11618,7 @@ msgid "New Calendar message"
 msgstr "Nová kalendářová zpráva"
 
 #: src/plugins/notification/notification_popup.c:337
-#: src/plugins/notification/notification_trayicon.c:907
+#: src/plugins/notification/notification_trayicon.c:906
 msgid "A new calendar message arrived"
 msgstr "Přišla nová kalendářová zpráva"
 
@@ -11194,7 +11627,7 @@ msgid "New RSS feed article"
 msgstr "Zpráva v RSS kanálu"
 
 #: src/plugins/notification/notification_popup.c:341
-#: src/plugins/notification/notification_trayicon.c:910
+#: src/plugins/notification/notification_trayicon.c:909
 msgid "A new article in a RSS feed arrived"
 msgstr "Byla přijata nová zpráva v RSS kanálu"
 
@@ -11207,7 +11640,7 @@ msgid "Unknown message type arrived"
 msgstr "Byla přijata nová zpráva neznámého typu"
 
 #: src/plugins/notification/notification_popup.c:378
-#: src/plugins/notification/notification_trayicon.c:679
+#: src/plugins/notification/notification_trayicon.c:678
 msgid "Present main window"
 msgstr "Otevřít v hlavním okně"
 
@@ -11233,7 +11666,7 @@ msgid "Calendar message"
 msgstr "Kalendářová zpráva"
 
 #: src/plugins/notification/notification_popup.c:501
-#: src/plugins/notification/notification_trayicon.c:944
+#: src/plugins/notification/notification_trayicon.c:943
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -11261,243 +11694,243 @@ msgstr[0] "%d nová zpráva"
 msgstr[1] "%d nové zprávy"
 msgstr[2] "%d nových zpráv"
 
-#: src/plugins/notification/notification_prefs.c:415
+#: src/plugins/notification/notification_prefs.c:421
 msgid "Hotkeys"
 msgstr "Klávesové zkratky"
 
-#: src/plugins/notification/notification_prefs.c:434
+#: src/plugins/notification/notification_prefs.c:440
 msgid "Banner"
 msgstr "Proužek"
 
-#: src/plugins/notification/notification_prefs.c:452
+#: src/plugins/notification/notification_prefs.c:458
 msgid "Popup"
 msgstr "Vyskakovací okno"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:265
+#: src/plugins/notification/notification_prefs.c:476 src/prefs_actions.c:262
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/plugins/notification/notification_prefs.c:488
+#: src/plugins/notification/notification_prefs.c:494
 msgid "LCD"
 msgstr "LCD"
 
-#: src/plugins/notification/notification_prefs.c:506
+#: src/plugins/notification/notification_prefs.c:512
 msgid "SysTrayicon"
 msgstr "SysTrayicon"
 
-#: src/plugins/notification/notification_prefs.c:524
+#: src/plugins/notification/notification_prefs.c:530
 msgid "Indicator"
 msgstr "Indikátor"
 
-#: src/plugins/notification/notification_prefs.c:607
+#: src/plugins/notification/notification_prefs.c:613
 msgid "Include folder types"
 msgstr "Zahrnout do upozorňování tyto typy složek"
 
-#: src/plugins/notification/notification_prefs.c:616
+#: src/plugins/notification/notification_prefs.c:622
 msgid "Mail folders"
 msgstr "Pošta"
 
-#: src/plugins/notification/notification_prefs.c:624
+#: src/plugins/notification/notification_prefs.c:630
 msgid "News folders"
 msgstr "Diskuzní skupiny"
 
-#: src/plugins/notification/notification_prefs.c:632
+#: src/plugins/notification/notification_prefs.c:638
 msgid "RSSyl folders"
 msgstr "RSSyl složky"
 
-#: src/plugins/notification/notification_prefs.c:640
+#: src/plugins/notification/notification_prefs.c:646
 msgid "vCalendar folders"
 msgstr "vCalendar folders"
 
-#: src/plugins/notification/notification_prefs.c:648
+#: src/plugins/notification/notification_prefs.c:654
 msgid "These settings override folder-specific selections."
 msgstr "Toto nastavení má přednost před nastavením složek."
 
-#: src/plugins/notification/notification_prefs.c:659
+#: src/plugins/notification/notification_prefs.c:665
 msgid "Global notification settings"
 msgstr "Nastavení upozorňování"
 
-#: src/plugins/notification/notification_prefs.c:668
+#: src/plugins/notification/notification_prefs.c:674
 msgid "Set window manager urgency hint when new messages exist"
 msgstr "Nastavit zvýraznění okna, jestliže existují nové zprávy"
 
-#: src/plugins/notification/notification_prefs.c:677
+#: src/plugins/notification/notification_prefs.c:683
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr "Nastavit zvýraznění okna, jestliže existují nepřečtené zprávy"
 
-#: src/plugins/notification/notification_prefs.c:687
+#: src/plugins/notification/notification_prefs.c:693
 msgid "Use sound theme"
 msgstr "Použít zvukové téma"
 
-#: src/plugins/notification/notification_prefs.c:761
+#: src/plugins/notification/notification_prefs.c:765
 msgid "Show banner"
 msgstr "Zobrazovat proužek"
 
-#: src/plugins/notification/notification_prefs.c:766
+#: src/plugins/notification/notification_prefs.c:770
 #: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
+#: src/plugins/notification/notification_prefs.c:772 src/prefs_receive.c:229
 #: src/prefs_summaries.c:523 src/prefs_summaries.c:576
 msgid "Always"
 msgstr "Vždy"
 
-#: src/plugins/notification/notification_prefs.c:770
+#: src/plugins/notification/notification_prefs.c:774
 msgid "Only when not empty"
 msgstr "Pokud není prázdný"
 
-#: src/plugins/notification/notification_prefs.c:789
+#: src/plugins/notification/notification_prefs.c:793
 msgid "Banner speed"
 msgstr "Rychlost textu"
 
-#: src/plugins/notification/notification_prefs.c:826
+#: src/plugins/notification/notification_prefs.c:830
 msgid "Maximum number of messages"
 msgstr "Maximální počet zpráv"
 
-#: src/plugins/notification/notification_prefs.c:832
+#: src/plugins/notification/notification_prefs.c:836
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr "Maximální počet zobrazených zpráv, 0 znamená bez omezení"
 
-#: src/plugins/notification/notification_prefs.c:841
+#: src/plugins/notification/notification_prefs.c:845
 msgid "Banner width"
 msgstr "Šířka textu"
 
-#: src/plugins/notification/notification_prefs.c:847
+#: src/plugins/notification/notification_prefs.c:851
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr "Limit pro šířku textu, 0 pro šířku displeje"
 
-#: src/plugins/notification/notification_prefs.c:849
+#: src/plugins/notification/notification_prefs.c:853
 msgid "pixel(s)"
 msgstr "pixel(y)"
 
-#: src/plugins/notification/notification_prefs.c:858
+#: src/plugins/notification/notification_prefs.c:862
 msgid "Include unread mails in banner"
 msgstr "Zobrazovat i nepřečtené zprávy"
 
-#: src/plugins/notification/notification_prefs.c:866
+#: src/plugins/notification/notification_prefs.c:870
 msgid "Make banner sticky"
 msgstr "\"Přilepený\" (sticky) proužek"
 
-#: src/plugins/notification/notification_prefs.c:876
-#: src/plugins/notification/notification_prefs.c:1081
-#: src/plugins/notification/notification_prefs.c:1376
-#: src/plugins/notification/notification_prefs.c:1611
+#: src/plugins/notification/notification_prefs.c:880
+#: src/plugins/notification/notification_prefs.c:1080
+#: src/plugins/notification/notification_prefs.c:1371
+#: src/plugins/notification/notification_prefs.c:1606
 msgid "Only include selected folders"
 msgstr "Kontrolovat pouze vybrané složky"
 
-#: src/plugins/notification/notification_prefs.c:885
-#: src/plugins/notification/notification_prefs.c:1090
-#: src/plugins/notification/notification_prefs.c:1385
-#: src/plugins/notification/notification_prefs.c:1620
+#: src/plugins/notification/notification_prefs.c:889
+#: src/plugins/notification/notification_prefs.c:1089
+#: src/plugins/notification/notification_prefs.c:1380
+#: src/plugins/notification/notification_prefs.c:1615
 msgid "Select folders..."
 msgstr "Vybrat složky..."
 
-#: src/plugins/notification/notification_prefs.c:897
+#: src/plugins/notification/notification_prefs.c:901
 msgid "Banner colors"
 msgstr "Barva textu"
 
-#: src/plugins/notification/notification_prefs.c:901
-#: src/plugins/notification/notification_prefs.c:1122
+#: src/plugins/notification/notification_prefs.c:905
+#: src/plugins/notification/notification_prefs.c:1121
 msgid "Use custom colors"
 msgstr "Použít vlastní barvy"
 
-#: src/plugins/notification/notification_prefs.c:916
+#: src/plugins/notification/notification_prefs.c:920
 #: src/plugins/notification/notification_prefs.c:1135
 msgid "Foreground"
 msgstr "Popředí"
 
-#: src/plugins/notification/notification_prefs.c:922
+#: src/plugins/notification/notification_prefs.c:926
 #: src/plugins/notification/notification_prefs.c:1141
 msgid "Foreground color"
 msgstr "Barva popředí"
 
-#: src/plugins/notification/notification_prefs.c:927
-#: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:260 src/prefs_msg_colors.c:273
-#: src/prefs_msg_colors.c:286
+#: src/plugins/notification/notification_prefs.c:931
+#: src/plugins/notification/notification_prefs.c:1147
+#: src/prefs_msg_colors.c:258 src/prefs_msg_colors.c:271
+#: src/prefs_msg_colors.c:284
 msgid "Background"
 msgstr "Pozadí"
 
-#: src/plugins/notification/notification_prefs.c:933
-#: src/plugins/notification/notification_prefs.c:1152
+#: src/plugins/notification/notification_prefs.c:937
+#: src/plugins/notification/notification_prefs.c:1153
 msgid "Background color"
 msgstr "Barva pozadí"
 
-#: src/plugins/notification/notification_prefs.c:1045
-#: src/plugins/notification/notification_prefs.c:1646
+#: src/plugins/notification/notification_prefs.c:1044
+#: src/plugins/notification/notification_prefs.c:1641
 msgid "Enable popup"
 msgstr "Povolit vyskakovací okno"
 
-#: src/plugins/notification/notification_prefs.c:1062
-#: src/plugins/notification/notification_prefs.c:1664
+#: src/plugins/notification/notification_prefs.c:1061
+#: src/plugins/notification/notification_prefs.c:1659
 msgid "Popup timeout"
 msgstr "Časový limit pro zobrazení okna"
 
-#: src/plugins/notification/notification_prefs.c:1101
+#: src/plugins/notification/notification_prefs.c:1100
 msgid "Make popup sticky"
 msgstr "\"Přilepené\" (sticky) okno"
 
-#: src/plugins/notification/notification_prefs.c:1111
+#: src/plugins/notification/notification_prefs.c:1110
 msgid "Set popup window width and position"
 msgstr "Nastavit šířku a polohu okna"
 
-#: src/plugins/notification/notification_prefs.c:1116
+#: src/plugins/notification/notification_prefs.c:1115
 msgid "(the window manager is free to ignore this)"
 msgstr "(správce oken může toto nastavení ignorovat)"
 
-#: src/plugins/notification/notification_prefs.c:1164
-#: src/plugins/notification/notification_prefs.c:1676
+#: src/plugins/notification/notification_prefs.c:1165
+#: src/plugins/notification/notification_prefs.c:1671
 msgid "Display folder name"
 msgstr "Zobrazit jméno složky"
 
-#: src/plugins/notification/notification_prefs.c:1229
+#: src/plugins/notification/notification_prefs.c:1224
 msgid "Sample popup window"
 msgstr "Vzorové vyskakovací okno"
 
-#: src/plugins/notification/notification_prefs.c:1235
+#: src/plugins/notification/notification_prefs.c:1230
 msgid "Done"
 msgstr "Hotovo"
 
-#: src/plugins/notification/notification_prefs.c:1293
+#: src/plugins/notification/notification_prefs.c:1288
 msgid "Select command"
 msgstr "Vyberte příkaz"
 
-#: src/plugins/notification/notification_prefs.c:1322
+#: src/plugins/notification/notification_prefs.c:1317
 msgid "Enable command"
 msgstr "Povolit spuštění příkazu"
 
-#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
+#: src/plugins/notification/notification_prefs.c:1334 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "Příkaz pro spuštění"
 
-#: src/plugins/notification/notification_prefs.c:1357
+#: src/plugins/notification/notification_prefs.c:1352
 msgid "Block command after execution for"
 msgstr "Blokovat příkaz po vykonání na"
 
-#: src/plugins/notification/notification_prefs.c:1464
+#: src/plugins/notification/notification_prefs.c:1459
 msgid "Enable LCD"
 msgstr "Povolit LCD"
 
-#: src/plugins/notification/notification_prefs.c:1483
+#: src/plugins/notification/notification_prefs.c:1478
 msgid "Hostname:Port of LCDd server"
 msgstr "Hostname:Port LCDd serveru"
 
-#: src/plugins/notification/notification_prefs.c:1568
+#: src/plugins/notification/notification_prefs.c:1563
 msgid "Enable Trayicon"
 msgstr "Povolit ikonu panelu"
 
-#: src/plugins/notification/notification_prefs.c:1584
+#: src/plugins/notification/notification_prefs.c:1579
 msgid "Hide at start-up"
 msgstr "Skrýt po spuštění"
 
-#: src/plugins/notification/notification_prefs.c:1592
+#: src/plugins/notification/notification_prefs.c:1587
 msgid "Close to tray"
 msgstr "Skrýt místo zavření"
 
-#: src/plugins/notification/notification_prefs.c:1600
+#: src/plugins/notification/notification_prefs.c:1595
 msgid "Hide when iconified"
 msgstr "Skrýt při ikonifikování"
 
@@ -11507,36 +11940,36 @@ msgstr "Skrýt při ikonifikování"
 #. for that, go for something along the lines of "passive popup"
 #. instead.See also
 #. http://en.wikipedia.org/wiki/Toast_(computing)
-#: src/plugins/notification/notification_prefs.c:1637
+#: src/plugins/notification/notification_prefs.c:1632
 msgid "Passive toaster popup"
 msgstr "Pasivní toaster vyskakovací okno"
 
-#: src/plugins/notification/notification_prefs.c:1801
+#: src/plugins/notification/notification_prefs.c:1796
 msgid "Add to Indicator Applet"
 msgstr "Přidat do informačního appletu"
 
-#: src/plugins/notification/notification_prefs.c:1815
+#: src/plugins/notification/notification_prefs.c:1810
 msgid "Hide mainwindow when minimized"
 msgstr "Skrýt při minimalizování"
 
-#: src/plugins/notification/notification_prefs.c:1868
+#: src/plugins/notification/notification_prefs.c:1863
 msgid "Enable global hotkeys"
 msgstr "Povolit globální klávesové zkratky"
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1877
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr "Příklady pro klávesové zkratky obsahují <b>%s</b> a <b>%s</b>"
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1877
 msgid "<control><shift>F11"
 msgstr "<control><shift>F11"
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1877
 msgid "<alt>N"
 msgstr "<alt>N"
 
-#: src/plugins/notification/notification_prefs.c:1893
+#: src/plugins/notification/notification_prefs.c:1889
 msgid "Toggle minimize"
 msgstr "Přepnout minimalizaci"
 
@@ -11577,27 +12010,27 @@ msgstr "Zobrazit trayicon upozorňování"
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nové: %d, Nepřečtené: %d, Celkem: %d"
 
-#: src/plugins/notification/notification_trayicon.c:857
+#: src/plugins/notification/notification_trayicon.c:856
 msgid "New mail message"
 msgstr "Nová mailová zpráva"
 
-#: src/plugins/notification/notification_trayicon.c:859
+#: src/plugins/notification/notification_trayicon.c:858
 msgid "New news post"
 msgstr "Nová News zpráva"
 
-#: src/plugins/notification/notification_trayicon.c:861
+#: src/plugins/notification/notification_trayicon.c:860
 msgid "New calendar message"
 msgstr "Nová kalendářová zpráva"
 
-#: src/plugins/notification/notification_trayicon.c:863
+#: src/plugins/notification/notification_trayicon.c:862
 msgid "New article in RSS feed"
 msgstr "Nový článek v RSS kanálu"
 
-#: src/plugins/notification/notification_trayicon.c:866
+#: src/plugins/notification/notification_trayicon.c:865
 msgid "New messages arrived"
 msgstr "Přišly nové zpávy"
 
-#: src/plugins/notification/notification_trayicon.c:922
+#: src/plugins/notification/notification_trayicon.c:921
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
@@ -11605,7 +12038,7 @@ msgstr[0] "Přišla %d nová zpráva"
 msgstr[1] "Přišly %d nové zprávy"
 msgstr[2] "Přišlo %d nových zpráv"
 
-#: src/plugins/notification/notification_trayicon.c:933
+#: src/plugins/notification/notification_trayicon.c:932
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
@@ -11613,7 +12046,7 @@ msgstr[0] "Přišla %d nová News zpráva"
 msgstr[1] "Přišly %d nové News zprávy"
 msgstr[2] "Přišlo %d nových News zpráv"
 
-#: src/plugins/notification/notification_trayicon.c:955
+#: src/plugins/notification/notification_trayicon.c:954
 #, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
@@ -11621,128 +12054,128 @@ msgstr[0] "Přišel %d nový článek v RSS kanálu"
 msgstr[1] "Přišli %d nové články v RSS kanálu"
 msgstr[2] "Přišlo %d nových článků v RSS kanálu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Title:"
 msgstr "Titul:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:710
 msgid "Author:"
 msgstr "Autor:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:708
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Creator:"
 msgstr "Tvůrce:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:713
 msgid "Producer:"
 msgstr "Produkováno:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:712
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Created:"
 msgstr "Vytvořeno:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:720
 msgid "Modified:"
 msgstr "Upraveno:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:719
+#: src/plugins/pdf_viewer/poppler_viewer.c:723
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:721
-#: src/plugins/pdf_viewer/poppler_viewer.c:724
+#: src/plugins/pdf_viewer/poppler_viewer.c:725
+#: src/plugins/pdf_viewer/poppler_viewer.c:728
 msgid "Optimized:"
 msgstr "Optimalizováno:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1228
 msgid "PDF properties"
 msgstr "Vlastnosti PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1377
 msgid "Enter password"
 msgstr "Zadejte heslo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1367
+#: src/plugins/pdf_viewer/poppler_viewer.c:1378
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "Tento dokument je uzamčen a vyžaduje heslo před jeho otevřením."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "%s Document"
 msgstr "%s dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1399
 #, c-format
 msgid "of %d"
 msgstr "z %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1404
+#: src/plugins/pdf_viewer/poppler_viewer.c:1415
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Renderovaní PDF selhalo z neznámého důvodu."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1776
-#: src/plugins/pdf_viewer/poppler_viewer.c:1993
+#: src/plugins/pdf_viewer/poppler_viewer.c:1787
+#: src/plugins/pdf_viewer/poppler_viewer.c:1996
 msgid "Document Index"
 msgstr "Index dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1961
 msgid "First Page"
 msgstr "První stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1964
 msgid "Previous Page"
 msgstr "Předchozí stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1967
 msgid "Next Page"
 msgstr "Následující stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1970
 msgid "Last Page"
 msgstr "Poslední stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1973
 msgid "Zoom In"
 msgstr "Zvětšit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom Out"
 msgstr "Zmenšit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Fit Page"
 msgstr "Přizpůsobit stránce"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Fit Page Width"
 msgstr "Přizpůsobit šířce stránky"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Rotate Left"
 msgstr "Otočit vlevo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1987
 msgid "Rotate Right"
 msgstr "Otočit vpravo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1990
 msgid "Print Document"
 msgstr "Vytisknout dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1993
 msgid "Document Info"
 msgstr "Informace o dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:1998
 msgid "Page Number"
 msgstr "Číslo stránky"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Zoom Factor"
 msgstr "Faktor zobrazení"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2108
+#: src/plugins/pdf_viewer/poppler_viewer.c:2111
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11755,13 +12188,13 @@ msgstr ""
 "\n"
 "Jakákoliv zpětná vazba je vítána: 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:2117
+#: src/plugins/pdf_viewer/poppler_viewer.c:2125
+#: src/plugins/pdf_viewer/poppler_viewer.c:2145
 msgid "PDF Viewer"
 msgstr "Prohlížeč PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2118
+#: src/plugins/pdf_viewer/poppler_viewer.c:2121
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11788,43 +12221,49 @@ msgstr "Selhala registrace PGP kompletace adres"
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: src/plugins/pgpcore/passphrase.c:249
+#: src/plugins/pgpcore/passphrase.c:248
 msgid "[no user id]"
 msgstr "[bez id uživatele]"
 
-#: src/plugins/pgpcore/passphrase.c:261
+#: src/plugins/pgpcore/passphrase.c:260
 msgid "Please enter the passphrase for the new key:"
 msgstr "Prosím vložte heslo pro nový klíč:"
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "Hesla se neshodují.\n"
 
-#: src/plugins/pgpcore/passphrase.c:268
+#: src/plugins/pgpcore/passphrase.c:267
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "Prosím vložte znovu heslo pro nový klíč:"
 
-#: src/plugins/pgpcore/passphrase.c:273
+#: src/plugins/pgpcore/passphrase.c:272
 msgid "Please enter the passphrase for:"
 msgstr "Prosím vložte heslo pro:"
 
-#: src/plugins/pgpcore/passphrase.c:276
+#: src/plugins/pgpcore/passphrase.c:275
 msgid "Bad passphrase.\n"
 msgstr "Špatné heslo.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Import klíče"
 
-#: 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 and import it?"
 msgstr ""
-"Tento klíč není ve vašem seznamu klíčů. Chcete ho zkusit importovat ze "
-"serveru klíčů?"
+"Tento klíč není ve vašem seznamu klíčů. Má ho Claws Mail zkusit importovat?"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "ze serveru klíčů"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr "z Web Key adresáře"
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
@@ -11832,15 +12271,15 @@ msgstr ""
 "\n"
 "  ID klíče "
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid "   This key is not in your keyring.\n"
 msgstr "   Klíč není ve vašem seznamu klíčů.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   Mělo by být možné ho importovat "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -11848,17 +12287,17 @@ msgstr ""
 "v režimu online,\n"
 "   nebo "
 
-#: 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 ""
-"příkazem: \n"
+"s jedním z následujících příkazů: \n"
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -11866,29 +12305,27 @@ msgstr ""
 "\n"
 "  Import klíče 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 "   Klíč byl importován do vašeho seznamu klíčů.\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 "   Klíč se nepodařilo importovat do vašeho seznamu klíčů.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr " Servery s klíči jsou někdy pomalé.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Můžete zkusit ruční import příkazem:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
+msgstr "   Můžete zkusit ruční import příkazem:"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr "nebo"
+
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   Tento klíč je ve vašem seznamu klíčů.\n"
 
@@ -11947,8 +12384,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:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1827
+#: src/prefs_account.c:2126 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minut(y)"
 
@@ -12557,36 +12994,36 @@ msgstr ""
 "\n"
 "GPGME (c) 2001 Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/python/python_plugin.c:379
-#: src/plugins/python/python_plugin.c:523
+#: src/plugins/python/python_plugin.c:380
+#: src/plugins/python/python_plugin.c:524
 msgid "Python scripts"
 msgstr "Skripty v Pythonu"
 
-#: src/plugins/python/python_plugin.c:518
+#: src/plugins/python/python_plugin.c:519
 msgid "Show Python console..."
 msgstr "Zobrazit konzoli Pythonu..."
 
-#: src/plugins/python/python_plugin.c:524
+#: src/plugins/python/python_plugin.c:525
 #: src/plugins/rssyl/rssyl_feed_props.c:471
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:2707
-#: src/prefs_account.c:2735 src/prefs_account.c:3172 src/wizard.c:1206
-#: src/wizard.c:1626
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2986
+#: src/prefs_account.c:3014 src/prefs_account.c:3442 src/wizard.c:1212
+#: src/wizard.c:1642
 msgid "Browse"
 msgstr "Procházet"
 
-#: src/plugins/python/python_plugin.c:672
-#: src/plugins/python/python_plugin.c:762
+#: src/plugins/python/python_plugin.c:673
+#: src/plugins/python/python_plugin.c:760
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:681
+#: src/plugins/python/python_plugin.c:682
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Selhala registrace \"compose create hook\" v zásuvném modulu Python"
 
-#: src/plugins/python/python_plugin.c:767
+#: src/plugins/python/python_plugin.c:765
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12672,7 +13109,7 @@ msgstr ""
 "\n"
 "Zpětná vazba na <berndth at gmx.de> je vítána."
 
-#: src/plugins/python/python_plugin.c:818
+#: src/plugins/python/python_plugin.c:816
 msgid "Python integration"
 msgstr "Integrace Pythonu"
 
@@ -12892,8 +13329,8 @@ msgid "Fetch comments on posts aged less than"
 msgstr "Stahovat komentáře staré méně než"
 
 #: 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:612 src/plugins/vcalendar/month-view.c:710
+#: src/prefs_account.c:1653 src/prefs_folder_item.c:572 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dnech"
 
@@ -12918,10 +13355,6 @@ msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Vložte 0, pokud nechcete aktualizovat automaticky"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:517
-msgid "_OK"
-msgstr "_OK"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:525
 msgid "Set feed properties"
 msgstr "Vlastnosti kanálu"
 
@@ -13023,13 +13456,13 @@ msgstr "Odebírat nový kanál?"
 msgid "Feed folder:"
 msgstr "Složka kanálu:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
 msgstr "Místo použití oficiálního názvu můžete použít jiné pro složku kanálu."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
 msgid "_Edit feed properties after subscribing"
 msgstr "_Upravit vlastnosti kanálu po přihlášení k odběru"
 
@@ -13217,16 +13650,16 @@ msgstr "Oznamování spamu"
 msgid "Enabled"
 msgstr "Povolen"
 
-#: src/plugins/spam_report/spam_report_prefs.c:169
+#: src/plugins/spam_report/spam_report_prefs.c:167
 msgid "Forward to:"
 msgstr "Přeposlat:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
+#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1583
 msgid "Password:"
 msgstr "Heslo:"
 
 #: src/plugins/spamassassin/spamassassin.c:78
-#: src/plugins/spamassassin/spamassassin_gtk.c:671
+#: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -13297,68 +13730,68 @@ msgstr ""
 "\n"
 "Nastavení naleznete v '/Nastavení/Předvolby/Zásuvné moduly/SpamAssassin'"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Localhost"
 msgstr "Localhost"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:95
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:94
+#: src/plugins/spamassassin/spamassassin_gtk.c:97
 msgid "Unix Socket"
 msgstr "Unix Socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:122
+#: src/plugins/spamassassin/spamassassin_gtk.c:125
 msgid "Select folder to save spam to"
 msgstr "Vybrat složku pro uložení spamu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:274
+#: src/plugins/spamassassin/spamassassin_gtk.c:277
 msgid "Enable SpamAssassin plugin"
 msgstr "Povolit modul SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:278
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Transport"
 msgstr "Přenos"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:286
+#: src/plugins/spamassassin/spamassassin_gtk.c:289
 msgid "Type of transport"
 msgstr "Typ přenosu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:307
+#: src/plugins/spamassassin/spamassassin_gtk.c:306
 msgid "User"
 msgstr "Uživatel"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:320
+#: src/plugins/spamassassin/spamassassin_gtk.c:317
 msgid "User to use with spamd server"
 msgstr ""
 "Uživatelské jméno, pod kterým se bude komunikovat se serverem SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:322
+#: src/plugins/spamassassin/spamassassin_gtk.c:319
 msgid "spamd"
 msgstr "smapd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:340
+#: src/plugins/spamassassin/spamassassin_gtk.c:335
 msgid "Hostname or IP address of spamd server"
 msgstr "Název nebo IP adresa serveru"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:346
 msgid "Port of spamd server"
 msgstr "Port serveru"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:352
 msgid "Path of Unix socket"
 msgstr "Cesta k Unix socketu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/spamassassin/spamassassin_gtk.c:359
 msgid "Use compression"
 msgstr "Použít kompresi"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:368
+#: src/plugins/spamassassin/spamassassin_gtk.c:363
 msgid "Enable compression if spamd uses it, otherwise disable it."
 msgstr "Povolit kompresi, jestliže ji spamd používá, jinak zakázat."
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:403
+#: src/plugins/spamassassin/spamassassin_gtk.c:398
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13428,11 +13861,11 @@ msgstr "_Vytvořit schůzku..."
 msgid "_Go to today"
 msgstr "_Jít na den"
 
-#: src/plugins/vcalendar/day-view.c:594 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:591 src/plugins/vcalendar/month-view.c:689
 msgid "Start"
 msgstr "Začátek"
 
-#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:604 src/plugins/vcalendar/month-view.c:702
 msgid "Show"
 msgstr "Zobrazit"
 
@@ -13512,15 +13945,15 @@ msgstr "Listopad"
 msgid "December"
 msgstr "Prosinec"
 
-#: src/plugins/vcalendar/month-view.c:798
+#: src/plugins/vcalendar/month-view.c:790
 msgid "Week number"
 msgstr "Číslo týdne"
 
-#: src/plugins/vcalendar/month-view.c:889
+#: src/plugins/vcalendar/month-view.c:875
 msgid "Previous month"
 msgstr "Předchozí měsíc"
 
-#: src/plugins/vcalendar/month-view.c:909
+#: src/plugins/vcalendar/month-view.c:894
 msgid "Next month"
 msgstr "Další měsíc"
 
@@ -13557,75 +13990,75 @@ msgstr ""
 msgid "Calendar"
 msgstr "Kalendář"
 
-#: src/plugins/vcalendar/vcalendar.c:100
+#: src/plugins/vcalendar/vcalendar.c:97
 msgid "Create meeting from message..."
 msgstr "Vytvořit schůzku ze zprávy..."
 
-#: src/plugins/vcalendar/vcalendar.c:120
+#: src/plugins/vcalendar/vcalendar.c:117
 #, c-format
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "Hodláte vytvořit %d schůzek, po jedné. Chcete pokračovat?"
 
-#: src/plugins/vcalendar/vcalendar.c:140
+#: src/plugins/vcalendar/vcalendar.c:137
 msgid "Creating meeting..."
 msgstr "Vytváření schůzky..."
 
-#: src/plugins/vcalendar/vcalendar.c:159
+#: src/plugins/vcalendar/vcalendar.c:156
 msgid "no subject"
 msgstr "žádný předmět"
 
-#: src/plugins/vcalendar/vcalendar.c:385
+#: src/plugins/vcalendar/vcalendar.c:382
 msgid "Accept"
 msgstr "Přijmout"
 
-#: src/plugins/vcalendar/vcalendar.c:386
+#: src/plugins/vcalendar/vcalendar.c:383
 msgid "Tentatively accept"
 msgstr "Předběžně přijmout"
 
-#: src/plugins/vcalendar/vcalendar.c:387
+#: src/plugins/vcalendar/vcalendar.c:384
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:473
 msgid "You have a Todo item."
 msgstr "Máte Todo položku."
 
-#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
-#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
-#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:716
+#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:715
 msgid "Details follow:"
 msgstr "Detaily:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:480
 msgid "You have created a meeting."
 msgstr "Vytvořil jste schůzku."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:485
 msgid "You have been invited to a meeting."
 msgstr "Byl jste pozván na schůzku."
 
-#: src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:493
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr "Schůzka na kterou jste byl pozván, byla zrušena."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:502
 msgid "You have been forwarded an appointment."
 msgstr "Byla předána dohoda."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:556
 msgid "(this event recurs)"
 msgstr "(událost se opakuje)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:563
 msgid "(this event is part of a recurring event)"
 msgstr "(událost součástí opakující se události)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:714
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Doručena odpověď na neznámý návrh schůzky."
 
-#: 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"
@@ -13634,35 +14067,35 @@ msgstr ""
 "Obdržena odpověď na návrh schůzky.\n"
 "%s má %s pozvání s detaily:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:797
 msgid "Error - could not get the calendar MIME part."
 msgstr "Chyba - nemohu získat kalendářovou MIME část."
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:804
 msgid "Error - no calendar part found."
 msgstr "Chyba - kalendářová část nebyla nalezena."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:818
 msgid "Error - Unknown calendar component type."
 msgstr "Chyba - Neznámý typ komponenty kalendáře."
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:950
 msgid "Send a notification to the attendees"
 msgstr "Poslat upozornění účastníkům"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:959
 msgid "Cancel meeting"
 msgstr "Zrušit schůzku"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Jste si jistý, že chcete zrušit tuto schůzku?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1055
 msgid "No account found"
 msgstr "Účet nenalezen"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13670,68 +14103,68 @@ msgstr ""
 "Nemáte účet odpovídající jakémukoliv účastníkovi.\n"
 "Chcete přesto odpovědět?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "Reply anyway"
 msgstr "Přesto odpovědět"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Answer"
 msgstr "Odpověď"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Edit meeting..."
 msgstr "Upravit schůzku..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Cancel meeting..."
 msgstr "Zrušit schůzku..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1194
 msgid "Launch website"
 msgstr "Spustit webovou stránku"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1198
 msgid "You are already busy at this time."
 msgstr "Již jste zaneprázdněn v tuto dobu."
 
-#: 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:1626
 msgid "Event:"
 msgstr "Událost:"
 
-#: 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:1604
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: 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:1607
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "Location:"
 msgstr "Místo:"
 
-#: 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:1605
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1616
 msgid "Summary:"
 msgstr "Shrnutí:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Starting:"
 msgstr "Začátek:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Ending:"
 msgstr "Konec:"
 
-#: 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:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1619
 msgid "Attendees:"
 msgstr "Účastníci:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1246
 msgid "Action:"
 msgstr "Akce:"
 
@@ -13945,23 +14378,23 @@ msgstr "Odmítnuté: "
 msgid "Tentatively Accepted: "
 msgstr "Předběžně přijaté: "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:320
 msgid "Individual"
 msgstr "Inviduální"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:322
 msgid "Resource"
 msgstr "Zdroje"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
 msgid "Room"
 msgstr "Místnost"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:336
 msgid "Add..."
 msgstr "Přidat..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
@@ -13969,62 +14402,62 @@ msgstr ""
 "Následující osoba(y) jsou zaneprázdněny v době plánované schůzky:\n"
 "- "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:830
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:916
 msgid "You"
 msgstr "Vy"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:742
 msgid "You are busy at the time of your planned meeting"
 msgstr "Jste zaneprázdněn v čase plánované schůzky"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:744
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s je zaneprázdněn v čase plánované schůzky"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:746
 #, c-format
 msgid "%d hour sooner"
 msgstr "%d hodina dříve"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:748
 #, c-format
 msgid "%d hours sooner"
 msgstr "%d hodin dříve"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:750
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d hodin a %d minut dříve"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:752
 #, c-format
 msgid "%d minutes sooner"
 msgstr "%d minut dříve"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid "%d hour later"
 msgstr "%d hodinu později"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid "%d hours later"
 msgstr "%d hodin později"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d hodin a %d minut později"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:763
 #, c-format
 msgid "%d minutes later"
 msgstr "%d minut později"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:769
 #, c-format
 msgid ""
 "\n"
@@ -14035,7 +14468,7 @@ msgstr ""
 "\n"
 "Každý by měl dostupný %s nebo %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:771
 #, c-format
 msgid ""
 "\n"
@@ -14046,7 +14479,7 @@ msgstr ""
 "\n"
 "Každý by měl být dostupný %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 msgid ""
 "\n"
 "\n"
@@ -14057,73 +14490,73 @@ msgstr ""
 "\n"
 "Není možné mít schůzku s každým v předchozích nebo dalších 6 hodinách."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:778
 #, c-format
 msgid "would be available %s or %s"
 msgstr "by měl být dostupný %s nebo %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
 #, c-format
 msgid "would be available %s"
 msgstr "by měl být dostupný %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:782
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:843
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:913
 msgid "not available"
 msgstr "nedostupné"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ", ale mohly by být dostupné %s nebo %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
 #, c-format
 msgid ", but would be available %s."
 msgstr ", ale mohla by být dostupná %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ", nebyla dostupná v předchozích nebo následujících 6 hodinách."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:846
 msgid "available"
 msgstr "dostupné"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:848
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1101
 msgid "Free/busy retrieval failed"
 msgstr "Nalezení volný/zaneprázdněn selhalo"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available"
 msgstr "Ne každý je dostupný"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:931
 msgid "Send anyway"
 msgstr "Přesto poslat"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:942
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "Ne každý je dostupný. Další viz. tip..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1083
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Stahování plánování pro %s..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1110
 msgid "Available"
 msgstr "Dostupné"
 
-#: 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:1123
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1130
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1138
 msgid "Everyone is available."
 msgstr "Každý je dostupný."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1139
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14131,7 +14564,7 @@ msgstr ""
 "Všichni vypadají dostupní, ale některé volný/zaneprázdněn zprávy nebyly "
 "doručeny."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1311
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14139,42 +14572,42 @@ msgstr ""
 "Nemohu poslat pozvání ke schůzce.\n"
 "Zkontrolujte příjemce."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1389
 msgid "Save & Send"
 msgstr "Uložit & Poslat"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1390
 msgid "Check availability"
 msgstr "Zkontrolovat dostupnost"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1484
 msgid "Starts at:"
 msgstr "Začíná v:"
 
-#: 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:1490
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1514 src/prefs_matcher.c:768
 msgid "on:"
 msgstr "na:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1508
 msgid "Ends at:"
 msgstr "Končí v:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1549
 msgid "New meeting"
 msgstr "Nová schůzka"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1551
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Upravil schůzku"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
 msgid "Time:"
 msgstr "Čas:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -14182,7 +14615,7 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1756
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -14190,12 +14623,12 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1767
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Aktuální událost: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1768
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14212,7 +14645,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1785
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
@@ -14220,32 +14653,32 @@ msgstr[0] "Připomenout za %d minutu"
 msgstr[1] "Připomenout za %d minuty"
 msgstr[2] "Připomenout za %d minut"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 msgid "Empty calendar"
 msgstr "Prázdný kalendář"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1912
 msgid "There is nothing to export."
 msgstr "Nic k exportu."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1952
 msgid "Could not export the calendar."
 msgstr "Nemohu exportovat kalendář."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1969
 msgid "Export calendar to ICS"
 msgstr "Export kalendáře do ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1992
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Nemohu exportovat kalendář do '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2108
 msgid "Could not export the freebusy info."
 msgstr "Nemohu exportovat informaci volný/zaneprázdněn."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2140
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Nemohu exportovat volný/zaneprázdněn do '%s'\n"
@@ -14349,95 +14782,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:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "Chyba protokolu POP\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neplatná UIDL odpověď: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Vymazávám starou zprávu %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, 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:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "mailbox je zamknut\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "Časový limit pro relaci vypršel\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "příkaz není podporován\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "nastala chyba v POP relaci\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "Příkaz TOP není podporován\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2914
 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:396 src/prefs_account.c:1739 src/prefs_account.c:2929
+#: src/wizard.c:1509
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:397
 msgid "News (NNTP)"
 msgstr "Diskusní skupiny (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:398 src/wizard.c:1510
 msgid "Local mbox file"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:399
 msgid "None (SMTP only)"
 msgstr "Žádný (pouze odesílání SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1202
 msgid "Name of account"
 msgstr "Název účtu"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1211
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1219
 msgid "Personal information"
 msgstr "Osobní informace"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1228
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1233
 msgid "Mail address"
 msgstr "Poštovní adresa"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1294 src/wizard.c:1532
 msgid "Auto-configure"
 msgstr "Automatická konfigurace"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1296 src/wizard.c:1533
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1313
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14445,77 +14878,81 @@ msgstr ""
 "Varování: tato verze Claws Mail byla zkompilována\n"
 "bez podpory IMAP a News."
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1342
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1348
 msgid "Authenticate on connect"
 msgstr "Autentizace při připojení"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1398
 msgid "News server"
 msgstr "Server diskuzních skupin"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1403
 msgid "Server for receiving"
 msgstr "Server pro příjem"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1408
 msgid "Local mailbox"
 msgstr "Lokální mailbox"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1413
 msgid "SMTP server (send)"
 msgstr "SMTP server (odesílání)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1419
 msgid "Use mail command rather than SMTP server"
 msgstr "Použít místo SMTP serveru příkaz pro odeslání"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1427
 msgid "command to send mails"
 msgstr "příkaz pro odeslání pošty"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1492
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1571
 msgid "Local"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1577 src/prefs_account.c:1696
 msgid "Default Inbox"
 msgstr "Výchozí inbox"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 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:1561
-msgid "Use secure authentication (APOP)"
-msgstr "Použít zabezpečenou autentizaci (APOP)"
+#: src/prefs_account.c:1599
+msgid "Authenticate before POP connection"
+msgstr "Autentizace před POP připojením"
+
+#: src/prefs_account.c:1624 src/prefs_account.c:2224
+msgid "Select"
+msgstr "Vybrat"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1632
 msgid "Remove messages on server when received"
 msgstr "Odstranit zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1643
 msgid "Remove after"
 msgstr "Odstranit po"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1650 src/prefs_account.c:1660
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dnů a 0 hodin: odstranit ihned"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1673
 msgid "Receive size limit"
 msgstr "Limit velikosti pro příjem"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1676
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14523,94 +14960,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:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1715 src/prefs_account.c:2944
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1722
 msgid "Maximum number of articles to download"
 msgstr "Maximální počet příspěvků pro stažení"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1732
 msgid "unlimited if 0 is specified"
 msgstr "(pokud je 0, je to neomezený počet)"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1757
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1771
 msgid "IMAP server directory"
 msgstr "Adresář pro IMAP server"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1775
 msgid "(usually empty)"
 msgstr "(obvykle prázdné)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1789
 msgid "Show subscribed folders only"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1796
 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:1730
+#: src/prefs_account.c:1798
 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:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1805 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatický příjem pošty"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1808
 msgid "Use global settings"
 msgstr "Použít globální nastavení"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1814 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Přijímat poštu každých"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1853
 msgid "Filter messages on receiving"
 msgstr "Při načítání zpracovat zprávy filtrem pro příjem"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1869
 msgid "Allow filtering using plugins on receiving"
 msgstr "Při načítání filtrovat zprávy zásuvnými moduly"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1873
 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: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:1963 src/prefs_customheader.c:208
+#: src/prefs_matcher.c:633 src/prefs_matcher.c:2009 src/prefs_matcher.c:2037
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:1965
 msgid "Generate Message-ID"
 msgstr "Generovat číslo zprávy"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:1968
 msgid "Send account mail address in Message-ID"
 msgstr "Poslat mailovou adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1971
 msgid "Add user agent header"
 msgstr "Přidat záhlaví user agent"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:1978
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:1993
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2092
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14618,171 +15055,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:2033
+#: src/prefs_account.c:2103
 msgid "Authenticate with POP before sending"
 msgstr "Autentizace POP před odesláním"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2118
 msgid "POP authentication timeout"
 msgstr "Časový limit pro POP autentizaci"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2198
+msgid "Authorization"
+msgstr "Autentizace"
+
+#: src/prefs_account.c:2215
+msgid "Select OAuth2 Email Service Provider"
+msgstr "Vyberte poskytovatele OAuth2 email služby"
+
+#: src/prefs_account.c:2255
+msgid "Client ID"
+msgstr "ID klienta"
+
+#: src/prefs_account.c:2266
+msgid "Client secret"
+msgstr "Klientské certifikát"
+
+#: src/prefs_account.c:2291
+msgid "Obtain authorization code"
+msgstr "Získat autorizační kód"
+
+#: src/prefs_account.c:2295
+msgid "Open default browser with request"
+msgstr "Otevřít výchozí prohlížeč s požadavkem"
+
+#: src/prefs_account.c:2302
+msgid "Copy link"
+msgstr "Kopírovat odkaz"
+
+#: src/prefs_account.c:2315
+msgid "Authorization code"
+msgstr "Autorizační kód"
+
+#: src/prefs_account.c:2323
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr "Vložit kompletní URL z prohlížeče nebo daný autentizační token"
+
+#: src/prefs_account.c:2330
+msgid "Complete authorization"
+msgstr "Dokončit autorizaci"
+
+#: src/prefs_account.c:2334
+msgid "Authorize"
+msgstr "Autorizovat"
+
+#: src/prefs_account.c:2420 src/prefs_account.c:2466
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2423
 msgid "Automatically insert signature"
 msgstr "Automaticky vložit podpis"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2428
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2453
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2486
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2535
 msgid "Spell check dictionaries"
 msgstr "Slovníky pro kontrolu pravopisu"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2545 src/prefs_folder_item.c:1101
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Výchozí slovník"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
-#: src/prefs_spelling.c:174
+#: src/prefs_account.c:2557 src/prefs_folder_item.c:1132
+#: src/prefs_spelling.c:171
 msgid "Default alternate dictionary"
 msgstr "Výchozí alternativní slovník"
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
-#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
+#: src/prefs_account.c:2642 src/prefs_account.c:4108
+#: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1516
+#: src/prefs_folder_item.c:1891 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:324 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2657 src/prefs_folder_item.c:1544 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: 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:2672 src/prefs_filtering_action.c:183
+#: src/prefs_folder_item.c:1572 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "Předat"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2719
 msgid "Default privacy system"
 msgstr "Výchozí systém zabezpečení"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2748 src/prefs_folder_item.c:1168
 msgid "Always sign messages"
 msgstr "Zprávy vždy digitálně podepsat"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2750 src/prefs_folder_item.c:1198
 msgid "Always encrypt messages"
 msgstr "Zprávy vždy šifrovat"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2752
 msgid "Always sign messages when replying to a signed message"
 msgstr "Odpověď na podepsanou zprávu vždy podepsat"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2755
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Odpověď na šifrovanou zprávu vždy šifrovat"
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2758
 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:2481
+#: src/prefs_account.c:2760
 msgid "Save sent encrypted messages as clear text"
 msgstr "Odeslané šifrované zprávy uložit jako čistý text"
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2918 src/prefs_account.c:2933 src/prefs_account.c:2947
 msgid "Don't use SSL/TLS"
 msgstr "Nepoužívat SSL/TLS"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: src/prefs_account.c:2921 src/prefs_account.c:2936 src/prefs_account.c:2956
+#: src/prefs_account.c:2967
 msgid "Use SSL/TLS"
 msgstr "Použít SSL/TLS"
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2924 src/prefs_account.c:2939 src/prefs_account.c:2970
 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:2681
+#: src/prefs_account.c:2960
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:2964
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívat SSL_TLS (pokud je to ale nutné, použít STARTTLS)"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:2975
 msgid "Client certificates"
 msgstr "Klientské certifikáty"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:2983
 msgid "Certificate for receiving"
 msgstr "Certifikát pro příjem"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:2988 src/prefs_account.c:2990 src/prefs_account.c:3016
+#: src/prefs_account.c:3018
 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:2732
+#: src/prefs_account.c:3011
 msgid "Certificate for sending"
 msgstr "Certifikát pro odeslání"
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3051
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Automaticky přijímat platné certifikáty SSL/TLS"
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3054
 msgid "Use non-blocking SSL/TLS"
 msgstr "Použít neblokující SSL/TLS"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3066
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Vypněte, pokud máte problémy se SSL/TLS připojením"
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3158 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Použít proxy server"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3167
 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:2890
+#: src/prefs_account.c:3169
 msgid "Use global proxy server settings"
 msgstr "Použít globální nastavení proxy"
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3206 src/prefs_proxy.c:115 src/wizard.c:1118
 msgid "Use authentication"
 msgstr "Použít autentizaci"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3211 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3240
 msgid "Use proxy server for sending"
 msgstr "Použít proxy server pro odeslání"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3242
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14791,27 +15272,27 @@ msgstr ""
 "nakonfigurovanému odchozímu serveru s vynecháním libovolného "
 "nakonfigurovaného proxy serveru."
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3352
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3359
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3366
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3373
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3379
 msgid "Domain name"
 msgstr "Název domény"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3382
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14819,238 +15300,236 @@ msgstr ""
 "Jméno domény bude použito pro generované Message-ID a při připojení SMTP "
 "serverů."
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3396
 msgid "Use command to communicate with server"
 msgstr "Příkaz pro komunikaci se serverem"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3405
 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:3185
+#: src/prefs_account.c:3454
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3456
 msgid "Put queued messages in"
 msgstr "Ukládat odložené zprávy do"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3458
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3460
 msgid "Put deleted messages in"
 msgstr "Ukládat odstraněné zprávy do"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3517
 msgid "Account name is not entered."
 msgstr "Nebylo zadáno jméno účtu."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3521
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána poštovní adresa."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3529
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán SMTP server."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3534
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské číslo."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3539
 msgid "POP server is not entered."
 msgstr "Nebyl zadán POP server."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3559
 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:3296
+#: src/prefs_account.c:3565
 msgid "IMAP server is not entered."
 msgstr "Nebyl zadán IMAP server."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3570
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán NNTP server."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3576
 msgid "local mailbox filename is not entered."
 msgstr "nebyl zadán název lokálního mailbox souboru."
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3582
 msgid "mail command is not entered."
 msgstr "nebyl zadán příkaz pro odeslání."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3592
 msgid "User ID cannot contain a newline character."
 msgstr "User ID nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3597
 msgid "Password cannot contain a newline character."
 msgstr "Heslo nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3628
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP user ID nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3633
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP heslo nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3725
 msgid "domain is not specified."
 msgstr "doména není uvedena."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3730
 msgid "sent folder is not selected."
 msgstr "odesílaná není vybrána."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3735
 msgid "queue folder is not selected."
 msgstr "fronta není vybrána."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3740
 msgid "draft folder is not selected."
 msgstr "koncepty nejsou vybrány."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3745
 msgid "trash folder is not selected."
 msgstr "koš není vybrán."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4054
 msgid "Receive"
 msgstr "Přijmout"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4090
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4126 src/prefs_folder_item.c:1907 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4144
 msgid "Privacy"
 msgstr "Zabezpečení"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4274
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4629
 msgid "Preferences for new account"
 msgstr "Nastavení pro nový účet"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4631
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - nastavení účtu"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4743 src/wizard.c:1399
 msgid "Failed (wrong address)"
 msgstr "Selhalo (špatná adresa)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4828
 msgid "Select signature file"
 msgstr "Soubor s podpisem"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4846 src/prefs_account.c:4863 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Vybrat soubor s certifikátem"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:4959
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5279
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (modul nebyl načten)"
 
-#: src/prefs_actions.c:225
+#: src/prefs_actions.c:224
 msgid "Actions configuration"
 msgstr "Nastavení akcí"
 
-#: src/prefs_actions.c:252
+#: src/prefs_actions.c:251
 msgid "Menu name"
 msgstr "Název nabídky"
 
-#: src/prefs_actions.c:285
+#: src/prefs_actions.c:280
 msgid "Shell command"
 msgstr "Příkaz"
 
-#: src/prefs_actions.c:295
+#: src/prefs_actions.c:290
 msgid "Filter action"
 msgstr "Filtrovací akce"
 
-#: src/prefs_actions.c:301
+#: src/prefs_actions.c:296
 msgid "Edit filter action"
 msgstr "Upravit filtrovací akci"
 
-#: src/prefs_actions.c:329
+#: src/prefs_actions.c:324
 msgid "Append the new action above to the list"
 msgstr "Přidat novou akci nahoře do seznamu"
 
-#: src/prefs_actions.c:337
+#: src/prefs_actions.c:332
 msgid "Replace the selected action in list with the action above"
 msgstr "Nahradit vybranou akci v seznam tou nahoře"
 
-#: src/prefs_actions.c:339 src/prefs_filtering_action.c:589
-#: src/prefs_filtering.c:487 src/prefs_matcher.c:804 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1024
-msgid "D_elete"
-msgstr "_Smazat"
-
-#: src/prefs_actions.c:347
+#: src/prefs_actions.c:340
 msgid "Delete the selected action from the list"
 msgstr "Odstranit vybranou akci ze seznamu"
 
-#: src/prefs_actions.c:357 src/prefs_filtering.c:504 src/prefs_template.c:338
+#: src/prefs_actions.c:348 src/prefs_filtering.c:485 src/prefs_template.c:330
 msgid "Clear all the input fields in the dialog"
 msgstr "Vyčistit všechna vstupní pole v dialogu"
 
-#: src/prefs_actions.c:365
+#: src/prefs_actions.c:356
 msgid "Show information on configuring actions"
 msgstr "Zobrazit informace o konfiguračních akcí"
 
-#: src/prefs_actions.c:396
+#: src/prefs_actions.c:387
 msgid "Move the selected action up"
 msgstr "Přesunout vybranou akci nahoru"
 
-#: src/prefs_actions.c:404
+#: src/prefs_actions.c:395
 msgid "Move selected action down"
 msgstr "Přesunout vybranou akci dolů"
 
-#: src/prefs_actions.c:537 src/prefs_filtering_action.c:678
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:841
-#: src/prefs_filtering.c:842 src/prefs_filtering.c:952 src/prefs_matcher.c:922
-#: src/prefs_template.c:472
+#: src/prefs_actions.c:528 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:820 src/prefs_filtering.c:822
+#: src/prefs_filtering.c:823 src/prefs_filtering.c:933 src/prefs_matcher.c:918
+#: src/prefs_template.c:465
 msgid "(New)"
 msgstr "(Nová)"
 
-#: src/prefs_actions.c:602
+#: src/prefs_actions.c:593
 msgid "Menu name is not set."
 msgstr "Není nastaven název nabídky."
 
-#: src/prefs_actions.c:607
+#: src/prefs_actions.c:598
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Název nabídky nemůže začínat znakem '/'."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:603
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "V názvu nabídky není povolena dvojtečka ':'."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:622
 msgid "Menu name is too long."
 msgstr "Název nabídky je příliš dlouhý."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:631
 msgid "Command-line not set."
 msgstr "Není nastavena příkazová řádka."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:636
 msgid "Menu name and command are too long."
 msgstr "Název nabídky a příkaz jsou příliš dlouhé."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:642
 #, c-format
 msgid ""
 "The command\n"
@@ -15061,153 +15540,153 @@ msgstr ""
 "%s\n"
 "má syntaktickou chybu."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:700
 msgid "Delete action"
 msgstr "Odstranit akci"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:701
 msgid "Do you really want to delete this action?"
 msgstr "Opravdu chcete odstranit tuto akci?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:721
 msgid "Delete all actions"
 msgstr "Odstranit všechny akce"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:722
 msgid "Do you really want to delete all the actions?"
 msgstr "Opravdu chcete odstranit všechny akce?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
-#: src/prefs_filtering.c:1526 src/prefs_matcher.c:2165 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_actions.c:885 src/prefs_actions.c:916 src/prefs_filtering.c:1485
+#: src/prefs_filtering.c:1507 src/prefs_matcher.c:2160 src/prefs_template.c:565
+#: src/prefs_template.c:590
 msgid "Entry not saved"
 msgstr "Neuložený záznam"
 
-#: 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:886 src/prefs_actions.c:917 src/prefs_filtering.c:1486
+#: src/prefs_filtering.c:1508 src/prefs_template.c:566 src/prefs_template.c:591
 msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebyl uložen. Chcete přesto okno zavřít?"
 
-#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
-#: src/prefs_filtering.c:1484 src/prefs_filtering.c:1506
-#: src/prefs_filtering.c:1528 src/prefs_matcher.c:2168 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_actions.c:887 src/prefs_actions.c:892 src/prefs_actions.c:918
+#: src/prefs_filtering.c:1465 src/prefs_filtering.c:1487
+#: src/prefs_filtering.c:1509 src/prefs_matcher.c:2163 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "_Pokračovat v úpravách"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:890
 msgid "Actions list not saved"
 msgstr "Seznam akcí neuložen"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:891
 msgid "The actions list has been modified. Close anyway?"
 msgstr "Seznam akcí byl změnen. Chcete přesto zavřít?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:961
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Název nabídky:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:962
 msgid "Use / in menu name to make submenus."
 msgstr "Použijte \"/\" v názvu nabídky pro vytvoření podnabídek."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:964
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Příkazová řádka:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:965
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Začíná-li:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:966
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "bude odesláno tělo zprávy nebo vybraná část na standardní vstup příkazu"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:967
 msgid "to send user provided text to command's standard input"
 msgstr "bude odeslán uživatelem zadaný text na standardní vstup příkazu"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:968
 msgid "to send user provided hidden text to command's standard input"
 msgstr "bude odeslán uživatelem skrytě zadaný text na standardní vstup příkazu"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:969
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Končí-li:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:970
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "bude tělo zprávy nebo vybraná část nahrazena standardním výstupem příkazu"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:971
 msgid "to insert command's standard output without replacing old text"
 msgstr "bude standardní výstup příkazu vložen bez nahrazení původního textu"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:972
 msgid "to run command asynchronously"
 msgstr "bude příkaz spuštěn asynchronně"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:973
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Použijte:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:974
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "pro soubor s vybranou zprávou ve formátu RFC822/2822 "
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:975
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "pro seznam souborů s vybranými zprávami ve formátu RFC822/2822"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:976
 msgid "for the file of the selected decoded message MIME part"
 msgstr "pro soubor vybrané dekódované MIME části zprávy"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:977
 msgid "for a user provided argument"
 msgstr "pro uživatelem zadaný parametr"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:978
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "pro uživatelem skrytě zadaný parametr (např. heslo)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:979
 msgid "for the text selection"
 msgstr "pro vybraný text"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:980
 msgid "apply filtering actions between {} to selected messages"
 msgstr "pro aplikaci filtrovacích pravidel mezi {} na vybrané zprávy"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:981
 msgid "for a literal %"
 msgstr "pro znak %"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:1090
+#: src/prefs_actions.c:991 src/prefs_themes.c:1092
 msgid "Actions"
 msgstr "Akce"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:992
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
 msgstr ""
 "Akce umožňují spouštět externí příkazy ke zpracování zpráv nebo jejich částí."
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1702
-#: src/prefs_template.c:1114
+#: src/prefs_actions.c:1079 src/prefs_filtering.c:1683
+#: src/prefs_template.c:1107
 msgid "D_uplicate"
 msgstr "D_uplikáty"
 
-#: src/prefs_actions.c:1208
+#: src/prefs_actions.c:1197
 msgid "Current actions"
 msgstr "Nadefinované akce"
 
-#: src/prefs_actions.c:1307 src/prefs_filtering.c:1079
-#: src/prefs_filtering.c:1137
+#: src/prefs_actions.c:1296 src/prefs_filtering.c:1060
+#: src/prefs_filtering.c:1118
 msgid "Action string is not valid."
 msgstr "Definice akce není platná."
 
@@ -15227,225 +15706,225 @@ 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"
 
-#: src/prefs_common.c:451
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
-#: src/prefs_compose_writing.c:126
+#: src/prefs_compose_writing.c:123
 msgid "Automatic account selection"
 msgstr "Automatický výběr účtu"
 
-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:131
 msgid "when replying"
 msgstr "při odpovídání"
 
-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:133
 msgid "when forwarding"
 msgstr "při přeposílání"
 
-#: src/prefs_compose_writing.c:138
+#: src/prefs_compose_writing.c:135
 msgid "when re-editing"
 msgstr "při opětovné editaci"
 
-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:138
 msgid "Editing"
 msgstr "Editace"
 
-#: src/prefs_compose_writing.c:145
+#: src/prefs_compose_writing.c:142
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustit externí editor"
 
-#: src/prefs_compose_writing.c:153
+#: src/prefs_compose_writing.c:150
 msgid "Automatically save message to Drafts folder every"
 msgstr "Automaticky uložit text do složky s koncepty každých"
 
-#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:100
+#: src/prefs_compose_writing.c:159 src/prefs_wrapping.c:100
 msgid "characters"
 msgstr "znaků"
 
-#: src/prefs_compose_writing.c:173
+#: src/prefs_compose_writing.c:170
 msgid "Even if message is to be encrypted"
 msgstr "I když zpráva musí být šifrována"
 
-#: src/prefs_compose_writing.c:180
+#: src/prefs_compose_writing.c:177
 msgid "Undo level"
 msgstr "Úroveň zpětných kroků"
 
-#: src/prefs_compose_writing.c:197
+#: src/prefs_compose_writing.c:194
 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
+#: src/prefs_compose_writing.c:205
 msgid "KB into message body "
 msgstr "KB v těle zprávy "
 
-#: src/prefs_compose_writing.c:214
+#: src/prefs_compose_writing.c:211
 msgid "Replying"
 msgstr "Odpovídání"
 
-#: src/prefs_compose_writing.c:217
+#: src/prefs_compose_writing.c:214
 msgid "Reply will quote by default"
 msgstr "Odpověď bude vždy s citací"
 
-#: src/prefs_compose_writing.c:220
+#: src/prefs_compose_writing.c:217
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko \"Odpovědět\" odpovídá do konference"
 
-#: src/prefs_compose_writing.c:222
+#: src/prefs_compose_writing.c:219
 msgid "Forwarding"
 msgstr "Předávání"
 
-#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
+#: src/prefs_compose_writing.c:222 src/prefs_filtering_action.c:184
 msgid "Forward as attachment"
 msgstr "Předat dál jako přílohu"
 
-#: src/prefs_compose_writing.c:227
+#: src/prefs_compose_writing.c:224
 #, c-format
 msgid "Keep the original '%s' header when redirecting"
 msgstr "Při přesměrování zachovat původní záhlaví '%s'"
 
-#: src/prefs_compose_writing.c:233
+#: src/prefs_compose_writing.c:230
 msgid "When dropping files into the Compose window"
 msgstr "Při přetažení souboru do okna s rozepsanou zprávou"
 
-#: src/prefs_compose_writing.c:242
+#: src/prefs_compose_writing.c:239
 msgid "Ask"
 msgstr "Zeptat se"
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:522
+#: src/prefs_compose_writing.c:240 src/toolbar.c:522
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:523
+#: src/prefs_compose_writing.c:241 src/toolbar.c:523
 msgid "Attach"
 msgstr "Přiložit"
 
-#: src/prefs_compose_writing.c:371
+#: src/prefs_compose_writing.c:365
 msgid "Writing"
 msgstr "Psaní"
 
-#: src/prefs_customheader.c:185
+#: src/prefs_customheader.c:183
 msgid "Custom header configuration"
 msgstr "Nastavení vlastního záhlaví"
 
-#: src/prefs_customheader.c:504 src/prefs_display_header.c:589
-#: src/prefs_matcher.c:1637 src/prefs_matcher.c:1652
+#: src/prefs_customheader.c:494 src/prefs_display_header.c:588
+#: src/prefs_matcher.c:1632 src/prefs_matcher.c:1647
 msgid "Header name is not set."
 msgstr "Není nastaven název záhlaví."
 
-#: src/prefs_customheader.c:514
+#: src/prefs_customheader.c:504
 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:551
 msgid "Choose a PNG file"
 msgstr "Choose a PNG file"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:553
 msgid "Choose an XBM file"
 msgstr "Vyberte xbm soubor"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:555
 msgid "Choose a text file"
 msgstr "Vyberte textový soubor"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:568
 msgid "This file isn't an image."
 msgstr "Tento soubor není obrázek."
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:573
 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:579
 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:584
 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:593
 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:602
 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:608
 #, c-format
 msgid "Compface error: %s"
 msgstr "Compface chyba: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:661
 msgid "This file contains newlines."
 msgstr "Tento soubor obsahuje znak(y) \"nový řádek\"."
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:691
 msgid "Delete header"
 msgstr "Odstranit záhlaví"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:692
 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:865
 msgid "Current custom headers"
 msgstr "Aktuální vlastní záhlaví"
 
-#: src/prefs_display_header.c:254
+#: src/prefs_display_header.c:253
 msgid "Displayed header configuration"
 msgstr "Nastavení zobrazovaných záhlaví"
 
-#: src/prefs_display_header.c:278
+#: src/prefs_display_header.c:277
 msgid "Header name"
 msgstr "Název záhlaví"
 
-#: src/prefs_display_header.c:313
+#: src/prefs_display_header.c:312
 msgid "Hidden headers"
 msgstr "Skryté záhlaví"
 
-#: src/prefs_display_header.c:354
+#: src/prefs_display_header.c:353
 msgid "Displayed Headers"
 msgstr "Zobrazené záhlaví"
 
-#: src/prefs_display_header.c:399
+#: src/prefs_display_header.c:398
 msgid "Show all unspecified headers"
 msgstr "Zobrazit všechna nespecifikovaná záhlaví"
 
-#: src/prefs_display_header.c:599
+#: src/prefs_display_header.c:598
 msgid "This header is already in the list."
 msgstr "Toto záhlaví je již v seznamu."
 
-#: src/prefs_ext_prog.c:102
+#: src/prefs_ext_prog.c:100
 #, c-format
 msgid "%s will be replaced with file name / URI"
 msgstr "%s bude nahrazeno jménem souboru / URI"
 
-#: src/prefs_ext_prog.c:110
+#: src/prefs_ext_prog.c:108
 msgid "For the text editor, %w will be replaced with GtkSocket ID"
 msgstr "Pro textový editor, %w bude nahrazeno GtkSocket ID"
 
-#: src/prefs_ext_prog.c:129
+#: src/prefs_ext_prog.c:127
 msgid "Use system defaults when possible"
 msgstr "Použít hodnoty ze systému, když je to možné"
 
-#: src/prefs_ext_prog.c:150
+#: src/prefs_ext_prog.c:146
 msgid "Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/prefs_ext_prog.c:178
+#: src/prefs_ext_prog.c:172
 msgid "Text editor"
 msgstr "Textový editor"
 
-#: src/prefs_ext_prog.c:210
+#: src/prefs_ext_prog.c:201
 msgid "Command for 'Display as text'"
 msgstr "Příkaz pro 'Zobrazit jako text'"
 
-#: src/prefs_ext_prog.c:223
+#: src/prefs_ext_prog.c:212
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -15453,120 +15932,120 @@ msgstr ""
 "Tato položka umožňuje definovat externí program, který bude použit při "
 "aktivaci funkce 'Zobrazit jako text'"
 
-#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:351
+#: src/prefs_ext_prog.c:273 src/prefs_image_viewer.c:173
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Náhled zprávy"
 
-#: src/prefs_ext_prog.c:283
+#: src/prefs_ext_prog.c:274
 msgid "External Programs"
 msgstr "Externí programy"
 
-#: src/prefs_filtering_action.c:171
+#: src/prefs_filtering_action.c:169
 msgid "Move"
 msgstr "Přesunout"
 
-#: src/prefs_filtering_action.c:174
+#: src/prefs_filtering_action.c:172
 msgid "Hide"
 msgstr "Skrýt"
 
+#: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:174
 #: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
 #: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
-#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
 msgid "Message flags"
 msgstr "Příznaky zpráv"
 
-#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:641
-#: src/prefs_summary_column.c:77 src/summaryview.c:2888 src/toolbar.c:505
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:641
+#: src/prefs_summary_column.c:77 src/summaryview.c:2878 src/toolbar.c:505
 msgid "Mark"
 msgstr "Označit"
 
-#: src/prefs_filtering_action.c:179
+#: src/prefs_filtering_action.c:177
 msgid "Mark as read"
 msgstr "Označit jako přečtené"
 
-#: src/prefs_filtering_action.c:180
+#: src/prefs_filtering_action.c:178
 msgid "Mark as unread"
 msgstr "Označit jako nepřečtené"
 
-#: src/prefs_filtering_action.c:181
+#: src/prefs_filtering_action.c:179
 msgid "Mark as spam"
 msgstr "Označit jako spam"
 
-#: src/prefs_filtering_action.c:182
+#: src/prefs_filtering_action.c:180
 msgid "Mark as ham"
 msgstr "Označit jako ne spam"
 
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1395
+#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:1395
 #: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
 msgid "Execute"
 msgstr "Provést odložené operace"
 
-#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:639
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:639
 msgid "Color label"
 msgstr "Barevné značení zpráv"
 
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
-#: src/prefs_filtering_action.c:187
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:185
 msgid "Resend"
 msgstr "Přeposlané"
 
-#: src/prefs_filtering_action.c:187
+#: src/prefs_filtering_action.c:185
 msgid "Redirect"
 msgstr "Přesměrovat"
 
-#: 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_filtering_action.c:186 src/prefs_filtering_action.c:187
+#: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
 #: src/prefs_summaries.c:644 src/prefs_summary_column.c:86
-#: src/summaryview.c:474
+#: src/summaryview.c:469
 msgid "Score"
 msgstr "Ohodnocení"
 
-#: src/prefs_filtering_action.c:188
+#: src/prefs_filtering_action.c:186
 msgid "Change score"
 msgstr "Změnit ohodnocení"
 
-#: src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:187
 msgid "Set score"
 msgstr "Nastavit ohodnocení"
 
-#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
-#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:644
-#: src/prefs_summary_column.c:88 src/summaryview.c:476
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:190 src/prefs_matcher.c:643
+#: src/prefs_summary_column.c:88 src/summaryview.c:471
 msgid "Tags"
 msgstr "Značky"
 
-#: src/prefs_filtering_action.c:190
+#: src/prefs_filtering_action.c:188
 msgid "Apply tag"
 msgstr "Použít značku"
 
-#: src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:189
 msgid "Unset tag"
 msgstr "Odebrat značku"
 
-#: src/prefs_filtering_action.c:192
+#: src/prefs_filtering_action.c:190
 msgid "Clear tags"
 msgstr "Vymazat značky"
 
-#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
 msgid "Threads"
 msgstr "Vlákna"
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:194
 msgid "Stop filter"
 msgstr "Zastavit filtrování"
 
-#: src/prefs_filtering_action.c:401
+#: src/prefs_filtering_action.c:399
 msgid "Action configuration"
 msgstr "Nastavení akcí"
 
-#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1895
-#: src/prefs_matcher.c:597
+#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1874
+#: src/prefs_matcher.c:595
 msgid "Rule"
 msgstr "Pravidlo"
 
-#: src/prefs_filtering_action.c:431 src/prefs_filtering.c:434
+#: src/prefs_filtering_action.c:430 src/prefs_filtering.c:423
 msgid "Action"
 msgstr "Akce"
 
@@ -15602,25 +16081,25 @@ msgstr "Jméno značky je prázdné."
 msgid "No action was defined."
 msgstr "Není nastavena žádná akce."
 
-#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2212
-#: src/quote_fmt.c:79
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2207
+#: src/quote_fmt.c:78
 msgid "literal %"
 msgstr "znak %"
 
-#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2221
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2216
 msgid "filename (should not be modified)"
 msgstr "název souboru (neměl by být měněn)"
 
-#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2222
-#: src/quote_fmt.c:87
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2217
+#: src/quote_fmt.c:86
 msgid "new line"
 msgstr "nový řádek"
 
-#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2223
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2218
 msgid "escape character for quotes"
 msgstr "únikový znak pro citaci"
 
-#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2224
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2219
 msgid "quote character"
 msgstr "uvozovka (znak \")"
 
@@ -15658,117 +16137,117 @@ msgstr "Barva"
 msgid "Current action list"
 msgstr "Platný seznam akcí"
 
-#: src/prefs_filtering.c:197 src/prefs_filtering.c:360
+#: src/prefs_filtering.c:196 src/prefs_filtering.c:359
 msgid "Filtering/Processing configuration"
 msgstr "Nastavení filtrování/zpracování"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:870
-#: src/prefs_filtering.c:986
+#: src/prefs_filtering.c:265 src/prefs_filtering.c:851
+#: src/prefs_filtering.c:967
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Všechny"
 
-#: src/prefs_filtering.c:412
+#: src/prefs_filtering.c:405
 msgid "Condition"
 msgstr "Podmínka"
 
-#: src/prefs_filtering.c:425
+#: src/prefs_filtering.c:416
 msgid " Def_ine... "
 msgstr " D_efinovat... "
 
-#: src/prefs_filtering.c:447
+#: src/prefs_filtering.c:434
 msgid " De_fine... "
 msgstr " De_finovat... "
 
-#: src/prefs_filtering.c:476
+#: src/prefs_filtering.c:461
 msgid "Append the new rule above to the list"
 msgstr "Přidat pravidlo nahoře do seznamu"
 
-#: src/prefs_filtering.c:485
+#: src/prefs_filtering.c:470
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Nahradit vybrané pravidlo pravidlem nahoře"
 
-#: src/prefs_filtering.c:494
+#: src/prefs_filtering.c:477
 msgid "Delete the selected rule from the list"
 msgstr "Odstranit vybrané pravidlo ze seznamu"
 
-#: src/prefs_filtering.c:535
+#: src/prefs_filtering.c:516
 msgid "Move the selected rule to the top"
 msgstr "Přesunout vybrané pravidlo na vrchol"
 
-#: src/prefs_filtering.c:538
+#: src/prefs_filtering.c:519
 msgid "Page u_p"
 msgstr "O stránku _výš"
 
-#: src/prefs_filtering.c:546
+#: src/prefs_filtering.c:527
 msgid "Move the selected rule one page up"
 msgstr "Přesunout vybrané pravidlo o stránku výš"
 
-#: src/prefs_filtering.c:555
+#: src/prefs_filtering.c:536
 msgid "Move the selected rule up"
 msgstr "Posunout vybrané pravidlo nahoru"
 
-#: src/prefs_filtering.c:563
+#: src/prefs_filtering.c:544
 msgid "Move the selected rule down"
 msgstr "Posunout vybrané pravidlo dolu"
 
-#: src/prefs_filtering.c:566
+#: src/prefs_filtering.c:547
 msgid "Page dow_n"
 msgstr "O stránku _dolu"
 
-#: src/prefs_filtering.c:574
+#: src/prefs_filtering.c:555
 msgid "Move the selected rule one page down"
 msgstr "Přesunout vybrané pravidlo o stránku níže"
 
-#: src/prefs_filtering.c:583
+#: src/prefs_filtering.c:564
 msgid "Move the selected rule to the bottom"
 msgstr "Přesunout vybrané pravidlo dospodu"
 
-#: src/prefs_filtering.c:1043 src/prefs_filtering.c:1129
+#: src/prefs_filtering.c:1024 src/prefs_filtering.c:1110
 msgid "Condition string is not valid."
 msgstr "Definice podmínky není platná."
 
-#: src/prefs_filtering.c:1116
+#: src/prefs_filtering.c:1097
 msgid "Condition string is empty."
 msgstr "Podmínka je prázdná."
 
-#: src/prefs_filtering.c:1122
+#: src/prefs_filtering.c:1103
 msgid "Action string is empty."
 msgstr "Akce je prázdná."
 
-#: src/prefs_filtering.c:1211
+#: src/prefs_filtering.c:1192
 msgid "Delete rule"
 msgstr "Odstranit pravidlo"
 
-#: src/prefs_filtering.c:1212
+#: src/prefs_filtering.c:1193
 msgid "Do you really want to delete this rule?"
 msgstr "Opravdu chcete odstranit toto pravidlo?"
 
-#: src/prefs_filtering.c:1230
+#: src/prefs_filtering.c:1211
 msgid "Delete all rules"
 msgstr "Odstranit všechna pravidla"
 
-#: src/prefs_filtering.c:1231
+#: src/prefs_filtering.c:1212
 msgid "Do you really want to delete all the rules?"
 msgstr "Opravdu chcete odstranit všechna pravidla?"
 
-#: src/prefs_filtering.c:1482
+#: src/prefs_filtering.c:1463
 msgid "Filtering rules not saved"
 msgstr "Pravidla filtrování neuložena"
 
-#: src/prefs_filtering.c:1483
+#: src/prefs_filtering.c:1464
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "Seznam pravidel filtrování byl změněn. Přesto zavřít?"
 
-#: src/prefs_filtering.c:1705
+#: src/prefs_filtering.c:1686
 msgid "Move one page up"
 msgstr "Přesunout o stránku výš"
 
-#: src/prefs_filtering.c:1706
+#: src/prefs_filtering.c:1687
 msgid "Move one page down"
 msgstr "Jít o stránku dolů"
 
-#: src/prefs_filtering.c:1863
+#: src/prefs_filtering.c:1842
 msgid "Enable"
 msgstr "Povolit"
 
@@ -15793,8 +16272,8 @@ msgstr "Skryté sloupce"
 msgid "Displayed columns"
 msgstr "Zobrazené sloupce"
 
-#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:464
-#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1032
+#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:462
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1015
 msgid " Use default "
 msgstr " Použít výchozí "
 
@@ -15809,7 +16288,7 @@ msgstr ""
 "Může však být použito pro konfiguraci podřízených složek pomocí volby "
 "\"Nastavit také u podsložek\"."
 
-#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
+#: src/prefs_folder_item.c:294 src/prefs_folder_item.c:900
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15817,55 +16296,55 @@ msgstr ""
 "Nastavit také\n"
 "u podsložek"
 
-#: src/prefs_folder_item.c:318
+#: src/prefs_folder_item.c:317
 msgid "Normal"
 msgstr "Normální složka"
 
-#: src/prefs_folder_item.c:320
+#: src/prefs_folder_item.c:319
 msgid "Outbox"
 msgstr "Odeslaná pošta"
 
-#: src/prefs_folder_item.c:336
+#: src/prefs_folder_item.c:330
 msgid "Folder type"
 msgstr "Typ složky"
 
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:354
 msgid "Simplify Subject RegExp"
 msgstr "Reg. výraz pro zjednodušení předmětu"
 
-#: src/prefs_folder_item.c:374
+#: src/prefs_folder_item.c:384
 msgid "Test string"
 msgstr "Testovací řetězec"
 
-#: src/prefs_folder_item.c:391
+#: src/prefs_folder_item.c:405
 msgid "Result"
 msgstr "Výsledek"
 
-#: src/prefs_folder_item.c:406
+#: src/prefs_folder_item.c:423
 msgid "Folder chmod"
 msgstr "Práva složky"
 
-#: src/prefs_folder_item.c:432
+#: src/prefs_folder_item.c:451
 msgid "Folder color"
 msgstr "Barva složky"
 
-#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
+#: src/prefs_folder_item.c:462 src/prefs_folder_item.c:1745
 msgid "Pick color for folder"
 msgstr "Zvolte barvu pro složku"
 
-#: src/prefs_folder_item.c:462
+#: src/prefs_folder_item.c:480
 msgid "Run Processing rules at start-up"
 msgstr "Zpracovat při spuštění"
 
-#: src/prefs_folder_item.c:477
+#: src/prefs_folder_item.c:493
 msgid "Run Processing rules when opening"
 msgstr "Spustit pravidla zpracování při otevření"
 
-#: src/prefs_folder_item.c:491
+#: src/prefs_folder_item.c:505
 msgid "Scan for new mail"
 msgstr "Zjistit nové zprávy"
 
-#: src/prefs_folder_item.c:493
+#: src/prefs_folder_item.c:507
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -15873,11 +16352,11 @@ msgstr ""
 "Zapněte volbu, když je zpráva doručena přímo do složky filtrováním na straně "
 "IMAP serveru nebo externí aplikací"
 
-#: src/prefs_folder_item.c:513
+#: src/prefs_folder_item.c:523
 msgid "Select the HTML part of multipart messages"
 msgstr "Vybrat HTML část vícedílných zpráv"
 
-#: src/prefs_folder_item.c:530
+#: src/prefs_folder_item.c:538
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -15885,15 +16364,15 @@ msgstr ""
 "\"Výchozí\" budou sledovat globální nastavení (k nalezení /Nastavení/Okno "
 "zpráv/Volby textu)"
 
-#: src/prefs_folder_item.c:540
+#: src/prefs_folder_item.c:546
 msgid "Synchronise for offline use"
 msgstr "Synchronizovat pro použití offline"
 
-#: src/prefs_folder_item.c:561
+#: src/prefs_folder_item.c:564
 msgid "Fetch message bodies from the last"
 msgstr "Vzít tělo zpráva z poslední"
 
-#: src/prefs_folder_item.c:568
+#: src/prefs_folder_item.c:569
 msgid "0: all bodies"
 msgstr "0: všechna těla"
 
@@ -15905,114 +16384,130 @@ msgstr "Odstranit stará těla zpráv"
 msgid "Discard folder cache"
 msgstr "Zrušit cache složky"
 
-#: src/prefs_folder_item.c:905
+#: src/prefs_folder_item.c:907
 msgid "Request Return Receipt"
 msgstr "Vyžadovat potvrzení o doručení"
 
-#: src/prefs_folder_item.c:920
+#: src/prefs_folder_item.c:918
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Uložit odeslané zprávy do této složky místo do Odeslané pošty"
 
-#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
-#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
+#: src/prefs_folder_item.c:929 src/prefs_folder_item.c:979
+#: src/prefs_folder_item.c:1004 src/prefs_folder_item.c:1029
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "Výchozí %s"
 
-#: src/prefs_folder_item.c:960
+#: src/prefs_folder_item.c:954
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "Výchozí %s pro odpovědi"
 
-#: src/prefs_folder_item.c:1063
+#: src/prefs_folder_item.c:1053
 msgid "Default account"
 msgstr "Výchozí účet"
 
-#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+#: src/prefs_folder_item.c:1185 src/prefs_folder_item.c:1215
 msgid "\"Default\" will follow the applicable account preference"
 msgstr "\"Výchozí\" bude následovat použitelné nastavení účtu"
 
-#: src/prefs_folder_item.c:1781
+#: src/prefs_folder_item.c:1758
 msgid "Discard cache"
 msgstr "Zrušit cache"
 
-#: src/prefs_folder_item.c:1782
+#: src/prefs_folder_item.c:1759
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "Opravdu chcete zahodit lokálně kešovaná data pro tuto složku?"
 
-#: src/prefs_folder_item.c:1907
+#: src/prefs_folder_item.c:1874
 msgid "General"
 msgstr "Obecné"
 
-#: src/prefs_folder_item.c:1986
+#: src/prefs_folder_item.c:1953
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Vlastnosti složky %s"
 
-#: src/prefs_fonts.c:79
+#: src/prefs_fonts.c:78
 msgid "Folder and Message Lists"
 msgstr "Seznam složek a seznam zpráv"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2086
+#: src/prefs_fonts.c:96 src/prefs_matcher.c:2081
 msgid "Message"
 msgstr "Text zprávy"
 
-#: src/prefs_fonts.c:126
+#: src/prefs_fonts.c:119
 msgid "Derive small and bold fonts from Folder and Message Lists font"
 msgstr "Odvodit malé a tučné fonty z fontů Složky a Seznamu zpráv"
 
-#: src/prefs_fonts.c:136
+#: src/prefs_fonts.c:127
 msgid "Small"
 msgstr "Malý"
 
-#: src/prefs_fonts.c:158
+#: src/prefs_fonts.c:147
 msgid "Bold"
 msgstr "Tučné"
 
-#: src/prefs_fonts.c:180
+#: src/prefs_fonts.c:167
 msgid "Use different font for printing"
 msgstr "Použít jiné písmo pro tisk"
 
-#: src/prefs_fonts.c:190
+#: src/prefs_fonts.c:175
 msgid "Message Printing"
 msgstr "Tisk zpráv"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:776 src/prefs_summaries.c:869
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:752 src/prefs_summaries.c:869
 #: src/prefs_themes.c:422
 msgid "Display"
 msgstr "Zobrazení"
 
-#: src/prefs_fonts.c:269
+#: src/prefs_fonts.c:252
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:77
 msgid "Automatically display attached images"
 msgstr "Automaticky zobrazit připojené obrázky"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:81
 msgid "Resize attached images by default"
 msgstr "Standardně upravovat velikost"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:84
 msgid "Clicking image toggles scaling"
 msgstr "Kliknutí na obrázek přepíná úpravu velikosti"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:93
+msgid "Fit image"
+msgstr "Přizpůsobit obrázek"
+
+#: src/prefs_image_viewer.c:97
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "Kliknutí pravým tlačítkem přizpůsobí obrázek výšce/šířce"
+
+#: src/prefs_image_viewer.c:100
+msgid "Height"
+msgstr "Výška"
+
+#: src/prefs_image_viewer.c:106
+msgid "Width"
+msgstr "Šířka"
+
+#: src/prefs_image_viewer.c:111
 msgid "Display images inline"
 msgstr "Zobrazovat obrázky v textu"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:115
 msgid "Print images"
 msgstr "Tisknout obrázky"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:174
 msgid "Image Viewer"
 msgstr "Prohlížeč obrázků"
 
@@ -16132,7 +16627,7 @@ msgstr "Chybové zprávy"
 msgid "Status messages for filtering/processing log"
 msgstr "Zprávy pro záznam filtrování/zpracování"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:153 src/prefs_other.c:815
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:785
 msgid "Other"
 msgstr "Ostatní"
 
@@ -16140,168 +16635,168 @@ msgstr "Ostatní"
 msgid "Logging"
 msgstr "Zaznamenávání"
 
-#: src/prefs_matcher.c:335
+#: src/prefs_matcher.c:334
 msgid "more than"
 msgstr "více než"
 
-#: src/prefs_matcher.c:336
+#: src/prefs_matcher.c:335
 msgid "less than"
 msgstr "méně než"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:341
 msgid "weeks"
 msgstr "týdny"
 
-#: src/prefs_matcher.c:346
+#: src/prefs_matcher.c:345
 msgid "after"
 msgstr "po"
 
-#: src/prefs_matcher.c:347
+#: src/prefs_matcher.c:346
 msgid "before"
 msgstr "před"
 
-#: src/prefs_matcher.c:351
+#: src/prefs_matcher.c:350
 msgid "higher than"
 msgstr "vyšší než"
 
-#: src/prefs_matcher.c:352
+#: src/prefs_matcher.c:351
 msgid "lower than"
 msgstr "nižší než"
 
-#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
+#: src/prefs_matcher.c:352 src/prefs_matcher.c:358
 msgid "exactly"
 msgstr "přesně"
 
-#: src/prefs_matcher.c:357
+#: src/prefs_matcher.c:356
 msgid "greater than"
 msgstr "větší než"
 
-#: src/prefs_matcher.c:358
+#: src/prefs_matcher.c:357
 msgid "smaller than"
 msgstr "menší než"
 
-#: src/prefs_matcher.c:363
+#: src/prefs_matcher.c:362
 msgid "bytes"
 msgstr "bytů"
 
-#: src/prefs_matcher.c:364
+#: src/prefs_matcher.c:363
 msgid "kilobytes"
 msgstr "kilobyty"
 
-#: src/prefs_matcher.c:365
+#: src/prefs_matcher.c:364
 msgid "megabytes"
 msgstr "megabyty"
 
-#: src/prefs_matcher.c:369
+#: src/prefs_matcher.c:368
 msgid "contains"
 msgstr "obsahuje"
 
-#: src/prefs_matcher.c:370
+#: src/prefs_matcher.c:369
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
-#: src/prefs_matcher.c:394
+#: src/prefs_matcher.c:393
 msgid "headers part"
 msgstr "část záhlaví"
 
-#: src/prefs_matcher.c:395
+#: src/prefs_matcher.c:394
 msgid "headers values"
 msgstr "hodnoty záhlaví"
 
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:395
 msgid "body part"
 msgstr "část těla"
 
-#: src/prefs_matcher.c:397
+#: src/prefs_matcher.c:396
 msgid "whole message"
 msgstr "celá zpráva"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:402 src/summaryview.c:6534
 msgid "Marked"
 msgstr "Označené"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:403 src/summaryview.c:6532
 msgid "Deleted"
 msgstr "Odstraněné"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:404
 msgid "Replied"
 msgstr "Odpovězené"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:405 src/summaryview.c:6526
 msgid "Forwarded"
 msgstr "Předané"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:407 src/summaryview.c:6516 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Spam"
 
-#: src/prefs_matcher.c:409
+#: src/prefs_matcher.c:408
 msgid "Has attachment"
 msgstr "Má přílohu"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:409 src/summaryview.c:6552
 msgid "Signed"
 msgstr "Podepsané"
 
-#: src/prefs_matcher.c:414
+#: src/prefs_matcher.c:413
 msgid "set"
 msgstr "nastavené"
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:414
 msgid "not set"
 msgstr "nenastavené"
 
-#: src/prefs_matcher.c:419
+#: src/prefs_matcher.c:418
 msgid "yes"
 msgstr "ano"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:419
 msgid "no"
 msgstr "ne"
 
-#: src/prefs_matcher.c:424
+#: src/prefs_matcher.c:423
 msgid "Any tags"
 msgstr "Jakékoliv značky"
 
-#: src/prefs_matcher.c:425
+#: src/prefs_matcher.c:424
 msgid "Specific tag"
 msgstr "Specifická značka"
 
-#: src/prefs_matcher.c:429
+#: src/prefs_matcher.c:428
 msgid "ignored"
 msgstr "ignorované"
 
-#: src/prefs_matcher.c:430
+#: src/prefs_matcher.c:429
 msgid "not ignored"
 msgstr "ne ignorované"
 
-#: src/prefs_matcher.c:431
+#: src/prefs_matcher.c:430
 msgid "watched"
 msgstr "sledován"
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:431
 msgid "not watched"
 msgstr "nesledován"
 
-#: src/prefs_matcher.c:436
+#: src/prefs_matcher.c:435
 msgid "found"
 msgstr "nalezen"
 
-#: src/prefs_matcher.c:437
+#: src/prefs_matcher.c:436
 msgid "not found"
 msgstr "nenalzen"
 
-#: src/prefs_matcher.c:441
+#: src/prefs_matcher.c:440
 msgid "0 (Passed)"
 msgstr "0 (Prošlo)"
 
-#: src/prefs_matcher.c:442
+#: src/prefs_matcher.c:441
 msgid "non-0 (Failed)"
 msgstr "ne-0 (Selhalo)"
 
-#: src/prefs_matcher.c:580
+#: src/prefs_matcher.c:578
 msgid "Condition configuration"
 msgstr "Nastavení podmínky"
 
@@ -16309,39 +16804,39 @@ msgstr "Nastavení podmínky"
 msgid "Match criteria"
 msgstr "Vyhledávací kritéria"
 
-#: src/prefs_matcher.c:633
+#: src/prefs_matcher.c:632
 msgid "All messages"
 msgstr "Všechny zprávy"
 
-#: src/prefs_matcher.c:635
+#: src/prefs_matcher.c:634
 msgid "Age"
 msgstr "Věk"
 
-#: src/prefs_matcher.c:636
+#: src/prefs_matcher.c:635
 msgid "Phrase"
 msgstr "Fráze"
 
-#: src/prefs_matcher.c:637
+#: src/prefs_matcher.c:636
 msgid "Flags"
 msgstr "Příznaky"
 
-#: src/prefs_matcher.c:638 src/prefs_msg_colors.c:380
+#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:378
 msgid "Color labels"
 msgstr "Obarvování zpráv"
 
-#: src/prefs_matcher.c:639
+#: src/prefs_matcher.c:638
 msgid "Thread"
 msgstr "Vlákno"
 
-#: src/prefs_matcher.c:642
+#: src/prefs_matcher.c:641
 msgid "Partially downloaded"
 msgstr "Částečně staženo"
 
-#: src/prefs_matcher.c:645
+#: src/prefs_matcher.c:644
 msgid "External program test"
 msgstr "Test externího programu"
 
-#: src/prefs_matcher.c:674
+#: src/prefs_matcher.c:672
 msgid ""
 "Use selector on the right to pick the header name. Type the name of the "
 "header if not available in the list."
@@ -16349,58 +16844,58 @@ msgstr ""
 "Použijte výběr napravo pro výběr jména hlavičky. Napište jméno pokud není v "
 "seznamu dostupné."
 
-#: src/prefs_matcher.c:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
-#: src/prefs_matcher.c:2583
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1653 src/prefs_matcher.c:1668
+#: src/prefs_matcher.c:2577
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Všechny"
 
-#: src/prefs_matcher.c:753
+#: src/prefs_matcher.c:749
 msgid "Use regexp"
 msgstr "Použít regulární výraz"
 
-#: src/prefs_matcher.c:844
+#: src/prefs_matcher.c:840
 msgid "Message must match"
 msgstr "Zpráva musí odpovídat"
 
-#: src/prefs_matcher.c:848
+#: src/prefs_matcher.c:844
 msgid "at least one"
 msgstr "nejméně jeden"
 
-#: src/prefs_matcher.c:849
+#: src/prefs_matcher.c:845
 msgid "all"
 msgstr "vše"
 
-#: src/prefs_matcher.c:852
+#: src/prefs_matcher.c:848
 msgid "of above rules"
 msgstr "výše uvedenými pravidly"
 
-#: src/prefs_matcher.c:1564 src/prefs_matcher.c:1642
+#: src/prefs_matcher.c:1560 src/prefs_matcher.c:1637
 msgid "Search pattern is not set."
 msgstr "Není nastaven vzor pro vyhledávání."
 
-#: src/prefs_matcher.c:1578
+#: src/prefs_matcher.c:1574
 msgid "Invalid hour."
 msgstr "Neplatná hodina."
 
-#: src/prefs_matcher.c:1587
+#: src/prefs_matcher.c:1583
 msgid "Test command is not set."
 msgstr "Není nastaven test příkazu."
 
-#: src/prefs_matcher.c:1659
+#: src/prefs_matcher.c:1654
 msgid "all addresses in all headers"
 msgstr "každá adresa ze všech položek záhlaví zprávy"
 
-#: src/prefs_matcher.c:1662
+#: src/prefs_matcher.c:1657
 msgid "any address in any header"
 msgstr "libovolná adresa z libovolného záhlaví zprávy"
 
-#: src/prefs_matcher.c:1664
+#: src/prefs_matcher.c:1659
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adresa ze záhlaví zprávy '%s'"
 
-#: src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1660
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16413,87 +16908,87 @@ msgstr ""
 "Pokud chcete zjišťovat zda %s existuje v rámci celé knihy, vyberte '%s' z "
 "knihy/složky přetáhněte do seznamu."
 
-#: src/prefs_matcher.c:1884
+#: src/prefs_matcher.c:1879
 msgid "Headers part"
 msgstr "Část záhlaví"
 
-#: src/prefs_matcher.c:1888
+#: src/prefs_matcher.c:1883
 msgid "Headers values"
 msgstr "Hodnoty záhlaví"
 
-#: src/prefs_matcher.c:1892
+#: src/prefs_matcher.c:1887
 msgid "Body part"
 msgstr "Část těla"
 
-#: src/prefs_matcher.c:1896
+#: src/prefs_matcher.c:1891
 msgid "Whole message"
 msgstr "Celá zpráva"
 
-#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
+#: src/prefs_matcher.c:2008 src/prefs_matcher.c:2054
 msgid "in"
 msgstr "v"
 
-#: src/prefs_matcher.c:2015
+#: src/prefs_matcher.c:2010
 msgid "content is"
 msgstr "obsahuje"
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2014
 msgid "Date is"
 msgstr "Datum je"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2025
 msgid "Age is"
 msgstr "Věk je"
 
-#: src/prefs_matcher.c:2035
+#: src/prefs_matcher.c:2030
 msgid "Flag"
 msgstr "Příznak"
 
-#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
+#: src/prefs_matcher.c:2031 src/prefs_matcher.c:2045
 msgid "is"
 msgstr "je"
 
-#: src/prefs_matcher.c:2041
+#: src/prefs_matcher.c:2036
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/prefs_matcher.c:2049
+#: src/prefs_matcher.c:2044
 msgid "Label"
 msgstr "Označení"
 
-#: src/prefs_matcher.c:2054
+#: src/prefs_matcher.c:2049
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: src/prefs_matcher.c:2069
+#: src/prefs_matcher.c:2064
 msgid "Score is"
 msgstr "Skóre je"
 
-#: src/prefs_matcher.c:2070
+#: src/prefs_matcher.c:2065
 msgid "points"
 msgstr "body"
 
-#: src/prefs_matcher.c:2080
+#: src/prefs_matcher.c:2075
 msgid "Size is"
 msgstr "Velikost je"
 
-#: src/prefs_matcher.c:2085
+#: src/prefs_matcher.c:2080
 msgid "Scope:"
 msgstr "Rozsah:"
 
-#: src/prefs_matcher.c:2087
+#: src/prefs_matcher.c:2082
 msgid "tags"
 msgstr "značky"
 
-#: src/prefs_matcher.c:2092
+#: src/prefs_matcher.c:2087
 msgid "type is"
 msgstr "typ je"
 
-#: src/prefs_matcher.c:2096
+#: src/prefs_matcher.c:2091
 msgid "Program returns"
 msgstr "Návratové hodnoty programu"
 
-#: src/prefs_matcher.c:2166
+#: src/prefs_matcher.c:2161
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16501,11 +16996,11 @@ msgstr ""
 "Záznam nebyl uložen.\n"
 "Chcete přesto okno zavřít?"
 
-#: src/prefs_matcher.c:2233
+#: src/prefs_matcher.c:2228
 msgid "Match Type: 'Test'"
 msgstr "Typ podmínky: 'Test'"
 
-#: src/prefs_matcher.c:2234
+#: src/prefs_matcher.c:2229
 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"
@@ -16517,87 +17012,95 @@ msgstr ""
 "\n"
 "Následující symboly mohou být použity:"
 
-#: src/prefs_matcher.c:2333
+#: src/prefs_matcher.c:2328
 msgid "Current condition rules"
 msgstr "Aktuální pravidla podmínky"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Záhlaví"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "Zobrazit záhlaví na samostatném panelu nad náhledem zprávy"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr "Zobrazit (X-)Face v náhledu zprávy"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "Uložit (X-)Face v knize adres je-li to možné"
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr "Zobrazit Face v náhledu zprávy"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr "Uložit Face v knize adres je-li to možné"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "Zobrazit záhlaví v náhledu zprávy"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "HTML zprávy"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "Interpretovat HTML zprávy jako text"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Interpretovat čisté HTML zprávy pomocí modulu, pokud lze"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Vybrat HTML část vícedílných/alternativních zpráv"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Prázdná řádka"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "pixel(y)"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Posun"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Polovina stránky"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Jemný posun"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Zobrazit popis příloh (místo jejich názvů)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Citace"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Sbalit citovaný na dvou-kliknutí"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Považovat tyto znaky za uvozovky"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Text"
 
@@ -16625,132 +17128,132 @@ msgstr ""
 msgid "Configuration warning"
 msgstr "Konfigurace varování"
 
-#: src/prefs_msg_colors.c:155
+#: src/prefs_msg_colors.c:153
 msgid "Message view"
 msgstr "Náhled zprávy"
 
-#: src/prefs_msg_colors.c:162
+#: src/prefs_msg_colors.c:160
 msgid "Enable coloration of message text"
 msgstr "Povolit obarvování textu zprávy"
 
-#: src/prefs_msg_colors.c:170
+#: src/prefs_msg_colors.c:168
 msgid "Quote"
 msgstr "Citace"
 
-#: src/prefs_msg_colors.c:182
+#: src/prefs_msg_colors.c:180
 msgid "Cycle quote colors"
 msgstr "Rotovat barvy citací"
 
-#: src/prefs_msg_colors.c:186
+#: src/prefs_msg_colors.c:184
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr ""
 "Pokud budou více než 3 úrovně citace, znovu se použijí barvy od první úrovně"
 
-#: src/prefs_msg_colors.c:192
+#: src/prefs_msg_colors.c:190
 msgid "1st Level"
 msgstr "1. úroveň"
 
-#: src/prefs_msg_colors.c:198 src/prefs_msg_colors.c:216
-#: src/prefs_msg_colors.c:234
+#: src/prefs_msg_colors.c:196 src/prefs_msg_colors.c:214
+#: src/prefs_msg_colors.c:232
 msgid "Text"
 msgstr "Písmo"
 
-#: src/prefs_msg_colors.c:202
+#: src/prefs_msg_colors.c:200
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Vybrat barvu písma pro 1. úroveň citace"
 
-#: src/prefs_msg_colors.c:210
+#: src/prefs_msg_colors.c:208
 msgid "2nd Level"
 msgstr "2. úroveň"
 
-#: src/prefs_msg_colors.c:220
+#: src/prefs_msg_colors.c:218
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Vybrat barvu písma pro 2. úroveň citace"
 
-#: src/prefs_msg_colors.c:228
+#: src/prefs_msg_colors.c:226
 msgid "3rd Level"
 msgstr "3. úroveň"
 
-#: src/prefs_msg_colors.c:238
+#: src/prefs_msg_colors.c:236
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Vybrat barvu písma pro 3. úroveň citace"
 
-#: src/prefs_msg_colors.c:247
+#: src/prefs_msg_colors.c:245
 msgid "Enable coloration of text background"
 msgstr "Povolit obarvování pozadí textu"
 
-#: src/prefs_msg_colors.c:256
+#: src/prefs_msg_colors.c:254
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
 msgstr "Vybrat barvu pozadí pro 1. úroveň citace"
 
-#: src/prefs_msg_colors.c:269
+#: src/prefs_msg_colors.c:267
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
 msgstr "Vybrat barvu pozadí pro 2. úroveň citace"
 
-#: src/prefs_msg_colors.c:282
+#: src/prefs_msg_colors.c:280
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
 msgstr "Vybrat barvu pozadí pro 3. úroveň citace"
 
-#: src/prefs_msg_colors.c:294
+#: src/prefs_msg_colors.c:292
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "Vybrat barvu pro odkazy"
 
-#: src/prefs_msg_colors.c:298
+#: src/prefs_msg_colors.c:296
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_msg_colors.c:306
+#: src/prefs_msg_colors.c:304
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Vybrat barvu pro podpisy"
 
 #. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
 #. versions of the same text file
-#: src/prefs_msg_colors.c:316
+#: src/prefs_msg_colors.c:314
 msgid "Patch messages and attachments"
 msgstr "Záplatovat zprávy a přílohy"
 
-#: src/prefs_msg_colors.c:324
+#: src/prefs_msg_colors.c:322
 msgctxt "Tooltip"
 msgid "Pick color for inserted lines"
 msgstr "Vybrat barvu pro vložené řádky"
 
-#: src/prefs_msg_colors.c:326
+#: src/prefs_msg_colors.c:324
 msgid "Inserted lines"
 msgstr "Vložené řádky"
 
-#: src/prefs_msg_colors.c:333
+#: src/prefs_msg_colors.c:331
 msgctxt "Tooltip"
 msgid "Pick color for removed lines"
 msgstr "Vybrat barvu pro odstraněné řádky"
 
-#: src/prefs_msg_colors.c:336
+#: src/prefs_msg_colors.c:334
 msgid "Removed lines"
 msgstr "Odstraněné řádky"
 
 #. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
-#: src/prefs_msg_colors.c:344
+#: src/prefs_msg_colors.c:342
 msgctxt "Tooltip."
 msgid "Pick color for hunk lines"
 msgstr "Vybrat barvu pro rozdílné řádky"
 
 #. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
-#: src/prefs_msg_colors.c:348
+#: src/prefs_msg_colors.c:346
 msgid "Hunk lines"
 msgstr "Rozdílné řádky"
 
-#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:380
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:380
 msgid "Folder list"
 msgstr "Seznam složek"
 
-#: src/prefs_msg_colors.c:357
+#: src/prefs_msg_colors.c:355
 msgctxt "Tooltip"
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
@@ -16759,22 +17262,22 @@ msgstr ""
 "Barva pro cílovou složku. Cílová složka je označována při vypnuté volbě "
 "'Přesun a mazání provádět ihned'"
 
-#: src/prefs_msg_colors.c:362
+#: src/prefs_msg_colors.c:360
 msgid "Target folder"
 msgstr "Cílová složka"
 
-#: src/prefs_msg_colors.c:369
+#: src/prefs_msg_colors.c:367
 msgctxt "Tooltip"
 msgid "Pick color for folders containing new messages"
 msgstr "Barva pro složky obsahující nové zprávy"
 
-#: src/prefs_msg_colors.c:373
+#: src/prefs_msg_colors.c:371
 msgid "Folder containing new messages"
 msgstr "Složka obsahující nové zprávy"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:430
+#: src/prefs_msg_colors.c:396 src/prefs_msg_colors.c:428
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -16782,97 +17285,97 @@ msgstr "Vybrat barvu, která bude dostupná pod 'barva %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:434
+#: src/prefs_msg_colors.c:400 src/prefs_msg_colors.c:432
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Název barvy, která bude dostupná pod 'barva %d'"
 
-#: src/prefs_msg_colors.c:529
+#: src/prefs_msg_colors.c:527
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "Barva písma pro 1. úroveň citace"
 
-#: src/prefs_msg_colors.c:531
+#: src/prefs_msg_colors.c:529
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "Barva písma pro 2. úroveň citace"
 
-#: src/prefs_msg_colors.c:533
+#: src/prefs_msg_colors.c:531
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
 msgstr "Barva písma pro 3. úroveň citace"
 
-#: src/prefs_msg_colors.c:535
+#: src/prefs_msg_colors.c:533
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Barva pozadí pro 1. úroveň citace"
 
-#: src/prefs_msg_colors.c:537
+#: src/prefs_msg_colors.c:535
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Barva pozadí pro 2. úroveň citace"
 
-#: src/prefs_msg_colors.c:539
+#: src/prefs_msg_colors.c:537
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Barva pozadí pro 3. úroveň citace"
 
-#: src/prefs_msg_colors.c:541
+#: src/prefs_msg_colors.c:539
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "Barva pro odkazy"
 
-#: src/prefs_msg_colors.c:543
+#: src/prefs_msg_colors.c:541
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "Barva pro cílovou složku"
 
-#: src/prefs_msg_colors.c:545
+#: src/prefs_msg_colors.c:543
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
 msgstr "Barva pro podpisy"
 
-#: src/prefs_msg_colors.c:547
+#: src/prefs_msg_colors.c:545
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "Barva pro složku"
 
-#: src/prefs_msg_colors.c:549
+#: src/prefs_msg_colors.c:547
 msgctxt "Dialog title"
 msgid "Pick color for inserted lines"
 msgstr "Výběr barvy pro vložené řádky"
 
-#: src/prefs_msg_colors.c:551
+#: src/prefs_msg_colors.c:549
 msgctxt "Dialog title"
 msgid "Pick color for removed lines"
 msgstr "Výběr barvy pro odstraněné řádky"
 
-#: src/prefs_msg_colors.c:553
+#: src/prefs_msg_colors.c:551
 msgctxt "Dialog title"
 msgid "Pick color for hunk lines"
 msgstr "Výběr barvy pro rozdílné řádky"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:576
+#: src/prefs_msg_colors.c:574
 #, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
 msgstr "Barva, která bude dostupná jako 'barva %d'"
 
-#: src/prefs_msg_colors.c:777
+#: src/prefs_msg_colors.c:753
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/prefs_other.c:109
+#: src/prefs_other.c:108
 msgid "Choose preset keyboard shortcuts"
 msgstr "Vyberte klávesové zkratky"
 
-#: src/prefs_other.c:124
+#: src/prefs_other.c:123
 msgid "Select preset:"
 msgstr "Vyberte schéma:"
 
-#: src/prefs_other.c:139
+#: src/prefs_other.c:138
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16880,57 +17383,43 @@ msgstr ""
 "Můžete modifikovat klávesové zkratky v nabídce tak, že\n"
 "najedete myší nad položku nabídky a stisknete klávesovou zkratku."
 
-#: src/prefs_other.c:497
+#: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
 msgstr "Přidat adresu do cíle dvojklikem"
 
-#: src/prefs_other.c:500
+#: src/prefs_other.c:498
 msgid "On exit"
 msgstr "Při ukončení"
 
-#: src/prefs_other.c:503
+#: src/prefs_other.c:501
 msgid "Confirm on exit"
 msgstr "Potvrdit ukončení"
 
-#: src/prefs_other.c:510
+#: src/prefs_other.c:508
 msgid "Empty trash on exit"
 msgstr "Při ukončení vyprázdnit koš"
 
-#: src/prefs_other.c:513
+#: src/prefs_other.c:511
 msgid "Warn if there are queued messages"
 msgstr "Varovat pokud jsou zprávy ve frontě"
 
-#: src/prefs_other.c:515
+#: src/prefs_other.c:513
 msgid "Keyboard shortcuts"
 msgstr "Klávesové zkratky"
 
-#: src/prefs_other.c:518
+#: src/prefs_other.c:516
 msgid "Enable keyboard shortcuts"
 msgstr "Povolit klávesové zkratky"
 
-#: src/prefs_other.c:521
-msgid "Enable customisable keyboard shortcuts"
-msgstr "Povolit přizpůsobování klávesových zkratek"
-
-#: src/prefs_other.c:524
-msgid ""
-"If checked, you can change the keyboard shortcuts of most of the menu items "
-"by focusing on the menu item and pressing a key combination.\n"
-"Uncheck this option if you want to lock all existing keyboard shortcuts."
-msgstr ""
-"Při zaškrtnutí, můžete měnit klávesové zkratky většiny položek menu, jejím "
-"vybráním a tiskem dané kombinace.\n"
-"Zrušte volbu, pokud chcete uzamknout všechny stávající klávesové zkratky."
-
-#: src/prefs_other.c:531
+#: src/prefs_other.c:519
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Vyberte klávesové zkratky... "
 
-#: src/prefs_other.c:541
+#: src/prefs_other.c:529
 msgid "Metadata handling"
 msgstr "Zpracování metadat"
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:530
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16938,23 +17427,23 @@ msgstr ""
 "Bezpečný mód se zeptá OS na zapsání metadat přímo na disk;\n"
 "zabrání ztrátě dat při chybě, ale může zabrat nějaký čas."
 
-#: src/prefs_other.c:546
+#: src/prefs_other.c:535
 msgid "Safer"
 msgstr "Bezpečněji"
 
-#: src/prefs_other.c:548
+#: src/prefs_other.c:537
 msgid "Faster"
 msgstr "Rychleji"
 
-#: src/prefs_other.c:566
+#: src/prefs_other.c:555
 msgid "Socket I/O timeout"
 msgstr "Časový limit pro V/V operace se socketem"
 
-#: src/prefs_other.c:587
+#: src/prefs_other.c:576
 msgid "Translate header names"
 msgstr "Překládat záhlaví"
 
-#: src/prefs_other.c:589
+#: src/prefs_other.c:578
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
@@ -16962,21 +17451,21 @@ msgstr ""
 "Standardní záhlaví zpráv (jako 'From:', 'Subject:') budou překládána do "
 "vašeho jazyka."
 
-#: src/prefs_other.c:592
+#: src/prefs_other.c:581
 msgid "Ask before emptying trash"
 msgstr "Dotázat se před vymazáním koše"
 
-#: src/prefs_other.c:594
+#: src/prefs_other.c:583
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Dotázat se na filtrovací pravidla pro specifické účty při manuálním "
 "filtrování"
 
-#: src/prefs_other.c:599
+#: src/prefs_other.c:588
 msgid "Use secure file deletion if possible"
 msgstr "Použít bezpečné smazání souboru, když je to možné"
 
-#: src/prefs_other.c:603
+#: src/prefs_other.c:592
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16984,7 +17473,7 @@ msgstr ""
 "Použít bezpečné smazání souboru, když je to možné\n"
 "(program 'shred' není dostupný)"
 
-#: src/prefs_other.c:608
+#: src/prefs_other.c:597
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
@@ -16992,19 +17481,19 @@ msgstr ""
 "Použít program 'shred' pro přepsání souboru náhodnými daty před smazáním. "
 "Zpomalí mazání. Ujistěte se jste přečetl manuál shredu pro výstrahu."
 
-#: src/prefs_other.c:612
+#: src/prefs_other.c:601
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchronizovat offline složky jakmile to bude možné"
 
-#: src/prefs_other.c:615
+#: src/prefs_other.c:604
 msgid "Master passphrase"
 msgstr "Hlavní heslo"
 
-#: src/prefs_other.c:618
+#: src/prefs_other.c:607
 msgid "Use a master passphrase"
 msgstr "Používat hlavní heslo"
 
-#: src/prefs_other.c:621
+#: src/prefs_other.c:610
 msgid ""
 "If checked, your saved account passwords will be protected by a master "
 "passphrase. If no master passphrase is set, you will be prompted to set one."
@@ -17012,15 +17501,15 @@ msgstr ""
 "Pokud zaškrtnete, uložená hesla budou chráněna hlavním heslem. Pokud není "
 "nastaveno, bude vyzváni k jeho nastavení."
 
-#: src/prefs_other.c:626
+#: src/prefs_other.c:615
 msgid "Change master passphrase"
 msgstr "Změňte hlavní heslo"
 
-#: src/prefs_other.c:816
+#: src/prefs_other.c:786
 msgid "Miscellaneous"
 msgstr "Různé"
 
-#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+#: src/prefs_proxy.c:234 src/prefs_receive.c:415 src/prefs_send.c:411
 msgid "Mail Handling"
 msgstr "Zpracování pošty"
 
@@ -17121,7 +17610,7 @@ msgstr "Varovat při odeslání více příjemcům než"
 msgid "Outgoing encoding"
 msgstr "Kódování znaků"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:248
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -17129,131 +17618,131 @@ msgstr ""
 "Pokud je zvoleno 'Autodetekce', bude použita optimální znaková sada pro "
 "nastavené locale"
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:263
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7bitové ASCII (US-ASCII)"
 
-#: src/prefs_send.c:268
+#: src/prefs_send.c:264
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:270
+#: src/prefs_send.c:266
 msgid "Western European (ISO-8859-1)"
 msgstr "Západní Evropa (ISO-8859-1)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:267
 msgid "Western European (ISO-8859-15)"
 msgstr "Západní Evropa(ISO-8859-15)"
 
-#: src/prefs_send.c:273
+#: src/prefs_send.c:269
 msgid "Central European (ISO-8859-2)"
 msgstr "Střední Evropa (ISO-8859-2)"
 
-#: src/prefs_send.c:275
+#: src/prefs_send.c:271
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltí (ISO-8859-13)"
 
-#: src/prefs_send.c:276
+#: src/prefs_send.c:272
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltí (ISO-8859-4)"
 
-#: src/prefs_send.c:278
+#: src/prefs_send.c:274
 msgid "Greek (ISO-8859-7)"
 msgstr "Řečtina (ISO-8859-7)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:276
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrejština (ISO-8859-8)"
 
-#: src/prefs_send.c:281
+#: src/prefs_send.c:277
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrejština (Windows-1255)"
 
-#: src/prefs_send.c:283
+#: src/prefs_send.c:279
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabština (ISO-8859-6)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:280
 msgid "Arabic (Windows-1256)"
 msgstr "Arabština (Windows-1256)"
 
-#: src/prefs_send.c:286
+#: src/prefs_send.c:282
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turečtina (ISO-8859-9)"
 
-#: src/prefs_send.c:288
+#: src/prefs_send.c:284
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Azbuka (ISO-8859-5)"
 
-#: src/prefs_send.c:289
+#: src/prefs_send.c:285
 msgid "Cyrillic (KOI8-R)"
 msgstr "Azbuka (KOI8-R)"
 
-#: src/prefs_send.c:290
+#: src/prefs_send.c:286
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "Azbuka (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:291
+#: src/prefs_send.c:287
 msgid "Cyrillic (KOI8-U)"
 msgstr "Azbuka (KOI8-U)"
 
-#: src/prefs_send.c:292
+#: src/prefs_send.c:288
 msgid "Cyrillic (Windows-1251)"
 msgstr "Azbuka (Windows-1251)"
 
-#: src/prefs_send.c:294
+#: src/prefs_send.c:290
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonština (ISO-2022-JP)"
 
-#: src/prefs_send.c:296
+#: src/prefs_send.c:292
 msgid "Japanese (EUC-JP)"
 msgstr "Japonština (EUC-JP)"
 
-#: src/prefs_send.c:297
+#: src/prefs_send.c:293
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonština (Shift_JIS)"
 
-#: src/prefs_send.c:300
+#: src/prefs_send.c:296
 msgid "Simplified Chinese (GB18030)"
 msgstr "Zjednodušená čínština (GB18030)"
 
-#: src/prefs_send.c:301
+#: src/prefs_send.c:297
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_send.c:302
+#: src/prefs_send.c:298
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GBK)"
 
-#: src/prefs_send.c:303
+#: src/prefs_send.c:299
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradiční čínština (Big5)"
 
-#: src/prefs_send.c:305
+#: src/prefs_send.c:301
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradiční čínština (EUC-TW)"
 
-#: src/prefs_send.c:306
+#: src/prefs_send.c:302
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_send.c:309
+#: src/prefs_send.c:305
 msgid "Korean (EUC-KR)"
 msgstr "Korejština (EUC-KR)"
 
-#: src/prefs_send.c:311
+#: src/prefs_send.c:307
 msgid "Thai (TIS-620)"
 msgstr "Thajština (TIS-620)"
 
-#: src/prefs_send.c:312
+#: src/prefs_send.c:308
 msgid "Thai (Windows-874)"
 msgstr "Thajština (Windows-874)"
 
-#: src/prefs_send.c:316
+#: src/prefs_send.c:312
 msgid "Transfer encoding"
 msgstr "Kódování přenosu"
 
-#: src/prefs_send.c:327
+#: src/prefs_send.c:321
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -17261,8 +17750,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:520 src/send_message.c:524
-#: src/send_message.c:529
+#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "Odesílání"
 
@@ -17294,23 +17783,23 @@ msgstr "Znovu zkontrolovat zprávu při změně slovníku"
 msgid "Dictionary"
 msgstr "Slovník"
 
-#: src/prefs_spelling.c:187
+#: src/prefs_spelling.c:181
 msgid "Check with both dictionaries"
 msgstr "Kontrolovat oběma slovníky"
 
-#: src/prefs_spelling.c:194
+#: src/prefs_spelling.c:187
 msgid "Get more dictionaries..."
 msgstr "Získat více slovníků..."
 
-#: src/prefs_spelling.c:204
+#: src/prefs_spelling.c:196
 msgid "Misspelled word color"
 msgstr "Barva špatně napsaných slov"
 
-#: src/prefs_spelling.c:216
+#: src/prefs_spelling.c:208
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Barva pro slova s chybou. Je-li vybrána černá, budou slova podtrhována"
 
-#: src/prefs_spelling.c:333
+#: src/prefs_spelling.c:325
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
@@ -17532,7 +18021,7 @@ msgstr "Potvrzení při změně barevného označení zpráv"
 msgid "Show tooltips"
 msgstr "Zobrazovat tipy"
 
-#: src/prefs_summaries.c:616 src/quote_fmt.c:539
+#: src/prefs_summaries.c:616 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Výchozí"
 
@@ -17620,122 +18109,122 @@ msgstr "nejnovější nový email"
 msgid "newest unread email"
 msgstr "nejnovější nepřečtený email"
 
-#: src/prefs_summary_open.c:189
+#: src/prefs_summary_open.c:188
 msgid "Message selection when entering a folder"
 msgstr "Výběr zpráv při vstupu do složky"
 
-#: src/prefs_summary_open.c:234
+#: src/prefs_summary_open.c:233
 msgid "Available selections"
 msgstr "Možné výběry"
 
-#: src/prefs_summary_open.c:269
+#: src/prefs_summary_open.c:268
 msgid "Current selections"
 msgstr "Aktuální výběry"
 
-#: src/prefs_template.c:80
+#: src/prefs_template.c:79
 msgid "This name is used as the Menu item"
 msgstr "Tato položka je použita jako identifikace šablony v nabídce"
 
-#: src/prefs_template.c:82
+#: src/prefs_template.c:81
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
 msgstr "Přepsání záhlaví Od účtů. Toto nezmění účet."
 
-#: src/prefs_template.c:309
+#: src/prefs_template.c:305
 msgid "Append the new template above to the list"
 msgstr "Přidat novou šablonu do seznamu"
 
-#: src/prefs_template.c:318
+#: src/prefs_template.c:314
 msgid "Replace the selected template in list with the template above"
 msgstr "Nahradit šablonu v seznamu šablonou z hora"
 
-#: src/prefs_template.c:328
+#: src/prefs_template.c:322
 msgid "Delete the selected template from the list"
 msgstr "Odstranit vybrané šablony ze seznamu"
 
-#: src/prefs_template.c:346
+#: src/prefs_template.c:338
 msgid "Show information on configuring templates"
 msgstr "Zobrazit informace o konfiguraci šablon"
 
-#: src/prefs_template.c:370
+#: src/prefs_template.c:362
 msgid "Move the selected template to the top"
 msgstr "Přesunout vybrané šablony nahoru"
 
-#: src/prefs_template.c:380
+#: src/prefs_template.c:372
 msgid "Move the selected template up"
 msgstr "Posunout vybranou šablonu nahoru"
 
-#: src/prefs_template.c:388
+#: src/prefs_template.c:380
 msgid "Move the selected template down"
 msgstr "Posunout vybranou šablonu dolů"
 
-#: src/prefs_template.c:398
+#: src/prefs_template.c:390
 msgid "Move the selected template to the bottom"
 msgstr "Přesunout vybrané šablony dolů"
 
-#: src/prefs_template.c:414
+#: src/prefs_template.c:406
 msgid "Template configuration"
 msgstr "Nastavení šablon"
 
-#: src/prefs_template.c:602
+#: src/prefs_template.c:595
 msgid "Templates list not saved"
 msgstr "Seznam šablon neuložen"
 
-#: src/prefs_template.c:603
+#: src/prefs_template.c:596
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Seznam šablon změněn. Chcete přesto zavřít?"
 
-#: src/prefs_template.c:760
+#: src/prefs_template.c:753
 msgid "The template's name is not set."
 msgstr "Název šablony není nastaven."
 
-#: src/prefs_template.c:803
+#: src/prefs_template.c:796
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Pole \"Od\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:809
+#: src/prefs_template.c:802
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Pole \"Komu\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:815
+#: src/prefs_template.c:808
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Pole \"Kopie\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:821
+#: src/prefs_template.c:814
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Pole \"Skrytá kopie\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:827
+#: src/prefs_template.c:820
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "Pole \"Komu\" šablony obsahuje neplatnou emailovou adresu."
 
-#: src/prefs_template.c:833
+#: src/prefs_template.c:826
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Pole \"Předmět\" šablony je neplatné."
 
-#: src/prefs_template.c:904
+#: src/prefs_template.c:897
 msgid "Delete template"
 msgstr "Odstranit šablonu"
 
-#: src/prefs_template.c:905
+#: src/prefs_template.c:898
 msgid "Do you really want to delete this template?"
 msgstr "Opravdu chcete odstranit tuto šablonu?"
 
-#: src/prefs_template.c:917
+#: src/prefs_template.c:910
 msgid "Delete all templates"
 msgstr "Odstranit všechny šablony"
 
-#: src/prefs_template.c:918
+#: src/prefs_template.c:911
 msgid "Do you really want to delete all the templates?"
 msgstr "Opravdu chcete odstranit všechny šablony?"
 
-#: src/prefs_template.c:1234
+#: src/prefs_template.c:1225
 msgid "Current templates"
 msgstr "Aktuální šablony"
 
-#: src/prefs_template.c:1262
+#: src/prefs_template.c:1253
 msgid "Template"
 msgstr "Šablona"
 
@@ -17877,35 +18366,35 @@ msgstr "Instalovat nový..."
 msgid "Get more..."
 msgstr "Získat další..."
 
-#: src/prefs_themes.c:983
+#: src/prefs_themes.c:984
 msgid "Information"
 msgstr "Informace"
 
-#: src/prefs_themes.c:998
+#: src/prefs_themes.c:999
 msgid "Author"
 msgstr "Autor"
 
-#: src/prefs_themes.c:1006
+#: src/prefs_themes.c:1005
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1048
+#: src/prefs_themes.c:1043
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/prefs_themes.c:1105
+#: src/prefs_themes.c:1107
 msgid "SVG rendering"
 msgstr "SVG renderování"
 
-#: src/prefs_themes.c:1112
+#: src/prefs_themes.c:1114
 msgid "Enable alpha channel"
 msgstr "Povolit alfa kanál"
 
-#: src/prefs_themes.c:1113
+#: src/prefs_themes.c:1115
 msgid "Force scaling"
 msgstr "Přesto změnit velikost"
 
-#: src/prefs_themes.c:1119
+#: src/prefs_themes.c:1121
 msgid "Pixels per inch (PPI)"
 msgstr "Pixelů na inch (PPI)"
 
@@ -17929,63 +18418,59 @@ msgstr "Položka nemá definován žádný text."
 msgid "Toolbar item"
 msgstr "Položka nástrojové lišty"
 
-#: src/prefs_toolbar.c:912
+#: src/prefs_toolbar.c:913
 msgid "Item type"
 msgstr "Typ položky"
 
-#: src/prefs_toolbar.c:922
+#: src/prefs_toolbar.c:921
 msgid "Internal Function"
 msgstr "Vnitřní funkce"
 
-#: src/prefs_toolbar.c:923
+#: src/prefs_toolbar.c:922
 msgid "User Action"
 msgstr "Uživatelské akce"
 
-#: src/prefs_toolbar.c:925 src/toolbar.c:279
+#: src/prefs_toolbar.c:924 src/toolbar.c:279
 msgid "Separator"
 msgstr "Separátor"
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:929
 msgid "Event executed on click"
 msgstr "Událost spuštěná po klepnutí"
 
-#: src/prefs_toolbar.c:959
+#: src/prefs_toolbar.c:948
 msgid "Toolbar text"
 msgstr "Text nástrojové lišty"
 
-#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
+#: src/prefs_toolbar.c:961 src/prefs_toolbar.c:1336
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/prefs_toolbar.c:1010
-msgid "A_dd"
-msgstr "Při_dat"
-
-#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
+#: src/prefs_toolbar.c:1215 src/prefs_toolbar.c:1229 src/prefs_toolbar.c:1243
 msgid "Toolbars"
 msgstr "Nástrojová lišta"
 
-#: src/prefs_toolbar.c:1231
+#: src/prefs_toolbar.c:1216
 msgid "Main Window"
 msgstr "Hlavní okno"
 
-#: src/prefs_toolbar.c:1245
+#: src/prefs_toolbar.c:1230
 msgid "Message Window"
 msgstr "Okno zpráv"
 
-#: src/prefs_toolbar.c:1259
+#: src/prefs_toolbar.c:1244
 msgid "Compose Window"
 msgstr "Okno pro psaní zprávy"
 
-#: src/prefs_toolbar.c:1374
+#: src/prefs_toolbar.c:1359
 msgid "Icon text"
 msgstr "Text ikony"
 
-#: src/prefs_toolbar.c:1383
+#: src/prefs_toolbar.c:1368
 msgid "Mapped event"
 msgstr "Namapovaná událost"
 
-#: src/prefs_toolbar.c:1690
+#: src/prefs_toolbar.c:1675
 msgid "Toolbar item icon"
 msgstr "Ikony nástrojové lišty"
 
@@ -18013,35 +18498,35 @@ msgstr "Zalomit text v"
 msgid "Wrapping"
 msgstr "Zalamování"
 
-#: src/printing.c:431
+#: src/printing.c:436
 msgid "Print preview"
 msgstr "Náhled"
 
-#: src/printing.c:474
+#: src/printing.c:480
 msgid "First page"
 msgstr "První stránka"
 
-#: src/printing.c:484
+#: src/printing.c:490
 msgid "Last page"
 msgstr "Poslední stránka"
 
-#: src/printing.c:490
+#: src/printing.c:496
 msgid "Zoom 100%"
 msgstr "Zobrazit 100%"
 
-#: src/printing.c:492
+#: src/printing.c:498
 msgid "Zoom fit"
 msgstr "Přizpůsobit"
 
-#: src/printing.c:494
+#: src/printing.c:500
 msgid "Zoom in"
 msgstr "Zvětšit"
 
-#: src/printing.c:496
+#: src/printing.c:502
 msgid "Zoom out"
 msgstr "Zmenšit"
 
-#: src/printing.c:676
+#: src/printing.c:700
 #, c-format
 msgid "Page %d"
 msgstr "Stránka %d"
@@ -18058,7 +18543,7 @@ msgstr "Nejsou definovány klíče příjemce."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba při dekódování BASE64]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2797
 msgid "Could not decode part"
 msgstr "Nelze dekódovat část"
 
@@ -18111,135 +18596,135 @@ msgstr "Nastala chyba při posílání zprávy do %s."
 msgid "Filtering messages...\n"
 msgstr "Filtruji zprávy...\n"
 
-#: src/quote_fmt.c:47
+#: src/quote_fmt.c:46
 msgid "<span weight=\"bold\">symbols:</span>"
 msgstr "<span weight=\"bold\">symboly:</span>"
 
-#: src/quote_fmt.c:48
+#: src/quote_fmt.c:47
 msgid "customized date format (see 'man strftime')"
 msgstr "vlastní formát data (viz 'man strftime')"
 
-#: src/quote_fmt.c:51
+#: src/quote_fmt.c:50
 msgid "email address of sender"
 msgstr "emailová adresa odesílatele"
 
-#: src/quote_fmt.c:52
+#: src/quote_fmt.c:51
 msgid "full name of sender"
 msgstr "celé jméno odesílatele"
 
-#: src/quote_fmt.c:53
+#: src/quote_fmt.c:52
 msgid "first name of sender"
 msgstr "jméno odesílatele"
 
-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:53
 msgid "last name of sender"
 msgstr "příjmení odesílatele"
 
-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:54
 msgid "initials of sender"
 msgstr "iniciály odesílatele"
 
-#: src/quote_fmt.c:62
+#: src/quote_fmt.c:61
 msgid "message body"
 msgstr "tělo zprávy"
 
-#: src/quote_fmt.c:63
+#: src/quote_fmt.c:62
 msgid "quoted message body"
 msgstr "tělo citované zprávy"
 
-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:63
 msgid "message body without signature"
 msgstr "tělo zprávy bez podpisu"
 
-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:64
 msgid "quoted message body without signature"
 msgstr "tělo citované zprávy bez podpisu"
 
-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:65
 msgid "message tags"
 msgstr "značky zprávy"
 
-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:66
 msgid "current dictionary"
 msgstr "aktuální slovník"
 
-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:67
 msgid "cursor position"
 msgstr "pozice kurzoru"
 
-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:68
 msgid "account property: your name"
 msgstr "nastavení účtu: vaše jméno"
 
-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:69
 msgid "account property: your email address"
 msgstr "nastavení účtu: vaše e-mailová adresa"
 
-#: src/quote_fmt.c:71
+#: src/quote_fmt.c:70
 msgid "account property: account name"
 msgstr "nastavení účtu: název účtu"
 
-#: src/quote_fmt.c:72
+#: src/quote_fmt.c:71
 msgid "account property: organization"
 msgstr "nastavení účtu: organizace"
 
-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:72
 msgid "account property: signature"
 msgstr "nastavení účtu: podpis"
 
-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:73
 msgid "account property: signature path"
 msgstr "nastavení účtu: cesta k podpisu"
 
-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:74
 msgid "account property: default dictionary"
 msgstr "nastavení účtu: výchozí slovník"
 
-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:75
 msgid "address book <span style=\"oblique\">completion</span>: Cc"
 msgstr "kniha adres <span style=\"oblique\">kompletace</span>: Kopie"
 
-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:76
 msgid "address book <span style=\"oblique\">completion</span>: From"
 msgstr "kniha adres <span style=\"oblique\">kompletace</span>: Od"
 
-#: src/quote_fmt.c:78
+#: src/quote_fmt.c:77
 msgid "address book <span style=\"oblique\">completion</span>: To"
 msgstr "kniha adres <span style=\"oblique\">kompletace</span>: Komu"
 
-#: src/quote_fmt.c:80
+#: src/quote_fmt.c:79
 msgid "literal backslash"
 msgstr "znak - zpětné lomítko \\"
 
-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:80
 msgid "literal question mark"
 msgstr "znak otazníku"
 
-#: src/quote_fmt.c:82
+#: src/quote_fmt.c:81
 msgid "literal exclamation mark"
 msgstr "znak - vykřičník"
 
-#: src/quote_fmt.c:83
+#: src/quote_fmt.c:82
 msgid "literal pipe"
 msgstr "\"roura\" - znak |"
 
-#: src/quote_fmt.c:84
+#: src/quote_fmt.c:83
 msgid "literal opening curly brace"
 msgstr "znak { - levá složená závorka"
 
-#: src/quote_fmt.c:85
+#: src/quote_fmt.c:84
 msgid "literal closing curly brace"
 msgstr "pravá složená závorka - znak }"
 
-#: src/quote_fmt.c:86
+#: src/quote_fmt.c:85
 msgid "tab"
 msgstr "tabulátor"
 
-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:88
 msgid "<span weight=\"bold\">commands:</span>"
 msgstr "<span weight=\"bold\">příkazy:</span>"
 
-#: src/quote_fmt.c:90
+#: src/quote_fmt.c:89
 msgid ""
 "insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
@@ -18250,7 +18735,7 @@ msgstr ""
 "z [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbolů (nebo jejich dlouhých ekvivalentů)"
 
-#: src/quote_fmt.c:91
+#: src/quote_fmt.c:90
 msgid ""
 "insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
 "of\n"
@@ -18262,7 +18747,7 @@ msgstr ""
 "z [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbolů (nebo jejich dlouhých ekvivalentů)"
 
-#: src/quote_fmt.c:92
+#: src/quote_fmt.c:91
 msgid ""
 "insert file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
@@ -18272,7 +18757,7 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> je vyhodnoceno jako cesta k souboru "
 "pro vložení"
 
-#: src/quote_fmt.c:93
+#: src/quote_fmt.c:92
 msgid ""
 "insert program output:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
@@ -18283,7 +18768,7 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> je vyhodnoceno jako konzole,\n"
 "pro výstup"
 
-#: src/quote_fmt.c:94
+#: src/quote_fmt.c:93
 msgid ""
 "insert user input:\n"
 "<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
@@ -18293,7 +18778,7 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> je proměnná, která bude nahrazena\n"
 "textem vloženým uživatelem"
 
-#: src/quote_fmt.c:95
+#: src/quote_fmt.c:94
 msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
@@ -18303,7 +18788,7 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> je vyhodnoceno jako cesta k souboru "
 "pro připojení"
 
-#: src/quote_fmt.c:96
+#: src/quote_fmt.c:95
 msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
@@ -18314,11 +18799,11 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> je vyhodnoceno jako konzole,\n"
 "pro získání jména"
 
-#: src/quote_fmt.c:98
+#: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
 msgstr "<span weight=\"bold\">definice podmínek:</span>"
 
-#: src/quote_fmt.c:99
+#: src/quote_fmt.c:98
 msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
@@ -18326,7 +18811,7 @@ msgstr ""
 "text, který může obsahovat libovolné výše uvedené symboly nebo\n"
 "příkaz"
 
-#: src/quote_fmt.c:100
+#: src/quote_fmt.c:99
 msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
@@ -18334,7 +18819,7 @@ msgstr ""
 "text, který může obsahovat libovolné výše uvedené symboly(ne\n"
 "příkazy)"
 
-#: src/quote_fmt.c:101
+#: src/quote_fmt.c:100
 msgid ""
 "completion from address book only works with the first\n"
 "address of the header, it outputs the full name\n"
@@ -18346,19 +18831,19 @@ msgstr ""
 "kontaktu, jestliže adresa přesně odpovídá\n"
 "kontaktu v knize adres"
 
-#: src/quote_fmt.c:110
+#: src/quote_fmt.c:109
 msgid "Description of symbols"
 msgstr "Popis symbolů"
 
-#: src/quote_fmt.c:111
+#: src/quote_fmt.c:110
 msgid "The following symbols and commands can be used:"
 msgstr "Následující symboly a příkazy mohou být použity:"
 
-#: src/quote_fmt.c:174
+#: src/quote_fmt.c:173
 msgid "Use template when composing new messages"
 msgstr "Použít šablonu pro novou zprávu"
 
-#: src/quote_fmt.c:197
+#: src/quote_fmt.c:196
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
@@ -18372,33 +18857,33 @@ msgstr "Použít šablonu pro odpověď na zprávu"
 msgid "Override From header. This doesn't change the account used to reply."
 msgstr "Přepsat záhlaví Od. Nezmění účet používaný pro odpovědi."
 
-#: src/quote_fmt.c:331 src/quote_fmt.c:459
+#: src/quote_fmt.c:331 src/quote_fmt.c:460
 msgid "Quotation mark"
 msgstr "Značka pro citaci"
 
-#: src/quote_fmt.c:425
+#: src/quote_fmt.c:426
 msgid "Use template when forwarding messages"
 msgstr "Použít šablonu pro předanou zprávu"
 
-#: src/quote_fmt.c:448
+#: src/quote_fmt.c:449
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr "Přepsat záhlaví Od. Nezmění účet používaný pro přeposlání."
 
-#: src/quote_fmt.c:557
+#: src/quote_fmt.c:559
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
 msgstr "Pole \"Od\" šablony \"Napsat\" obsahuje neplatnou emailovou adresu."
 
-#: src/quote_fmt.c:560
+#: src/quote_fmt.c:562
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr "Pole \"Předmět\" šablony \"Napsat\" je neplatné."
 
-#: src/quote_fmt.c:577
+#: src/quote_fmt.c:579
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr "Pole \"Značka pro citaci\" šablony \"Odpovědět\" je neplatné."
 
-#: src/quote_fmt.c:597
+#: src/quote_fmt.c:599
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "Pole \"Značka pro citaci\" šablony \"Předat\" je neplatné."
 
@@ -18411,88 +18896,88 @@ msgstr "Vložte text pro nahrazení '%s'"
 msgid "Enter variable"
 msgstr "Zadání proměnných"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Posílám zprávu pomocí příkazu: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nemohu provést příkaz: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Nastala chyba během provádění příkazu: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "Připojení"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "Provádím POP před SMTP..."
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "POP před SMTP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, 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:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "Pošta byla úspěšně odeslána."
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "Posílám HELO..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "Autentizuji"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "Posílám zprávu..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "Posílám EHLO..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "Posílám MAIL FROM..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "Posílám RCPT TO..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "Posílám DATA..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "Ukončuji..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "Posílám zprávu"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "Nastala chyba při posílání zprávy."
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18534,270 +19019,270 @@ msgstr "Vyprší"
 msgid "Saved SSL/TLS certificates"
 msgstr "Uložené SSL/TLS certifikáty"
 
-#: src/ssl_manager.c:445
+#: src/ssl_manager.c:446
 msgid "Delete certificate"
 msgstr "Odstranit certifikát"
 
-#: src/ssl_manager.c:446
+#: src/ssl_manager.c:447
 msgid "Do you really want to delete this certificate?"
 msgstr "Opravdu chcete odstranit tento certifikát?"
 
-#: src/summary_search.c:290
+#: src/summary_search.c:288
 msgid "Search messages"
 msgstr "Hledat zprávy v aktuální složce"
 
-#: src/summary_search.c:313
+#: src/summary_search.c:311
 msgid "Match any of the following"
 msgstr "Zprávy splňující KTEROUKOLI podmínku"
 
-#: src/summary_search.c:315
+#: src/summary_search.c:313
 msgid "Match all of the following"
 msgstr "Zprávy splňující VŠECHNY podmínky"
 
-#: src/summary_search.c:436
+#: src/summary_search.c:441
 msgid "Body:"
 msgstr "Tělo:"
 
-#: src/summary_search.c:443
+#: src/summary_search.c:447
 msgid "Condition:"
 msgstr "Podmínka:"
 
-#: src/summary_search.c:477
+#: src/summary_search.c:480
 msgid "Find _all"
 msgstr "Najít _všechny"
 
-#: src/summary_search.c:692 src/summaryview.c:1148 src/summaryview.c:1411
+#: src/summary_search.c:696 src/summaryview.c:1134 src/summaryview.c:1397
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Hledám v %s... \n"
 
-#: src/summary_search.c:787
+#: src/summary_search.c:791
 msgid "Beginning of list reached; continue from end?"
 msgstr "Dosažen začátek seznamu, pokračovat od konce?"
 
-#: src/summary_search.c:789
+#: src/summary_search.c:793
 msgid "End of list reached; continue from beginning?"
 msgstr "Dosažen konec seznamu, pokračovat od začátku?"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:425
 msgid "Re-edit"
 msgstr "Znovu upravit"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:438
 msgid "Create _filter rule"
 msgstr "Vytvořit pravidlo _filtru"
 
-#: src/summaryview.c:456
+#: src/summaryview.c:451
 msgid "_Set displayed columns"
 msgstr "Zobrazované _sloupce"
 
-#: src/summaryview.c:461
+#: src/summaryview.c:456
 msgid "_Lock column headers"
 msgstr "_Zamknout záhlaví sloupců"
 
-#: src/summaryview.c:598
+#: src/summaryview.c:593
 msgid "Toggle quick search bar"
 msgstr "Přepnout panel rychlého vyhledávání"
 
-#: src/summaryview.c:635
+#: src/summaryview.c:630
 msgid "Toggle multiple selection"
 msgstr "Přepnout násobný výběr"
 
-#: src/summaryview.c:1339
+#: src/summaryview.c:1325
 msgid "Process mark"
 msgstr "Zpracovat označené"
 
-#: src/summaryview.c:1340
+#: src/summaryview.c:1326
 msgid "Some marks are left. Process them?"
 msgstr "Zbyly nějaké označené. Zpracovat je?"
 
-#: src/summaryview.c:1390
+#: src/summaryview.c:1376
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prohledávám složku (%s)..."
 
-#: src/summaryview.c:1950 src/summaryview.c:1998
+#: src/summaryview.c:1937 src/summaryview.c:1985
 msgid "No more unread messages"
 msgstr "Nejsou další nepřečtené zprávy"
 
-#: src/summaryview.c:1951
+#: src/summaryview.c:1938
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1963 src/summaryview.c:2011 src/summaryview.c:2048
-#: src/summaryview.c:2096 src/summaryview.c:2163
+#: src/summaryview.c:1950 src/summaryview.c:1998 src/summaryview.c:2035
+#: src/summaryview.c:2083 src/summaryview.c:2150
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Interní chyba: neočekávaná hodnota pro prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1975
+#: src/summaryview.c:1962
 msgid "No unread messages."
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/summaryview.c:1999
+#: src/summaryview.c:1986
 msgid "No unread message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:2035 src/summaryview.c:2083
+#: src/summaryview.c:2022 src/summaryview.c:2070
 msgid "No more new messages"
 msgstr "Nejsou další nové zprávy"
 
-#: src/summaryview.c:2036
+#: src/summaryview.c:2023
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena nová zpráva. Hledat od konce?"
 
-#: src/summaryview.c:2060
+#: src/summaryview.c:2047
 msgid "No new messages."
 msgstr "Žádné nové zprávy."
 
-#: src/summaryview.c:2084
+#: src/summaryview.c:2071
 msgid "No new message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nová zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:2117 src/summaryview.c:2150
+#: src/summaryview.c:2104 src/summaryview.c:2137
 msgid "No more marked messages"
 msgstr "Nejsou další označené zprávy"
 
-#: src/summaryview.c:2118
+#: src/summaryview.c:2105
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena žádná označená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:2127
+#: src/summaryview.c:2114
 msgid "No marked messages."
 msgstr "Žádné označené zprávy."
 
-#: src/summaryview.c:2151
+#: src/summaryview.c:2138
 msgid "No marked message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná označená zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:2184 src/summaryview.c:2213
+#: src/summaryview.c:2171 src/summaryview.c:2200
 msgid "No more labeled messages"
 msgstr "Nejsou další obarvené zprávy"
 
-#: src/summaryview.c:2185
+#: src/summaryview.c:2172
 msgid "No labeled message found. Search from the end?"
 msgstr "Nebyla nalezena žádná obarvená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:2194 src/summaryview.c:2227
+#: src/summaryview.c:2181 src/summaryview.c:2214
 msgid "No labeled messages."
 msgstr "Žádné obarvené zprávy."
 
-#: src/summaryview.c:2214
+#: src/summaryview.c:2201
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nebyla nalezena žádná obarvená zpráva. Hledat od začátku?"
 
-#: src/summaryview.c:2537
+#: src/summaryview.c:2524
 msgid "Attracting messages by subject..."
 msgstr "Seskupuji zprávy dle předmětu..."
 
-#: src/summaryview.c:2722
+#: src/summaryview.c:2712
 #, c-format
 msgid "%d deleted"
 msgstr "%d odstraněno"
 
-#: src/summaryview.c:2726
+#: src/summaryview.c:2716
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d přemístěno"
 
-#: src/summaryview.c:2727 src/summaryview.c:2734
+#: src/summaryview.c:2717 src/summaryview.c:2724
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2732
+#: src/summaryview.c:2722
 #, c-format
 msgid "%s%d copied"
 msgstr "%s %d zkopírováno"
 
-#: src/summaryview.c:2746
+#: src/summaryview.c:2736
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " položka vybrána"
 msgstr[1] " položky vybrány"
 msgstr[2] " položek vybráno"
 
-#: src/summaryview.c:2764 src/summaryview.c:2809
+#: src/summaryview.c:2754 src/summaryview.c:2799
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nová(é), %d nepřečtená(é), celkem %d (%s)"
 
-#: src/summaryview.c:2784
+#: src/summaryview.c:2774
 msgid "Message summary"
 msgstr "Shrnutí zprávy"
 
-#: src/summaryview.c:2785
+#: src/summaryview.c:2775
 msgid "New:"
 msgstr "Nové:"
 
-#: src/summaryview.c:2786
+#: src/summaryview.c:2776
 msgid "Unread:"
 msgstr "Nepřečtené:"
 
-#: src/summaryview.c:2787
+#: src/summaryview.c:2777
 msgid "Total:"
 msgstr "Celkem:"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2779
 msgid "Marked:"
 msgstr "Označené:"
 
-#: src/summaryview.c:2790
+#: src/summaryview.c:2780
 msgid "Replied:"
 msgstr "Odpovězené:"
 
-#: src/summaryview.c:2791
+#: src/summaryview.c:2781
 msgid "Forwarded:"
 msgstr "Předané:"
 
-#: src/summaryview.c:2792
+#: src/summaryview.c:2782
 msgid "Locked:"
 msgstr "Zamknuté:"
 
-#: src/summaryview.c:2793
+#: src/summaryview.c:2783
 msgid "Ignored:"
 msgstr "Ignorované:"
 
-#: src/summaryview.c:2794
+#: src/summaryview.c:2784
 msgid "Watched:"
 msgstr "Sledováné:"
 
-#: src/summaryview.c:2804
+#: src/summaryview.c:2794
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d vybráno (%s/%s), %d nepřečteno"
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3082
 msgid "Sorting summary..."
 msgstr "Celkové setřídění..."
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3250
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:3471
+#: src/summaryview.c:3456
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
-#: src/summaryview.c:3528
+#: src/summaryview.c:3513
 msgid "(No Recipient)"
 msgstr "(Žádný příjemce)"
 
-#: src/summaryview.c:3576
+#: src/summaryview.c:3561
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Od: %s, na %s"
 
-#: src/summaryview.c:3585
+#: src/summaryview.c:3570
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Pro: %s, na %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4455
 msgid "You're not the author of the article."
 msgstr "Nejste autorem tohoto článku."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4545
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -18805,84 +19290,84 @@ msgstr[0] "Opravdu chcete odstranit vybranou zprávu?"
 msgstr[1] "Opravdu chcete odstranit %d vybrané zprávy?"
 msgstr[2] "Opravdu chcete odstranit %d vybraných zpráv?"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4548
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Odstranit zprávu"
 msgstr[1] "Odstranit zprávy"
 msgstr[2] "Odstranit zprávy"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4712
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4767
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Vybrat složku pro přesunutí vybrané zprávy"
 msgstr[1] "Vybrat složku pro přesunutí vybrané zprávy"
 msgstr[2] "Vybrat složku pro přesunutí vybrané zprávy"
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4818
 msgid "Destination to copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4852
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Vybrat složku pro kopírování vybrané zprávy"
 msgstr[1] "Vybrat složku pro kopírování vybrané zprávy"
 msgstr[2] "Vybrat složku pro kopírování vybrané zprávy"
 
-#: src/summaryview.c:5036
+#: src/summaryview.c:5010
 msgid "Append or Overwrite"
 msgstr "Přidat nebo přepsat"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5011
 msgid "Append or overwrite existing file?"
 msgstr "Přidat nebo přepsat existující soubor?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5012
 msgid "_Append"
 msgstr "_Přidat"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5012
 msgid "_Overwrite"
 msgstr "Př_epsat"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5023 src/summaryview.c:5026 src/summaryview.c:5041
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5061
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 "Chystáte se vytisknout okolo %d zpráv postupně po jedné. Chcete pokračovat?"
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5519
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5767
 msgid "Skip these rules"
 msgstr "Přeskočit"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5770
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplikovat bez ohledu na účet ke kterému jsou přiřazena"
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5773
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplikovat, jsou-li přiřazena k aktuálnímu účtu"
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5802
 msgid "Filtering"
 msgstr "Filtrování"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5803
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18890,71 +19375,71 @@ msgstr ""
 "Některá filtrovací pravidla jsou přiřazena specifickým účtům.\n"
 "Zvolte prosím způsob aplikace těchto pravidel:"
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5835
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5918
 msgid "Processing configuration"
 msgstr "Zpracovávám nastavení"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6068
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "Opravdu chcete resetovat barevné označení pro všechny vybrané zprávy?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6070
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr "Opravdu chcete použít barevné označení pro všechny vybrané zprávy?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6071
 msgid "Reset color label"
 msgstr "Obnovit barevného označení"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6071
 msgid "Set color label"
 msgstr "Nastavit barevného označení"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6512
 msgid "Ignored thread"
 msgstr "Ignorované vlákno"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6514
 msgid "Watched thread"
 msgstr "Sledované vlákno"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6522
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpovězeno ale také přeposláno - klikněte pro zobrazení odpovědi"
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6524
 msgid "Replied - click to see reply"
 msgstr "Odpovězeno - klikněte pro zobrazení odpovědi"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6536
 msgid "To be moved"
 msgstr "K přesunutí"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6538
 msgid "To be copied"
 msgstr "Bude zkopírováno"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6550
 msgid "Signed, has attachment(s)"
 msgstr "Zpráva je podepsaná a má přílohu/přílohy"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6554
 msgid "Encrypted, has attachment(s)"
 msgstr "Zpráva je šifrovaná a má přílohu/přílohy"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6556
 msgid "Encrypted"
 msgstr "Šifrovaná zpráva"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6558
 msgid "Has attachment(s)"
 msgstr "Má přílohu/přílohy"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8269
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18963,45 +19448,45 @@ msgstr ""
 "Chyba v regulárním výrazu (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8372
 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:8403
+#: src/summaryview.c:8377
 msgid "Go back to the folder list"
 msgstr "Přejít zpět na seznam složek"
 
-#: src/textview.c:242
+#: src/textview.c:218
 msgid "_Open in web browser"
 msgstr "_Otevřít ve webovém prohlížeči"
 
-#: src/textview.c:243
+#: src/textview.c:219
 msgid "Copy this _link"
 msgstr "_Kopírovat odkaz"
 
-#: src/textview.c:250
+#: src/textview.c:226
 msgid "_Reply to this address"
 msgstr "_Odpovědět na tuto adresu"
 
-#: src/textview.c:251
+#: src/textview.c:227
 msgid "Add to _Address book"
 msgstr "Přidat do knihy _adres"
 
-#: src/textview.c:252
+#: src/textview.c:228
 msgid "Copy this add_ress"
 msgstr "_Kopírovat tuto adresu"
 
-#: src/textview.c:702
+#: src/textview.c:666
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d B)]"
 
-#: src/textview.c:705
+#: src/textview.c:669
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d B)]"
 
-#: src/textview.c:875
+#: src/textview.c:839
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19015,67 +19500,67 @@ msgstr ""
 "\n"
 "  Použijte "
 
-#: src/textview.c:880
+#: src/textview.c:844
 msgid "'Network Log'"
 msgstr "'Záznam o připojení'"
 
-#: src/textview.c:881
+#: src/textview.c:845
 msgid " in the Tools menu for more information."
 msgstr " v menu Nástroje pro více informací."
 
-#: src/textview.c:947
+#: src/textview.c:911
 msgid "  The following can be performed on this part\n"
 msgstr "  Následující může být povedeno v této části\n"
 
-#: src/textview.c:949
+#: src/textview.c:913
 msgid "  by right-clicking the icon or list item:"
 msgstr "  po pravém kliknutí na ikonu nebo položku seznamu:"
 
-#: src/textview.c:953
+#: src/textview.c:917
 msgid "     - To save, select "
 msgstr "     - Uložit pomocí "
 
-#: src/textview.c:954
+#: src/textview.c:918
 msgid "'Save as...'"
 msgstr "'Uložit jako...'"
 
-#: src/textview.c:956 src/textview.c:968 src/textview.c:980 src/textview.c:990
+#: src/textview.c:920 src/textview.c:932 src/textview.c:944 src/textview.c:954
 msgid " (Shortcut key: '"
 msgstr " (Klávesová zkratka: '"
 
-#: src/textview.c:964
+#: src/textview.c:928
 msgid "     - To display as text, select "
 msgstr "     - Zobrazit jako text pomocí "
 
-#: src/textview.c:965
+#: src/textview.c:929
 msgid "'Display as text'"
 msgstr "'Zobrazit jako text'"
 
-#: src/textview.c:976
+#: src/textview.c:940
 msgid "     - To open with an external program, select "
 msgstr "     - Otevřít externím programem pomocí "
 
-#: src/textview.c:977
+#: src/textview.c:941
 msgid "'Open'"
 msgstr "'Otevřít'"
 
-#: src/textview.c:985
+#: src/textview.c:949
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (nebo klikněte dvakrát či klikněte prostředním "
 
-#: src/textview.c:986
+#: src/textview.c:950
 msgid "mouse button)\n"
 msgstr "tlačítkem myši)\n"
 
-#: src/textview.c:988
+#: src/textview.c:952
 msgid "     - Or use "
 msgstr "     - Nebo použijte "
 
-#: src/textview.c:989
+#: src/textview.c:953
 msgid "'Open with...'"
 msgstr "'Otevřít čím...'"
 
-#: src/textview.c:1111
+#: src/textview.c:1075
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -19086,31 +19571,31 @@ msgstr ""
 "    %s\n"
 "Návratový kód %d\n"
 
-#: src/textview.c:2195
+#: src/textview.c:2159
 msgid "Tags: "
 msgstr "Značky: "
 
-#: src/textview.c:2914
+#: src/textview.c:2876
 msgid "The real URL is different from the displayed URL."
 msgstr "Skutečné URL se liší od zobrazeného."
 
-#: src/textview.c:2915
+#: src/textview.c:2877
 msgid "Displayed URL:"
 msgstr "Zobrazované URL:"
 
-#: src/textview.c:2916
+#: src/textview.c:2878
 msgid "Real URL:"
 msgstr "Reálná URL:"
 
-#: src/textview.c:2917
+#: src/textview.c:2879
 msgid "Open it anyway?"
 msgstr "Přesto otevřít?"
 
-#: src/textview.c:2918
+#: src/textview.c:2880
 msgid "Phishing attempt warning"
 msgstr "Upozornění na možný pokus o podvrh"
 
-#: src/textview.c:2919
+#: src/textview.c:2881
 msgid "_Open URL"
 msgstr "_Otevřít URL"
 
@@ -19485,24 +19970,24 @@ msgstr "Odpovědět do konference"
 msgid "Forward Message options"
 msgstr "Předat zprávu"
 
-#: src/uri_opener.c:87
+#: src/uri_opener.c:85
 msgid "There are no URLs in this email."
 msgstr "V této zprávě nejsou žádné odkazy."
 
-#: src/uri_opener.c:115
+#: src/uri_opener.c:113
 msgid "Available URLs:"
 msgstr "Dostupné odkazy:"
 
-#: src/uri_opener.c:189
+#: src/uri_opener.c:187
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "Otevřít odkaz"
 
-#: src/uri_opener.c:217
+#: src/uri_opener.c:215
 msgid "Please select the URL to open."
 msgstr "Vyberte odkaz, který chcete otevřít."
 
-#: src/uri_opener.c:225
+#: src/uri_opener.c:223
 msgid "Select All"
 msgstr "Vybrat vše"
 
@@ -19629,11 +20114,11 @@ msgstr "Prosím uveďte jméno SMTP serveru."
 msgid "Please enter your SMTP username."
 msgstr "Prosím uveďte přihlašovací jméno pro SMTP server."
 
-#: src/wizard.c:976
+#: src/wizard.c:974
 msgid "Your name:"
 msgstr "Vaše jméno:"
 
-#: src/wizard.c:987
+#: src/wizard.c:986
 msgid "Your email address:"
 msgstr "Vaše mailové adresa:"
 
@@ -19645,28 +20130,28 @@ msgstr "Vaše organizace:"
 msgid "Mailbox name:"
 msgstr "Mailbox jméno:"
 
-#: src/wizard.c:1040
+#: src/wizard.c:1039
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 "Je možno nastavit úplnou cestu, například \"/home/john/Documents/Mail\""
 
-#: src/wizard.c:1111
+#: src/wizard.c:1109
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr "Můžete specifikovat číslo portu: \"mail.example.com:25\""
 
-#: src/wizard.c:1114
+#: src/wizard.c:1112
 msgid "SMTP server address:"
 msgstr "Adresa SMTP server:"
 
-#: src/wizard.c:1129
+#: src/wizard.c:1127
 msgid "(empty to use the same as receive)"
 msgstr "(prázdné pro použití téhož jako pro příjem)"
 
-#: src/wizard.c:1143
+#: src/wizard.c:1142
 msgid "SMTP username:"
 msgstr "SMTP uživatelské jméno:"
 
@@ -19674,53 +20159,53 @@ msgstr "SMTP uživatelské jméno:"
 msgid "SMTP password:"
 msgstr "SMTP heslo:"
 
-#: src/wizard.c:1167
+#: src/wizard.c:1169
 msgid "Use SSL/TLS to connect to SMTP server"
 msgstr "Použít SSL/TLS pro připojení k SMTP serveru"
 
-#: src/wizard.c:1178 src/wizard.c:1598
+#: src/wizard.c:1180 src/wizard.c:1609
 msgid "Use STARTTLS command to start encryption"
 msgstr "Použít příkaz STARTTLS pro spuštění šifrování"
 
-#: src/wizard.c:1190 src/wizard.c:1610
+#: src/wizard.c:1192 src/wizard.c:1622
 msgid "Client SSL/TLS certificate (optional)"
 msgstr "Klientský SSL/TLS certifikát (volitelné)"
 
-#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
+#: src/wizard.c:1267 src/wizard.c:1299 src/wizard.c:1552
 msgid "Server address:"
 msgstr "Adresu serveru:"
 
-#: src/wizard.c:1322
+#: src/wizard.c:1331
 msgid "Local mailbox:"
 msgstr "Lokální mailbox:"
 
-#: src/wizard.c:1491
+#: src/wizard.c:1499
 msgid "Server type:"
 msgstr "Typ serveru:"
 
-#: src/wizard.c:1500
+#: src/wizard.c:1508
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1556
+#: src/wizard.c:1563
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr "Můžete specifikovat číslo portu: \"mail.example.com:110\""
 
-#: src/wizard.c:1587
+#: src/wizard.c:1598
 msgid "Use SSL/TLS to connect to receiving server"
 msgstr "Použít SSL/TLS pro připojení k serveru pro příjem zpráv"
 
-#: src/wizard.c:1652
+#: src/wizard.c:1671
 msgid "IMAP server directory:"
 msgstr "Adresář IMAP serveru:"
 
-#: src/wizard.c:1663
+#: src/wizard.c:1682
 msgid "Show only subscribed folders"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/wizard.c:1671
+#: src/wizard.c:1690
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19728,15 +20213,15 @@ msgstr ""
 "Varování: tato verze Claws Mail\n"
 "byla zkompilována bez podpory IMAP."
 
-#: src/wizard.c:1789
+#: src/wizard.c:1809
 msgid "Claws Mail Setup Wizard"
 msgstr "Průvodce nastavením Claws Mail"
 
-#: src/wizard.c:1822
+#: src/wizard.c:1843
 msgid "Welcome to Claws Mail"
 msgstr "Vítejte v Claws Mail"
 
-#: src/wizard.c:1829
+#: src/wizard.c:1850
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19749,34 +20234,52 @@ msgstr ""
 "Začneme nastavením několika základních informací o Vás a Vašem poštovním "
 "účtu, takže budete moci začít používat Claws Mail za méně než pět minut."
 
-#: src/wizard.c:1842
+#: src/wizard.c:1863
 msgid "About You"
 msgstr "O Vás"
 
-#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
+#: src/wizard.c:1870 src/wizard.c:1884 src/wizard.c:1898 src/wizard.c:1913
 msgid "Bold fields must be completed"
 msgstr "Tučně nadepsaná pole musí být vyplněna"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1877
 msgid "Receiving mail"
 msgstr "Příjem zpráv"
 
-#: src/wizard.c:1872
+#: src/wizard.c:1891
 msgid "Sending mail"
 msgstr "Odesílání zpráv"
 
-#: src/wizard.c:1888
+#: src/wizard.c:1906
 msgid "Saving mail on disk"
 msgstr "Ukládání zpráv na disk"
 
-#: src/wizard.c:1904
+#: src/wizard.c:1921
 msgid "Configuration finished"
 msgstr "Konfigurace dokončena"
 
-#: src/wizard.c:1911
+#: src/wizard.c:1928
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws Mail je nyní připraven.\n"
 "Stiskněte uložit a můžeme začít."
+
+#~ msgid "Enable customisable keyboard shortcuts"
+#~ msgstr "Povolit přizpůsobování klávesových zkratek"
+
+#~ msgid ""
+#~ "If checked, you can change the keyboard shortcuts of most of the menu "
+#~ "items by focusing on the menu item and pressing a key combination.\n"
+#~ "Uncheck this option if you want to lock all existing keyboard shortcuts."
+#~ msgstr ""
+#~ "Při zaškrtnutí, můžete měnit klávesové zkratky většiny položek menu, "
+#~ "jejím vybráním a tiskem dané kombinace.\n"
+#~ "Zrušte volbu, pokud chcete uzamknout všechny stávající klávesové zkratky."
+
+#~ msgid "A_dd"
+#~ msgstr "Při_dat"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Použít zabezpečenou autentizaci (APOP)"
diff --git a/po/da.po b/po/da.po
index dcf3af45a..434154874 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,14 +1,13 @@
 # Danish translation of Claws Mail.
-# Copyright © 2000-2020 The Claws Mail Team
+# Copyright © 2000-2021 The Claws Mail Team
 # This file is distributed under the same license as the claws-mail package.
-# Erik P. Olsen <erik at epo.dk>, 2016-2020.
+# Erik P. Olsen <erik at epo.dk>, 2016-2021.
 #
 msgid ""
-msgstr ""
-"Project-Id-Version: claws-mail 3.16.0git257\n"
+msgstr "Project-Id-Version: claws-mail 3.16.0git257\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2020-09-13 17:40+0100\n"
-"PO-Revision-Date: 2020-09-14 14:16+0100\n"
+"POT-Creation-Date: 2021-07-03 09:16+0100\n"
+"PO-Revision-Date: 2021-07-05 12:27+0100\n"
 "Last-Translator: Erik P. Olsen <erik at epo.dk>\n"
 "Language-Team: dansk <>\n"
 "Language: da\n"
@@ -22,8 +21,7 @@ msgstr ""
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
-msgstr ""
-"Der er åbne redigeringsvinduer.\n"
+msgstr "Der er åbne redigeringsvinduer.\n"
 "Luk de åbne vinduer, før der redigeres konti."
 
 #: src/account.c:447
@@ -39,8 +37,7 @@ msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
 "indicates the default account."
-msgstr ""
-"Funktionen 'Hent Post' henter e-mails for dine konti i den givne rækkefølge, "
+msgstr "Funktionen 'Hent Post' henter e-mails for dine konti i den givne rækkefølge, "
 "tjekboksen angiver hvilke konti inkluderes. Fed tekst viser standardkontoen."
 
 #: src/account.c:823
@@ -56,48 +53,48 @@ msgstr "Konti med fjernmapper kan ikke kopieres."
 msgid "Copy of %s"
 msgstr "Kopiering af %s"
 
-#: src/account.c:1125
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Skal kontoen '%s' virkelig slettes?"
 
-#: src/account.c:1127
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr "(Uden titel)"
 
-#: src/account.c:1128
+#: src/account.c:1129
 msgid "Delete account"
 msgstr "Slet konto"
 
-#: src/account.c:1602
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "H"
 
-#: src/account.c:1608
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hent Post' henter e-mails fra de afkrydsede konti"
 
-#: 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/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
 #: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: 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
 msgid "Name"
 msgstr "Navn"
 
-#: src/account.c:1623 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -120,8 +117,7 @@ msgstr "Kan ikke hente del af flerleddet e-mail: %s"
 msgid ""
 "The selected action cannot be used in the compose window\n"
 "because it contains %%f, %%F, %%as or %%p."
-msgstr ""
-"Den valgte handling kan ikke anvendes i redigeringsvinduet\n"
+msgstr "Den valgte handling kan ikke anvendes i redigeringsvinduet\n"
 "fordi den indeholder %%f, %%F, %%as eller %%p."
 
 #: src/action.c:728
@@ -133,8 +129,7 @@ msgstr "Der er ikke angivet nogen filtreringshandling"
 msgid ""
 "Invalid filtering action(s):\n"
 "%s"
-msgstr ""
-"Ugyldige filtreringshandlinger:\n"
+msgstr "Ugyldige filtreringshandlinger:\n"
 "%s"
 
 #: src/action.c:997
@@ -143,12 +138,12 @@ msgid ""
 "Could not fork to execute the following command:\n"
 "%s\n"
 "%s"
-msgstr ""
-"Kunne ikke forgrene og udføre følgende kommando:\n"
+msgstr "Kunne ikke forgrene og udføre følgende kommando:\n"
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5277 src/compose.c:5282 src/ldaputil.c:333
+#: 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/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -182,8 +177,7 @@ msgid ""
 "Enter the argument for the following action:\n"
 "('%%h' will be replaced with the argument)\n"
 "  %s"
-msgstr ""
-"Indtast argumentet til følgende handling:\n"
+msgstr "Indtast argumentet til følgende handling:\n"
 "('%%h' bliver erstattet af argumentet)\n"
 " %s"
 
@@ -197,8 +191,7 @@ msgid ""
 "Enter the argument for the following action:\n"
 "('%%u' will be replaced with the argument)\n"
 "  %s"
-msgstr ""
-"Indtast argumentet til følgende handling:\n"
+msgstr "Indtast argumentet til følgende handling:\n"
 "('%%u' bliver erstattet af argumentet)\n"
 " %s"
 
@@ -287,8 +280,7 @@ msgstr "Genindsæt standardværdier"
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
-msgstr ""
-"Skal alle attributnavne\n"
+msgstr "Skal alle attributnavne\n"
 "virkelig erstattes med standardværdierne?"
 
 #: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:462
@@ -324,8 +316,7 @@ msgstr "Nyt attributnavn:"
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
-msgstr ""
-"Tilføjelse eller fjernelse af attributnavne berører ikke attributter, der "
+msgstr "Tilføjelse eller fjernelse af attributnavne berører ikke attributter, der "
 "allerede er angivet for kontakter."
 
 #: src/addrduplicates.c:127
@@ -343,8 +334,7 @@ msgstr "Find dubletter af e-mailadresser i adressebog"
 #: src/addrduplicates.c:145
 msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
-msgstr ""
-"Claws Mail vil nu søge nu efter dubletter af e-mailadresser i adressebogen."
+msgstr "Claws Mail vil nu søge nu efter dubletter af e-mailadresser i adressebogen."
 
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
@@ -416,12 +406,12 @@ msgid "_Book"
 msgstr "_Bog"
 
 #: 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/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Redigér"
 
-#: src/addressbook.c:407 src/compose.c:619 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Værktøj"
@@ -454,14 +444,14 @@ msgstr "_Redigér bog"
 msgid "_Delete book"
 msgstr "_Slet bog"
 
-#: src/addressbook.c:426 src/compose.c:631
+#: src/addressbook.c:426 src/compose.c:632
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Gem"
 
-#: src/addressbook.c:427 src/compose.c:635 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
@@ -476,13 +466,13 @@ msgid "C_ut"
 msgstr "K_lip"
 
 #: 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/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopiér"
 
 #: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "I_ndsæt"
 
@@ -659,8 +649,7 @@ msgstr "Slet gruppe"
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
-msgstr ""
-"Skal grupperne virkelig slettes?\n"
+msgstr "Skal grupperne virkelig slettes?\n"
 "Indholdet af adresser mistes ikke."
 
 #: src/addressbook.c:2209
@@ -687,8 +676,7 @@ msgstr "Slet"
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
-msgstr ""
-"Skal '%s' slettes? Hvis man kun sletter mappen, vil adresserne, den "
+msgstr "Skal '%s' slettes? Hvis man kun sletter mappen, vil adresserne, den "
 "indeholder, blive flyttet til den overordnede mappe."
 
 #: src/addressbook.c:2971 src/imap_gtk.c:368 src/mh_gtk.c:206
@@ -709,8 +697,7 @@ msgstr "Slet mappe og _adresser"
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
-msgstr ""
-"Skal '%s' slettes?\n"
+msgstr "Skal '%s' slettes?\n"
 "Adresserne, den indeholder, mistes ikke."
 
 #: src/addressbook.c:2990
@@ -718,8 +705,7 @@ msgstr ""
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
-msgstr ""
-"Skal '%s' slettes?\n"
+msgstr "Skal '%s' slettes?\n"
 "Adresserne, den indeholder, mistes."
 
 #: src/addressbook.c:3104
@@ -747,32 +733,28 @@ msgstr "Gammel adressebog blev problemfrit konverteret."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
-msgstr ""
-"Gammel adressebog konverteret,\n"
+msgstr "Gammel adressebog konverteret,\n"
 "den nye indeksfil for adresser kunne ikke gemmes."
 
 #: src/addressbook.c:4160
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
-msgstr ""
-"Kunne ikke konvertere adressebog,\n"
+msgstr "Kunne ikke konvertere adressebog,\n"
 "men oprettede nye tomme adressebogsfiler."
 
 #: src/addressbook.c:4166
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
-msgstr ""
-"Kunne ikke konvertere adressebog,\n"
+msgstr "Kunne ikke konvertere adressebog,\n"
 "kunne ikke gemme den nye indeksfil for adresser."
 
 #: src/addressbook.c:4171
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
-msgstr ""
-"Kunne ikke konvertere adressebog,\n"
+msgstr "Kunne ikke konvertere adressebog,\n"
 "og kunne ikke oprette nye adressebogsfiler."
 
 #: src/addressbook.c:4178 src/addressbook.c:4184
@@ -804,7 +786,7 @@ 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/folderview.c:449 src/prefs_account.c:3468 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Mappe"
 
@@ -927,18 +909,18 @@ msgstr "Adresseopdatering"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Fejl i opdatering. Ændringer blev ikke indskrevet i mappe."
 
-#: src/alertpanel.c:144 src/compose.c:9810
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr "Bemærk"
 
-#: 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/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:5091
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5808 src/inc.c:726
+#: 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
 msgid "Error"
 msgstr "Fejl"
@@ -1011,8 +993,7 @@ msgstr "ting"
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
-msgstr ""
-"Dette udvidelsesmodul muliggør %s (%s), som allerede tilbydes af "
+msgstr "Dette udvidelsesmodul muliggør %s (%s), som allerede tilbydes af "
 "udvidelsesmodulet %s."
 
 #: src/common/plugin.c:438
@@ -1025,8 +1006,7 @@ msgstr "Kunne ikke tildele hukommelse til udvidelsesmodulet"
 
 #: src/common/plugin.c:483
 msgid "This module is not licensed under a GPL v3 or later compatible license."
-msgstr ""
-"Dette program er ikke licensbelagt under en GPL v3 eller senere anvendelig "
+msgstr "Dette program er ikke licensbelagt under en GPL v3 eller senere anvendelig "
 "licens."
 
 #: src/common/plugin.c:492
@@ -1038,16 +1018,14 @@ msgstr "Dette program er for Claws Mail GTK1."
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
-msgstr ""
-"Versionen af Claws Mail er nyere end den version, som '%s' udvidelsesmodulet "
+msgstr "Versionen af Claws Mail er nyere end den version, som '%s' udvidelsesmodulet "
 "er bygget til."
 
 #: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
-msgstr ""
-"Versionen af Claws Mail er nyere end den version, som udvidelsesmodulet er "
+msgstr "Versionen af Claws Mail er nyere end den version, som udvidelsesmodulet er "
 "bygget med."
 
 #: src/common/plugin.c:782
@@ -1059,36 +1037,36 @@ msgstr "Versionen af Claws Mail er for gammel til '%s' udvidelsesmodulet."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Versionen af Claws Mail er for gammel til udvidelsesmodulet."
 
-#: src/common/session.c:201 src/imap.c:1238
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "Fejl under SSL/TLS forhandling\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "Der er ingen SMTP AUTH metode tilgængelig\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Den valgte SMTP AUTH metode var ikke tilgængelig\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "ugyldigt SMTP svar\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "der opstod fejl under SMTP sessionen\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "der opstod fejl under godkendelse\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "E-mailen er for stor (maksimum er %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "kunne ikke starte STARTTLS session\n"
 
@@ -1225,651 +1203,648 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Søndag"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Mandag"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: src/common/utils.c:4056
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Fredag"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Januar"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Februar"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marts"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "April"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maj"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juni"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juli"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Oktober"
 
-#: src/common/utils.c:4069
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4070
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "December"
 
-#: src/common/utils.c:4072
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Søn"
 
-#: src/common/utils.c:4073
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Man"
 
-#: src/common/utils.c:4074
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Tir"
 
-#: src/common/utils.c:4075
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Ons"
 
-#: src/common/utils.c:4076
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Tor"
 
-#: src/common/utils.c:4077
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Fre"
 
-#: src/common/utils.c:4078
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Lør"
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4083
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:4084
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Maj"
 
-#: src/common/utils.c:4085
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4086
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4087
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:4088
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4089
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:4090
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4091
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dec"
 
-#: src/common/utils.c:4102
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "FM"
 
-#: src/common/utils.c:4103
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "EM"
 
-#: src/common/utils.c:4104
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "fm"
 
-#: src/common/utils.c:4105
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "em"
 
-#: src/compose.c:195
+#: src/compose.c:198
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
 "\n"
 "Signing and encrypting have been disabled for this message."
-msgstr ""
-"Du har valgt at signere og/eller kryptere denne e-mail, men har ikke valgt "
+msgstr "Du har valgt at signere og/eller kryptere denne e-mail, men har ikke valgt "
 "et databeskyttelsessystem.\n"
 "\n"
 "Signering og kryptering er ikke mulig for denne e-mail."
 
-#: src/compose.c:603
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Tilføj..."
 
-#: src/compose.c:604 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: src/compose.c:606 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Egenskaber..."
 
-#: src/compose.c:613 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "_E-mail"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "_Stavning"
 
-#: src/compose.c:618 src/compose.c:685
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Muligheder"
 
-#: src/compose.c:620 src/mainwindow.c:528 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: src/compose.c:622
+#: src/compose.c:623
 msgid "S_end"
 msgstr "S_end"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "Send _senere"
 
-#: src/compose.c:626
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "_Vedhæft fil"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "I_ndsæt fil"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Indsæt si_gnatur"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "_Erstat signatur"
 
-#: src/compose.c:633
+#: src/compose.c:634
 msgid "_Print"
 msgstr "_Udskriv"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Genskab"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Gentag"
 
-#: src/compose.c:642 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "K_lip"
 
-#: src/compose.c:646
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "Indsæt _special"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Som _citat"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "_Ombrudt"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "_Uden ombrud"
 
-#: src/compose.c:651 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vælg _alt"
 
-#: src/compose.c:653
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "A_vanceret"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Flyt et tegn baglæns"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Flyt et tegn forlæns"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Flyt et ord baglæns"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Flyt et ord forlæns"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Flyt til begyndelse af linien"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Flyt til linieslut"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Flyt til forrige linie"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Flyt til næste linie"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Slet et tegn baglæns"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Slet et tegn forlæns"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Slet et ord baglæns"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Slet et ord forlæns"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Slet en linie"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Slet til linieslut"
 
-#: src/compose.c:670 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Find"
 
-#: src/compose.c:673
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "_Ombryd nuværende afsnit"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Ombryd alle lange _linier"
 
-#: src/compose.c:676
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Redigér med e_kstern tekstbehandler"
 
-#: src/compose.c:679
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "_Kontrollér alt eller det markerede"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "_Fremhæv alle fejlstavede ord"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "kontrollér fejlstavede ord _baglæns"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "_Fremad til næste fejlstavede ord"
 
-#: src/compose.c:689
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "Svar_tilstand"
 
-#: src/compose.c:691
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "Databeskyttelses_system"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "_Prioritet"
 
-#: src/compose.c:697 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "Tegn_kodning"
 
-#: src/compose.c:702 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Vesteuropæisk"
 
-#: src/compose.c:703 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: src/compose.c:704 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebræisk"
 
-#: src/compose.c:705 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: src/compose.c:706 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: src/compose.c:707 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japansk"
 
-#: src/compose.c:708 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: src/compose.c:709 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Koreansk"
 
-#: src/compose.c:710 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:713 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Adressebog"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "_Template"
 msgstr "_skabeloner"
 
-#: src/compose.c:717 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "_Handlinger"
 
-#: src/compose.c:721 src/mainwindow.c:825 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
 msgid "_About"
 msgstr "_Om"
 
-#: src/compose.c:726
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Aut_omatisk ombrydning"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Automatisk _indrykning"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "Si_gnér"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "_Kryptér"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "_Anmod om kvittering"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "Fje_rn referencer"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "Vis _linial"
 
-#: src/compose.c:737 src/compose.c:747
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:738 src/mainwindow.c:674 src/messageview.c:305
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
 #: src/summaryview.c:433
 msgid "_All"
 msgstr "_Alle"
 
-#: src/compose.c:739 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_Sender"
 msgstr "_Afsender"
 
-#: src/compose.c:740
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "_Diskussionsliste"
 
-#: src/compose.c:745
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "_Højest"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "H_øj"
 
-#: src/compose.c:748
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "L_av"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "_Lavest"
 
-#: src/compose.c:754 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automatisk"
 
-#: src/compose.c:755 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:756 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:760 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraleuropæisk (ISO-8859-_2)"
 
-#: src/compose.c:763 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Græsk (ISO-8859-_7)"
 
-#: src/compose.c:768 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Tyrkisk (ISO-8859-_9)"
 
-#: src/compose.c:1055
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr "Fejl i fra-feltet i ny e-mail."
 
-#: src/compose.c:1148
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr "Formatfejl i emnet til ny e-mail."
 
-#: src/compose.c:1180 src/quote_fmt.c:563
+#: src/compose.c:1181 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Teksten i \"Ny e-mail\" skabelonen har en fejl i linie %d."
 
-#: src/compose.c:1449
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Ude af stand til at svare. Den oprindelige email findes nok ikke."
 
-#: src/compose.c:1634 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
-msgstr ""
-"\"Fra\" feltet i \"Svar\" skabelonen indeholder en ugyldig e-mailadresse."
+msgstr "\"Fra\" feltet i \"Svar\" skabelonen indeholder en ugyldig e-mailadresse."
 
-#: src/compose.c:1683 src/quote_fmt.c:583
+#: src/compose.c:1684 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Teksten i \"Svar\" skabelonen har en fejl i linie %d."
 
-#: src/compose.c:1824 src/compose.c:2025 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
-msgstr ""
-"\"Fra\" feltet i \"Videresend\" skabelonen indeholder en ugyldig email-"
+msgstr "\"Fra\" feltet i \"Videresend\" skabelonen indeholder en ugyldig email-"
 "adresse."
 
-#: src/compose.c:1885 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Teksten i \"Videresend\" skabelonen har en fejl i linie %d."
 
-#: src/compose.c:2068
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
 msgstr "Fw: flere stykker post"
 
-#: src/compose.c:2577
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Teksten i \"Omdirigér\" skabelonen har en fejl i linie %d."
 
-#: src/compose.c:2648 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2651 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2654 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Svar til:"
 
-#: src/compose.c:2657 src/compose.c:5026 src/compose.c:5028
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Nyhedsgrupper:"
 
-#: src/compose.c:2660 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Opfølgning til:"
 
-#: src/compose.c:2663 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "I svar til:"
 
-#: src/compose.c:2667 src/compose.c:5023 src/compose.c:5031
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Til:"
 
-#: src/compose.c:2857
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Kunne ikke vedhæfte fil (tegnsætkonvertering mislykkedes)."
 
-#: src/compose.c:2863
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1884,291 +1859,279 @@ msgstr[1] ""
 "De følgende filer er blevet vedhæftet: \n"
 "%s"
 
-#: src/compose.c:3143
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Anførselstegnet\" i skabelonen er ugyldig."
 
-#: src/compose.c:3672
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kunne ikke hente størrelsen af fil '%s'."
 
-#: src/compose.c:3690
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
-msgstr ""
-"Du er i færd med at indsætte en fil på %s i brødteksten. Er du sikker på, at "
+msgstr "Du er i færd med at indsætte en fil på %s i brødteksten. Er du sikker på, at "
 "du ønsker at gøre det?"
 
-#: src/compose.c:3693
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: src/compose.c:3694 src/compose.c:10859 src/compose.c:11753
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr "_Indsæt"
 
-#: src/compose.c:3819
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:3820
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr "Tom fil"
 
-#: src/compose.c:3821
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr "_Vedhæft alligevel"
 
-#: src/compose.c:3830
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan ikke læse %s."
 
-#: src/compose.c:3857
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr "E-mail: %s"
 
-#: src/compose.c:4867 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Redigeret]"
 
-#: src/compose.c:4874 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv e-mail%s"
 
-#: src/compose.c:4877 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[intet emne] - Skriv e-mail%s"
 
-#: src/compose.c:4879 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Skriv e-mail"
 
-#: src/compose.c:4906 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
-msgstr ""
-"Det er ikke angivet, hvilken konto der sender e-mailen.\n"
+msgstr "Det er ikke angivet, hvilken konto der sender e-mailen.\n"
 "Vælg en konto før afsendelse."
 
-#: src/compose.c:5123 src/compose.c:5160
+#: src/compose.c:5126 src/compose.c:5163
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
-msgstr ""
-"Den eneste modtager er standard '%s' adressen. Skal den sendes alligevel?"
+msgstr "Den eneste modtager er standard '%s' adressen. Skal den sendes alligevel?"
 
-#: 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: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
 msgid "Send"
 msgstr "Send"
 
-#: 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/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
 msgid "_Send"
 msgstr "_Send"
 
-#: src/compose.c:5181
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr "Der er ikke anført en modtager."
 
-#: src/compose.c:5196
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Emnet er tomt. %s"
 
-#: src/compose.c:5197 src/compose.c:5240
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Skal den alligevel sendes?"
 
-#: src/compose.c:5198 src/compose.c:5241
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Skal den alligevel sættes i kø?"
 
-#: src/compose.c:5200 src/compose.c:5243 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:5201 src/compose.c:5244
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr "_Kø"
 
-#: src/compose.c:5239
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Sender til %d modtagere. %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5271
 msgid "Could not queue message."
 msgstr "Kunne ikke sætte e-mailen i kø."
 
-#: src/compose.c:5271
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
 "\n"
 "%s."
-msgstr ""
-"Kunne ikke sætte e-mailen i kø:\n"
+msgstr "Kunne ikke sætte e-mailen i kø:\n"
 "\n"
 "%s."
 
-#: src/compose.c:5275
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Signature failed: %s"
-msgstr ""
-"Kunne ikke sætte e-mailen i kø til afsendelse:\n"
+msgstr "Kunne ikke sætte e-mailen i kø til afsendelse:\n"
 "\n"
 "Signaturfejl: %s"
 
 #  c-format
-#: src/compose.c:5280
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Encryption failed: %s"
-msgstr ""
-"Kunne ikke sætte e-mailen i kø til afsendelse:\n"
+msgstr "Kunne ikke sætte e-mailen i kø til afsendelse:\n"
 "\n"
 "Krypteringsfejl: %s"
 
-#: src/compose.c:5285
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
-msgstr ""
-"Kunne ikke sætte e-mailen i kø til afsendelse:\n"
+msgstr "Kunne ikke sætte e-mailen i kø til afsendelse:\n"
 "\n"
 "Tegnsætkonvertering mislykkedes."
 
-#: src/compose.c:5289
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
-msgstr ""
-"Kunne ikke sætte e-mailen i kø til afsendelse:\n"
+msgstr "Kunne ikke sætte e-mailen i kø til afsendelse:\n"
 "\n"
 "Kunne ikke hente modtagerens krypteringsnøgle."
 
-#: src/compose.c:5352 src/compose.c:5412
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
-msgstr ""
-"E-mailen blev sat i kø men kunne ikke sendes.\n"
+msgstr "E-mailen blev sat i kø men kunne ikke sendes.\n"
 "Brug \"Send e-mails fra kø\" i hovedvinduet for at prøve igen."
 
-#: src/compose.c:5408
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
-msgstr ""
-"%s\n"
+msgstr "%s\n"
 "Brug \"Send e-mails fra kø\" i hovedvinduet for at prøve igen."
 
-#: src/compose.c:5805
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 "to the specified %s charset.\n"
 "Send it as %s?"
-msgstr ""
-"Kan ikke konvertere e-mailens tegnkodning \n"
+msgstr "Kan ikke konvertere e-mailens tegnkodning \n"
 "til det anførte %s tegnsæt.\n"
 "Skal det sendes som %s?"
 
-#: src/compose.c:5867
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 "The contents of the message might be broken on the way to the delivery.\n"
 "\n"
 "Send it anyway?"
-msgstr ""
-"Linie %d er længere end maksimal linielængde (998 byte).\n"
+msgstr "Linie %d er længere end maksimal linielængde (998 byte).\n"
 "E-mailens indhold kan blive ødelagt på vej til forsendelse.\n"
 "\n"
 "Skal den sendes alligevel?"
 
-#: src/compose.c:6102
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr "Krypteringsadvarsel"
 
-#: src/compose.c:6103
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr "F_ortsæt"
 
-#: src/compose.c:6152
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr "Der er ingen konto tilgængelig for afsendelse af email!"
 
-#: src/compose.c:6161
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Den valgte konto er ikke NNTP: Afsendelse er ikke mulig."
 
-#: src/compose.c:6415
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Vedhæftningen %s eksisterer ikke længere. Skal den ignoreres?"
 
-#: src/compose.c:6417 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Annullér afsendelse"
 
-#: src/compose.c:6417
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr "Ignorér vedhæftning"
 
-#: src/compose.c:6473
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr "Oprindelig %s del"
 
-#: src/compose.c:7073
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr "Tilføj i adresse_bogen"
 
-#: src/compose.c:7240
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr "Slet postens indhold"
 
-#: src/compose.c:7244 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Brug <tab> for automatisk udfyldning fra adressebogen"
 
-#: src/compose.c:7476
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr "Mime-type"
 
-#: src/compose.c:7482 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: 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
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:7544
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr "Gem e-mail i "
 
-#: src/compose.c:7575 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
@@ -2179,200 +2142,218 @@ msgstr "Gem e-mail i "
 msgid "_Browse"
 msgstr "_Gennemse"
 
-#: src/compose.c:7591
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr "Vælg mappe til at gemme e-mailen"
 
-#: src/compose.c:8048
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Ho_ved"
 
-#: src/compose.c:8053
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Vedhæftninger"
 
-#: src/compose.c:8067
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "An_det"
 
-#: src/compose.c:8082
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "E_mne:"
 
-#: src/compose.c:8306
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
-msgstr ""
-"Stavekontrol kunne ikke startes.\n"
+msgstr "Stavekontrol kunne ikke startes.\n"
 "%s"
 
-#: src/compose.c:8453
+#: src/compose.c:8456
 msgid "_From:"
 msgstr "_Fra:"
 
-#: src/compose.c:8470
+#: src/compose.c:8473
 msgid "Account to use for this email"
 msgstr "Konto til brug for denne email"
 
-#: src/compose.c:8472
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr "Afsenderadresse"
 
-#: src/compose.c:8654
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
-msgstr ""
-"Databeskyttelsessystemet '%s' kan ikke indlæses. Denne e-mail kan hverken "
+msgstr "Databeskyttelsessystemet '%s' kan ikke indlæses. Denne e-mail kan hverken "
 "signeres eller krypteres."
 
-#: src/compose.c:8765 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "_Ingen"
 
-#: src/compose.c:8866 src/prefs_template.c:752
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Teksten i skabelonen har en fejl i linie %d."
 
-#: src/compose.c:8963
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Formatfejl i skabelonens '%s' felt."
 
-#: src/compose.c:9387
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME-type."
 
-#: src/compose.c:9402
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr "Filen eksisterer ikke eller er tom."
 
-#: src/compose.c:9476
+#: src/compose.c:9479
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:9494
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: src/compose.c:9527
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr "Tegnkodning"
 
-#: src/compose.c:9547
+#: src/compose.c:9550
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:9548
+#: src/compose.c:9551
 msgid "File name"
 msgstr "Filnavn"
 
-#: src/compose.c:9807
+#: src/compose.c:9646
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr "Kunne ikke skrive brødteksten til fil:\n"
+"%s"
+
+#: src/compose.c:9704
+#, c-format
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr "Kunne ikke forgrene følgende kommando:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9743
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr "Den eksterne redigering stoppede med en fejl:%s"
+
+#: src/compose.c:9817
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
-msgstr ""
-"Det eksterne redigeringsprogram kører stadigt.\n"
+"process id: %d"
+msgstr "Det eksterne redigeringsprogram kører stadigt.\n"
 "Skal processens afslutning gennemtvinges?\n"
 "Processens gruppe-ID: %d"
 
-#: src/compose.c:10280 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail behøver netadgang for at kunne sende denne post."
 
-#: src/compose.c:10473
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr "Kunne ikke gemme udkast."
 
-#: src/compose.c:10477
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr "Kunne ikke gemme udkast"
 
-#: src/compose.c:10478
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
-msgstr ""
-"Kunne ikke gemme udkast.\n"
+msgstr "Kunne ikke gemme udkast.\n"
 "Skal lukning annulleres eller e-mailen kasseres?"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr "_Annullér lukning"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr "_Kassér email"
 
-#: src/compose.c:10669 src/compose.c:10683
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:10697
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunne ikke læses."
 
-#: src/compose.c:10699
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
-msgstr ""
-"Filen '%s' indeholder ugyldige tegn\n"
+msgstr "Filen '%s' indeholder ugyldige tegn\n"
 "for den aktuelle tegnkodning, indsættelse kan være forkert."
 
-#: src/compose.c:10778
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr "Kassér e-mailen"
 
-#: src/compose.c:10779
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr "Denne e-mail er blevet ændret. Skal det kasseres?"
 
-#: src/compose.c:10780 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Kassér"
 
-#: src/compose.c:10780 src/compose.c:10785
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr "_Gem som Udkast"
 
-#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Gem ændringer"
 
-#: src/compose.c:10784
+#: src/compose.c:10734
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Denne e-mail er blevet ændret. Skal de seneste ændringer gemmes?"
 
-#: src/compose.c:10785
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr "_Kassér"
 
-#: src/compose.c:10856
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Skal skabelonen '%s' anvendes?"
 
-#: src/compose.c:10858
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr "Anvend skabelon"
 
-#: src/compose.c:10859 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
 #: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Erstat"
 
-#: src/compose.c:11746
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2384,26 +2365,25 @@ msgstr[0] "Skal indholdet af filen indsættes i brødteksten eller vedhæftes?"
 msgstr[1] ""
 "Skal indholdet af de %d filer indsættes i brødteksten eller vedhæftes?"
 
-#: src/compose.c:11752
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr "Indsæt eller vedhæft?"
 
-#: src/compose.c:11753
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr "_Vedhæft"
 
-#: src/compose.c:11971
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Formatfejl i citation i linie %d."
 
-#: src/compose.c:12267
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 "time. Do you want to continue?"
-msgstr ""
-"Du er i færd med at svare på %d e-mails. At åbne vinduerne kan tage nogen "
+msgstr "Du er i færd med at svare på %d e-mails. At åbne vinduerne kan tage nogen "
 "tid. Ønsker du at fortsætte?"
 
 #: src/crash.c:140
@@ -2420,8 +2400,7 @@ msgstr "Claws Mail er brudt ned"
 msgid ""
 "%s.\n"
 "Please file a bug report and include the information below."
-msgstr ""
-"%s.\n"
+msgstr "%s.\n"
 "Opret evt. en fejlrapport og inkludér nedenstående informationer."
 
 #: src/crash.c:208
@@ -2461,8 +2440,7 @@ msgid ""
 "\n"
 "Click OK to keep editing this contact.\n"
 "Click Cancel to close without saving."
-msgstr ""
-"At tilføje en ny person kræver at mindst én af\n"
+msgstr "At tilføje en ny person kræver at mindst én af\n"
 "følgende oplysninger oprettes:\n"
 " - Vist navn\n"
 " - Fornavn\n"
@@ -2485,8 +2463,7 @@ msgid ""
 "\n"
 "Click OK to keep editing this contact.\n"
 "Click Cancel to close without saving."
-msgstr ""
-"At tilføje en ny person kræver at mindst én af\n"
+msgstr "At tilføje en ny person kræver at mindst én af\n"
 "følgende oplysninger oprettes:\n"
 " - Fornavn\n"
 " - Efternavn\n"
@@ -2529,8 +2506,7 @@ msgstr "Vælg et billede"
 msgid ""
 "Failed to import image: \n"
 "%s"
-msgstr ""
-"Kunne ikke importere billede: \n"
+msgstr "Kunne ikke importere billede: \n"
 "%s"
 
 #: src/editaddress.c:991
@@ -2589,8 +2565,7 @@ msgstr "_Andre attributter"
 msgid ""
 "Failed to save image: \n"
 "%s"
-msgstr ""
-"Kunne ikke gemme billede: \n"
+msgstr "Kunne ikke gemme billede: \n"
 "%s"
 
 #: src/editbook.c:109
@@ -2614,7 +2589,7 @@ msgid " Check File "
 msgstr " Tjek 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/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Fil"
@@ -2697,13 +2672,13 @@ msgstr "Tilføj Ny JPilot Post"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Redigér LDAP - Vælg søgedatabase"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Værtsnavn"
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2754,8 +2729,7 @@ msgid ""
 "appropriate for the \"example.org\" organization. An IP address may also be "
 "used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
-msgstr ""
-"Dette er serverens værtsnavn. For eksempel kan \"ldap.example.org\" være "
+msgstr "Dette er serverens værtsnavn. For eksempel kan \"ldap.example.org\" være "
 "passende for \"example.org\" organisationen. En IP-adresse kan også bruges. "
 "Man kan endvidere angive \"localhost\", hvis man kører en LDAP-server på "
 "samme computer som Claws Mail."
@@ -2764,7 +2738,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2774,8 +2748,7 @@ msgid ""
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
 "to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
 "TLS_REQCERT fields)."
-msgstr ""
-"Aktivér sikker tilslutning til LDAP-server med STARTTLS. Forbindelsen "
+msgstr "Aktivér sikker tilslutning til LDAP-server med STARTTLS. Forbindelsen "
 "starter ukrypteret og er sikret af STARTTLS-kommandoen. Tjek konfigurationen "
 "i ldap.conf (felterne TLS_CACERTDIR og TLS_REQCERT), hvis tilslutningen "
 "mislykkes."
@@ -2785,8 +2758,7 @@ msgid ""
 "Enable secure connection to the LDAP server via SSL/TLS. If connection "
 "fails, be sure to check the correct configuration in ldap.conf "
 "(TLS_CACERTDIR and TLS_REQCERT fields)."
-msgstr ""
-"Aktivér sikker tilslutning til LDAP-serveren med SSLTLS. Tjek "
+msgstr "Aktivér sikker tilslutning til LDAP-serveren med SSLTLS. Tjek "
 "konfigurationen i ldap.conf (felterne TLS_CACERTDIR og TLS_REQCERT), hvis "
 "tilslutningen mislykkes."
 
@@ -2809,8 +2781,7 @@ msgid ""
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
-msgstr ""
-"Dette angiver navnet på den mappe, der skal søges på fra serveren. "
+msgstr "Dette angiver navnet på den mappe, der skal søges på fra serveren. "
 "Eksempelvis:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
@@ -2830,8 +2801,7 @@ msgstr "Søgeattributter"
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
-msgstr ""
-"En liste af LDAP attributnavne som kan søges i for at finde et navn eller an "
+msgstr "En liste af LDAP attributnavne som kan søges i for at finde et navn eller an "
 "adresse."
 
 #: src/editldap.c:590
@@ -2842,8 +2812,7 @@ msgstr " Standarder "
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
-msgstr ""
-"Dette nulstiller attributnavnene til standardværdier, som burde kunne finde "
+msgstr "Dette nulstiller attributnavnene til standardværdier, som burde kunne finde "
 "de fleste navne og adresser ved en navne- eller adressesøgning."
 
 #: src/editldap.c:600
@@ -2862,8 +2831,7 @@ msgid ""
 "servers. A larger value will reduce the search time for subsequent searches. "
 "This is useful for servers that have slow response times at the expense of "
 "more memory to cache results."
-msgstr ""
-"Dette definerer den maksimale tid (i sekunder), i hvilken resultatet af en "
+msgstr "Dette definerer den maksimale tid (i sekunder), i hvilken resultatet af en "
 "adressesøgning er gyldig, hvad angår fuldførelse af adressen. Søgeresultatet "
 "gemmes i et mellemlager, indtil dette tidsforløb er passeret, hvorefter det "
 "gemmes permanent. Dette vil forbedre svartiden ved søgning efter det samme "
@@ -2881,8 +2849,7 @@ msgstr "Inkludér serveren i dynamisk søgning"
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
-msgstr ""
-"Afkryds denne mulighed for at inkludere denne server i dynamisk søgning, når "
+msgstr "Afkryds denne mulighed for at inkludere denne server i dynamisk søgning, når "
 "adressefuldførelse anvendes."
 
 #: src/editldap.c:642
@@ -2896,8 +2863,7 @@ msgid ""
 "search; this type of search usually takes longer to complete. Note that for "
 "performance reasons, address completion uses \"begins-with\" for all "
 "searches against other address interfaces."
-msgstr ""
-"Søgning efter navne og adresser kan udføres enten ved brug af \"begynder med"
+msgstr "Søgning efter navne og adresser kan udføres enten ved brug af \"begynder med"
 "\" eller \"indeholder\" søgebegreb. Afkryds denne mulighed for at udføre en "
 "\"indeholder\" søgning; denne type søgning tager som regel mere tid at "
 "fuldføre. Bemærk, at på grund af ydeevne bruges altid \"begynder med\" "
@@ -2913,8 +2879,7 @@ msgid ""
 "usually only used for protected servers. This name is typically formatted "
 "as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "
 "performing a search."
-msgstr ""
-"LDAP-brugerens kontonavn til brug for at forbinde til serveren. Det bruges "
+msgstr "LDAP-brugerens kontonavn til brug for at forbinde til serveren. Det bruges "
 "normalt kun for beskyttede servere. Det navn er typisk formateret som: "
 "\"cn=user,dc=claws-mail,dc=org\". Det vil normalt være tomt ved søgning."
 
@@ -2926,8 +2891,8 @@ msgstr "Bind adgangskode"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Adgangskoden som skal bruges ved tilslutning som \"Bind DN\" bruger."
 
-#: 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/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
 msgid "Show password"
 msgstr "Vis adgangskoden"
@@ -2949,11 +2914,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Det maksimale antal poster som kan returneres i søgeresultatet."
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr "Grundlæggende"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "Udvidet"
 
@@ -3048,8 +3013,7 @@ msgstr "Problemfri fileksport."
 msgid ""
 "The HTML output directory '%s'\n"
 "does not exist. Do you want to create it?"
-msgstr ""
-"HTML output-mappe '%s'\n"
+msgstr "HTML output-mappe '%s'\n"
 "eksisterer ikke. Skal den oprettes?"
 
 #: src/exphtmldlg.c:180
@@ -3061,8 +3025,7 @@ msgstr "Opret mappe"
 msgid ""
 "Could not create output directory for HTML file:\n"
 "%s"
-msgstr ""
-"Kunne ikke oprette output-mappe for HTML-fil:\n"
+msgstr "Kunne ikke oprette output-mappe for HTML-fil:\n"
 "%s"
 
 #: src/exphtmldlg.c:191 src/expldifdlg.c:201
@@ -3093,8 +3056,8 @@ msgstr "Stilark"
 #: 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/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
 msgid "None"
 msgstr "Ingen"
 
@@ -3186,8 +3149,7 @@ msgstr "Angiv parametre til formatering af distinguished navn."
 msgid ""
 "LDIF Output Directory '%s'\n"
 "does not exist. OK to create new directory?"
-msgstr ""
-"LDIF output-mappe '%s'\n"
+msgstr "LDIF output-mappe '%s'\n"
 "eksisterer ikke. OK for at oprette ny mappe?"
 
 #: src/expldifdlg.c:190
@@ -3199,8 +3161,7 @@ msgstr "Opret mappe"
 msgid ""
 "Could not create output directory for LDIF file:\n"
 "%s"
-msgstr ""
-"Kunne ikke oprette output-mappe for LDIF-fil:\n"
+msgstr "Kunne ikke oprette output-mappe for LDIF-fil:\n"
 "%s"
 
 #: src/expldifdlg.c:241
@@ -3211,8 +3172,7 @@ msgstr "Der blev ikke angivet nogen endelse"
 msgid ""
 "A suffix is required if data is to be used for an LDAP server. Are you sure "
 "you wish to proceed without a suffix?"
-msgstr ""
-"Der kræves en endelse, såfremt data skal bruges for en LDAP-server. Skal der "
+msgstr "Der kræves en endelse, såfremt data skal bruges for en LDAP-server. Skal der "
 "virkelig fortsættes uden endelse?"
 
 #: src/expldifdlg.c:261
@@ -3232,8 +3192,7 @@ msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
-msgstr ""
-"Adressebogens entydige ID bruges til at oprette et DN, som er formateret på "
+msgstr "Adressebogens entydige ID bruges til at oprette et DN, som er formateret på "
 "samme måde som:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 
@@ -3242,8 +3201,7 @@ msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
-msgstr ""
-"Adressebogens Vist Navn bruges til at oprette et DN, som er formateret på "
+msgstr "Adressebogens Vist Navn bruges til at oprette et DN, som er formateret på "
 "samme måde som:\n"
 "  uid=John Doe,ou=people,dc=claws-mail,dc=org"
 
@@ -3252,8 +3210,7 @@ msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
-msgstr ""
-"Den første e-mailadresse, som tilhører en person, bruges til at oprette et "
+msgstr "Den første e-mailadresse, som tilhører en person, bruges til at oprette et "
 "DN, som er formateret på samme måde som:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 
@@ -3268,8 +3225,7 @@ msgid ""
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
-msgstr ""
-"Endelsen bruges til at oprette et \"Distinguished Navn\" (eller DN) for en "
+msgstr "Endelsen bruges til at oprette et \"Distinguished Navn\" (eller DN) for en "
 "LDAP-post. Eksempelvis:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
@@ -3290,8 +3246,7 @@ msgid ""
 "\"Distinguished Name\" (or DN). The suffix is appended to the \"Relative "
 "Distinguished Name\" (or RDN) to create the DN. Please select one of the "
 "available RDN options that will be used to create the DN."
-msgstr ""
-"LDIF-filen indeholder adskillige dataposter, som normalt indlæses i en LDAP "
+msgstr "LDIF-filen indeholder adskillige dataposter, som normalt indlæses i en LDAP "
 "server. Hver datapost i LDIF-filen er entydigt identificeret med et "
 "\"Distinguished navn\" (eller DN). Endelsen er tilføjet efter det \"Relative "
 "distinguished Navn\" (eller RDN). Vælg en af de tilgængelige RDN muligheder, "
@@ -3307,8 +3262,7 @@ msgid ""
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
 "address book data, may be used in the exported LDIF file. The RDN selected "
 "above will be used if the DN user attribute is not found."
-msgstr ""
-"Adressebogen kan indeholde poster, som tidligere blev importeret fra en LDIF-"
+msgstr "Adressebogen kan indeholde poster, som tidligere blev importeret fra en LDIF-"
 "fil. \"Distinguished Navn\" (DN) brugerattributten kan, hvis den er tilstede "
 "i adressebogens data, bruges i den eksporterede  LDIF-fil. RDN'et, som valgt "
 "ovenfor, bliver brugt, hvis DN brugerattributten ikke findes."
@@ -3321,8 +3275,7 @@ msgstr "Udelad post, hvis der ikke er nogen e-mailadresse"
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
-msgstr ""
-"En adressebog kan indeholde poster uden e-mailadresser. Afkryds denne "
+msgstr "En adressebog kan indeholde poster uden e-mailadresser. Afkryds denne "
 "mulighed for at ignorere dem."
 
 #: src/expldifdlg.c:655
@@ -3333,7 +3286,7 @@ msgstr "Eksportér adressebog til LDIF-fil"
 msgid "Distinguished Name"
 msgstr "Distinguished Navn"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr "Eksporetér til mbox-fil"
 
@@ -3398,17 +3351,17 @@ msgstr "Navnet er for langt."
 msgid "Not specified."
 msgstr "Ikke angivet."
 
-#: 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' mangler! Skal backup-filen fra %s bruges?"
 
-#: 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 "Kunne ikke kopiere %s til %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 "
@@ -3424,8 +3377,7 @@ msgstr "reglen er ikke konto-baseret\n"
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
-msgstr ""
-"reglen er konto-baseret [ID=%d, navn='%s'], og matcher den konto, som i "
+msgstr "reglen er konto-baseret [ID=%d, navn='%s'], og matcher den konto, som i "
 "øjeblikket er i brug til at hente e-mails\n"
 
 #: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
@@ -3438,8 +3390,7 @@ msgstr "IKKE-_EKSISTERENDE"
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
-msgstr ""
-"reglen er konto-baseret, og matcher ikke den konto, som i øjeblikket er i "
+msgstr "reglen er konto-baseret, og matcher ikke den konto, som i øjeblikket er i "
 "brug til at hente e-mails\n"
 
 #: src/filtering.c:624
@@ -3447,15 +3398,13 @@ msgstr ""
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
-msgstr ""
-"reglen er konto-baseret [ID=%d, navn='%s'], og matcher ikke den konto, som i "
+msgstr "reglen er konto-baseret [ID=%d, navn='%s'], og matcher ikke den konto, som i "
 "øjeblikket er i brug til at hente e-mails [ID=%d, navn='%s']\n"
 
 #: src/filtering.c:643
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
-msgstr ""
-"reglen er ikke konto-baseret, alle regler anvendes alligevel efter "
+msgstr "reglen er ikke konto-baseret, alle regler anvendes alligevel efter "
 "brugerønske\n"
 
 #: src/filtering.c:649
@@ -3463,15 +3412,13 @@ msgstr ""
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
-msgstr ""
-"reglen er konto-baseret [ID=%d, navn='%s'], men alle regler anvendes efter "
+msgstr "reglen er konto-baseret [ID=%d, navn='%s'], men alle regler anvendes efter "
 "brugerønske\n"
 
 #: src/filtering.c:667
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
-msgstr ""
-"reglen er konto-baseret [ID=%d, navn='%s'], men overspringes efter "
+msgstr "reglen er konto-baseret [ID=%d, navn='%s'], men overspringes efter "
 "brugerønske\n"
 
 #: src/filtering.c:672
@@ -3483,8 +3430,7 @@ msgstr "reglen er konto-baseret, men overspringes efter brugerønske\n"
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
-msgstr ""
-"reglen er konto-baseret [ID=%d, navn='%s'], men matcher ikke den aktive "
+msgstr "reglen er konto-baseret [ID=%d, navn='%s'], men matcher ikke den aktive "
 "konto ID=%d, navn='%s']\n"
 
 #: src/filtering.c:700
@@ -3496,8 +3442,7 @@ msgstr "reglen er konto-baseret, men matcher ikke den aktive konto\n"
 msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
-msgstr ""
-"reglen er konto-baseret [ID=%d, navn='%s'], aktiv konto ID=%d, navn='%s']\n"
+msgstr "reglen er konto-baseret [ID=%d, navn='%s'], aktiv konto ID=%d, navn='%s']\n"
 
 #: src/filtering.c:752
 #, c-format
@@ -3513,51 +3458,51 @@ msgstr "handlingen kunne ikke anvendes\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "ikke mere behandling efter handlingen [ %s ]\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "behandlingsregel '%s' [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "<unavngivet> behandlingsregel [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "deaktiveret regel '%s' [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "<unavngivet> regel deaktiveret [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "ubestemt"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "inkorporeret"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "manuelt"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "mappebehandling"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "forbehandling"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "efterbehandling"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3566,25 +3511,23 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 "%s%s %s\n"
-msgstr ""
-"filtrerer e-mail (%s%s%s)\n"
+msgstr "filtrerer e-mail (%s%s%s)\n"
 "%se-mailfil: %s\n"
 "%s%s %s\n"
 "%s%s %s\n"
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
-msgstr ""
-"filtrerer e-mail (%s%s%s)\n"
+msgstr "filtrerer e-mail (%s%s%s)\n"
 "%se-mailfil: %s\n"
 
 #: src/folder.c:1595 src/prefs_folder_item.c:319
@@ -3613,35 +3556,35 @@ msgstr "Udkast"
 msgid "Processing (%s)...\n"
 msgstr "Behandler (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopierer %s til %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Flytter %s til %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Opdaterer mellemlager for %s..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "Behandler e-mails..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synkroniserer %s til offline brug...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Et mappenavn kan ikke begynde eller ende med et punktum."
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "Et mappenavn kan ikke ende med et mellemrum."
 
@@ -3724,13 +3667,13 @@ msgstr "Angiv kolonner for visning"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr "Nye"
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Ulæste"
@@ -3749,7 +3692,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Angiver mappeinfo..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr "Markér alt som læst"
 
@@ -3757,15 +3700,14 @@ msgstr "Markér alt som læst"
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
-msgstr ""
-"Skal alle e-mails i denne mappe og dens undermapper virkelig markeres som "
+msgstr "Skal alle e-mails i denne mappe og dens undermapper virkelig markeres som "
 "læst?"
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:871 src/summaryview.c:4292
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Skal alle e-mails i denne mappe virkelig markeres som læst?"
 
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr "Markér alt som ulæst"
 
@@ -3773,20 +3715,19 @@ msgstr "Markér alt som ulæst"
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
-msgstr ""
-"Skal alle e-mails i denne mappe og dens undermapper virkelig markeres som "
+msgstr "Skal alle e-mails i denne mappe og dens undermapper virkelig markeres som "
 "ulæst?"
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:877 src/summaryview.c:4338
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Skal alle e-mails i denne mappe virkelig markeres som ulæst?"
 
-#: src/folderview.c:1067 src/imap.c:4675
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Skanner mappe %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4679 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Skanner mappen %s..."
@@ -3798,8 +3739,7 @@ msgstr "Gendanner mappetræ"
 #: src/folderview.c:1102
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
-msgstr ""
-"Ved gendannelse af mappetræet fjernes lokale mellemlagre. Vil du fortsætte?"
+msgstr "Ved gendannelse af mappetræet fjernes lokale mellemlagre. Vil du fortsætte?"
 
 #: src/folderview.c:1112
 msgid "Rebuilding folder tree..."
@@ -3844,7 +3784,7 @@ msgstr "Skal alle e-mails i papirkurven slettes?"
 msgid "_Empty trash"
 msgstr "_Tøm papirkurv"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Offline advarsel"
 
@@ -3864,13 +3804,12 @@ msgstr "Send alle e-mails i køen"
 msgid "Some errors occurred while sending queued messages."
 msgstr "Der opstod nogle fejl under afsendelse af e-mails fra køen."
 
-#: src/folderview.c:2557 src/main.c:2891 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
-msgstr ""
-"Der opstod nogle fejl under afsendelse af e-mails fra køen:\n"
+msgstr "Der opstod nogle fejl under afsendelse af e-mails fra køen:\n"
 "%s"
 
 #: src/folderview.c:2632
@@ -3930,7 +3869,7 @@ msgstr "Flytning mislykkedes"
 msgid "Processing configuration for folder %s"
 msgstr "Behandler konfigurationen for mappe %s"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Modtagemappen kan kun bruges til at gemme undermapper."
 
@@ -3980,7 +3919,7 @@ msgstr "ukendt"
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ikke hente listen af nyhedsgrupper."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1848 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr "Færdig."
 
@@ -3991,8 +3930,7 @@ msgstr "%d nyhedsgrupper modtaget (%s læst)"
 
 #: src/gtk/about.c:133
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
-msgstr ""
-"Claws Mail er et effektivt program til elektronisk post, hurtigt og med en "
+msgstr "Claws Mail er et effektivt program til elektronisk post, hurtigt og med en "
 "mængde indstillingsmuligheder."
 
 #: src/gtk/about.c:136
@@ -4002,25 +3940,22 @@ msgstr "For yderligere oplysninger besøg Claws Mail's webside:"
 #: src/gtk/about.c:141
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
-msgstr ""
-"For brugerstøtte og diskussioner abonnér på Claws Mail's users' mailing list:"
+msgstr "For brugerstøtte og diskussioner abonnér på Claws Mail's users' mailing list:"
 
 #: src/gtk/about.c:147
 msgid ""
 "Claws Mail is free software released under the GPL. If you wish to donate to "
 "the Claws Mail project you can do so at:"
-msgstr ""
-"Claws Mail er fri programmel stillet til rådighed under GPL "
+msgstr "Claws Mail er fri programmel stillet til rådighed under GPL "
 "licensbetingelser. Hvis du ønsker at bidrage til Claws Mail projektet, kan "
 "det gøres her:"
 
 #: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
-msgstr ""
-"Copyright (C) 1999-2020\n"
+msgstr "Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 
@@ -4033,8 +3968,7 @@ msgstr "Systeminformation\n"
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
-msgstr ""
-"Lokalitet: %s (tegnsæt: %s)\n"
+msgstr "Lokalitet: %s (tegnsæt: %s)\n"
 "Operativ System: %s %s (%s)"
 
 #: src/gtk/about.c:183
@@ -4042,8 +3976,7 @@ msgstr ""
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
-msgstr ""
-"Lokalitet: %s (tegnsæt: %s)\n"
+msgstr "Lokalitet: %s (tegnsæt: %s)\n"
 "Operativ System: %s"
 
 #: src/gtk/about.c:192
@@ -4051,8 +3984,7 @@ msgstr ""
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
-msgstr ""
-"Lokalitet: %s (tegnsæt: %s)\n"
+msgstr "Lokalitet: %s (tegnsæt: %s)\n"
 "Operativ System: ukendt"
 
 #: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
@@ -4147,8 +4079,7 @@ msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
 "Software Foundation; either version 3, or (at your option) any later version."
-msgstr ""
-"Dette program er fri programmel; det kan redistribueres og/eller modificeres "
+msgstr "Dette program er fri programmel; det kan redistribueres og/eller modificeres "
 "under betingelserne i GNU General Public License udgivet af Free Software "
 "Foundation; enten version 3 eller (efter eget valg) senere version."
 
@@ -4158,8 +4089,7 @@ msgid ""
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
 "more details."
-msgstr ""
-"Dette program distribueres i det håb, at det vil være brugbart, men UDEN "
+msgstr "Dette program distribueres i det håb, at det vil være brugbart, men UDEN "
 "NOGEN FORM FOR GARANTI til og med uden nogen implicit garanti om SALGBARHED "
 "eller ANVENDBARHED FOR NOGET BESTEMT FORMÅL. Se GNU General Public License "
 "for yderligere detaljer."
@@ -4168,48 +4098,47 @@ msgstr ""
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
-msgstr ""
-"En kopi af GNU General Public License burde være modtaget sammen med dette "
+msgstr "En kopi af GNU General Public License burde være modtaget sammen med dette "
 "program. Hvis ikke, se "
 
-#: src/gtk/about.c:718 src/main.c:2715
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr "Session-statistikker\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2725 src/main.c:2728
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr "Startet: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2734
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr "Indkommende trafik\n"
 
-#: src/gtk/about.c:741 src/main.c:2737
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Modtagne e-mails: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2743
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr "Udgående trafik\n"
 
-#: src/gtk/about.c:751 src/main.c:2746
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nye/omdirigerede e-mails: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2750
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Besvarede e-mails: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2754
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Videresendte e-mails: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2758
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "I alt udgåede e-mails: %d\n"
@@ -4404,8 +4333,7 @@ msgstr "Kontrollér mens du skriver"
 msgid ""
 "The spell checker could not change dictionary.\n"
 "%s"
-msgstr ""
-"Stavekontrollen kunne ikke skifte ordbog.\n"
+msgstr "Stavekontrollen kunne ikke skifte ordbog.\n"
 "%s"
 
 #: src/gtk/gtkaspell.c:2210
@@ -4413,24 +4341,23 @@ msgstr ""
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
 "%s"
-msgstr ""
-"Stavekontrollen kunne ikke skifte til den alternative ordbog.\n"
+msgstr "Stavekontrollen kunne ikke skifte til den alternative ordbog.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1853
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "Fejl: Ingen service-post fundet."
 
-#: src/gtk/gtkutils.c:1856
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "Fejl: netværksfejl."
 
-#: src/gtk/gtkutils.c:1859
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Fejl: ukendt fejl (%d)."
 
-#: src/gtk/gtkutils.c:1929
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "Konfigurerer..."
 
@@ -4674,7 +4601,7 @@ msgstr "User-Agent:"
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
@@ -4702,7 +4629,7 @@ msgstr "Forrang"
 msgid "Precedence:"
 msgstr "Forrang:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4976,8 +4903,7 @@ msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
 "corrupted, malformed or part of some DoS attempt."
-msgstr ""
-"Denne URL var for lang til at vises og\n"
+msgstr "Denne URL var for lang til at vises og\n"
 "er blevet afkortet aht sikkerhed. Denne e-mail\n"
 "kan være ødelagt, misdannet eller del af et DoS angreb."
 
@@ -4986,8 +4912,7 @@ msgid ""
 "\n"
 "\n"
 "Version: "
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "Version: "
 
@@ -5009,8 +4934,7 @@ msgid ""
 "The following error occurred while loading %s:\n"
 "\n"
 "%s\n"
-msgstr ""
-"Følgende fejl opstod under indlæsning %s:\n"
+msgstr "Følgende fejl opstod under indlæsning %s:\n"
 "\n"
 "%s\n"
 
@@ -5024,7 +4948,7 @@ msgstr ""
 #: 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/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,8 +4982,7 @@ msgstr "Beskrivelse"
 #: src/gtk/pluginwindow.c:376
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
-msgstr ""
-"For yderligere oplysning om udvidelsesmoduler se %sClaws Mail netside%s."
+msgstr "For yderligere oplysning om udvidelsesmoduler se %sClaws Mail netside%s."
 
 #: src/gtk/pluginwindow.c:417
 msgid "Click here to load one or more plugins"
@@ -5082,11 +5005,11 @@ msgid "_Hide"
 msgstr "_Skjul"
 
 #: 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: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
 msgid "Account"
 msgstr "Konto"
 
@@ -5261,8 +5184,7 @@ msgstr "e-mails som indeholder S i posthovedet for referencer"
 #: src/gtk/quicksearch.c:516
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
-msgstr ""
-"e-mails som returnerer 0 når de sendes til eksekvering - %F er e-mailfilen"
+msgstr "e-mails som returnerer 0 når de sendes til eksekvering - %F er e-mailfilen"
 
 #: src/gtk/quicksearch.c:517
 msgid "messages which contain S in X-Label header"
@@ -5292,8 +5214,7 @@ msgstr "match med regulært udtryk i stedet for søgning med substring"
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
-msgstr ""
-"alle filtreringsudtryk er tilladt, men de kan ikke kombineres med logiske "
+msgstr "alle filtreringsudtryk er tilladt, men de kan ikke kombineres med logiske "
 "operatorer"
 
 #: src/gtk/quicksearch.c:535 src/summary_search.c:462
@@ -5305,56 +5226,55 @@ msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
-msgstr ""
-"Udvidet søgning tillader brugeren at definere kriterier som e-mailene skal "
+msgstr "Udvidet søgning tillader brugeren at definere kriterier som e-mailene skal "
 "opfylde for at kunne matche og blive vist i e-maillisten.\n"
 "Følgende symboler kan benyttes:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Noget gik galt under søgning. Tjek dine logs."
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Fra/Til/Cc/Emne/Mærke"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Rekursivt"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "Klæbrigt"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "Søg under indtasting"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "Kør ved markering"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "Nulstil aktive søgning"
 
-#: 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 "Redigér søgekriteriet"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr "Information om udvidede 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 "_Redigér"
 
-#: 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:349
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "N_ulstil"
@@ -5416,8 +5336,7 @@ msgid ""
 "Certificate is for %s, but connection is to %s.\n"
 "You may be connecting to a rogue server.\n"
 "\n"
-msgstr ""
-"Certifikatet er for %s, men forbindelsen er til %s.\n"
+msgstr "Certifikatet er for %s, men forbindelsen er til %s.\n"
 "Du er måske forbundet til en falsk server.\n"
 "\n"
 
@@ -5426,8 +5345,7 @@ msgstr ""
 msgid ""
 "Certificate for %s is unknown.\n"
 "%sDo you want to accept it?"
-msgstr ""
-"Certifikatet for %s er ukendt.\n"
+msgstr "Certifikatet for %s er ukendt.\n"
 "%sSkal det godkendes?"
 
 #: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
@@ -5467,8 +5385,7 @@ msgstr "_Godkend og gem"
 msgid ""
 "Certificate for %s is expired.\n"
 "%sDo you want to continue?"
-msgstr ""
-"Certifikatet for %s er udløbet.\n"
+msgstr "Certifikatet for %s er udløbet.\n"
 "%sVil du fortsætte?"
 
 #: src/gtk/sslcertwindow.c:440
@@ -5496,8 +5413,7 @@ msgstr "Kendt certifikat:"
 msgid ""
 "Certificate for %s has changed.\n"
 "%sDo you want to accept it?"
-msgstr ""
-"Certifikatet for %s er ændret.\n"
+msgstr "Certifikatet for %s er ændret.\n"
 "%sSkal det godkendes?"
 
 #: src/gtk/sslcertwindow.c:498
@@ -5530,444 +5446,436 @@ msgstr "(Uden Fra)"
 msgid "(No Subject)"
 msgstr "(Uden Emne)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr "Fejl:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr "Filstørrelse"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr "Indlæs billede"
 
-#: src/imap.c:582
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr "IMAP forbindelsen er brudt\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: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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP fejl på %s:"
 
-#: src/imap.c:627
+#: src/imap.c:628
 msgid "authenticated"
 msgstr "godkendt"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "ikke godkendt"
 
-#: src/imap.c:633
+#: src/imap.c:634
 msgid "bad state"
 msgstr "dårlig tilstand"
 
-#: src/imap.c:636
+#: src/imap.c:637
 msgid "stream error"
 msgstr "fejl i strøm"
 
-#: src/imap.c:639
+#: src/imap.c:640
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "fortolkerfejl (serveren overholder sandsynligvis ikke RFC-standarden)"
 
-#: src/imap.c:643
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "forbindelsen er afvist"
 
-#: src/imap.c:646
+#: src/imap.c:647
 msgid "memory error"
 msgstr "hukommelsesfejl"
 
-#: src/imap.c:649
+#: src/imap.c:650
 msgid "fatal error"
 msgstr "fatal fejl"
 
-#: src/imap.c:652
+#: src/imap.c:653
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "protokolfejl (serveren overholder sandsynligvis ikke RFC-standarden)"
 
-#: src/imap.c:656
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr "forbindelsen er ikke godkendt"
 
-#: src/imap.c:659
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr "APPEND-fejl"
 
-#: src/imap.c:662
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr "NOOP-fejl"
 
-#: src/imap.c:665
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr "LOGOUT-fejl"
 
-#: src/imap.c:668
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr "CAPABILITY-fejl"
 
-#: src/imap.c:671
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr "CHECK-fejl"
 
-#: src/imap.c:674
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr "CLOSE-fejl"
 
-#: src/imap.c:677
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr "EXPUNGE-fejl"
 
-#: src/imap.c:680
+#: src/imap.c:681
 msgid "COPY error"
 msgstr "COPY-fejl"
 
-#: src/imap.c:683
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr "UID COPY-fejl"
 
-#: src/imap.c:686
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr "CREATE-fejl"
 
-#: src/imap.c:689
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr "DELETE-fejl"
 
-#: src/imap.c:692
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr "EXAMINE-fejl"
 
-#: src/imap.c:695
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr "FETCH-fejl"
 
-#: src/imap.c:698
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr "UID FETCH-fejl"
 
-#: src/imap.c:701
+#: src/imap.c:702
 msgid "LIST error"
 msgstr "LIST-fejl"
 
-#: src/imap.c:704
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr "LOGIN-fejl"
 
-#: src/imap.c:707
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr "LSUB-fejl"
 
-#: src/imap.c:710
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr "RENAME-fejl"
 
-#: src/imap.c:713
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr "SEARCH-fejl"
 
-#: src/imap.c:716
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr "UID SEARCH-fejl"
 
-#: src/imap.c:719
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr "SELECT-fejl"
 
-#: src/imap.c:722
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr "STATUS-fejl"
 
-#: src/imap.c:725
+#: src/imap.c:726
 msgid "STORE error"
 msgstr "STORE-fejl"
 
-#: src/imap.c:728
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr "UID STORE-fejl"
 
-#: src/imap.c:731
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr "SUBSCRIBE-fejl"
 
-#: src/imap.c:734
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr "UNSUBSCRIBE-fejl"
 
-#: src/imap.c:737
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr "STARTTLS-fejl"
 
-#: src/imap.c:740
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr "INVAL-fejl"
 
-#: src/imap.c:743
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr "EXTENSION-fejl"
 
-#: src/imap.c:746
+#: src/imap.c:747
 msgid "SASL error"
 msgstr "SASL-fejl"
 
-#: src/imap.c:750
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr "SSL/TLS fejl"
 
-#: src/imap.c:754
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Ukendt fejl [%d]"
 
-#: src/imap.c:960
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
 "CRAM-MD5 logins only work if libetpan has been compiled with SASL support "
 "and the CRAM-MD5 SASL plugin is installed."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "CRAM-MD5 logind fungerer kun, hvis libetpan er oversat med SASL støtte, og "
 "udvidelsesmodulet CRAM-MD5 SASL installeret."
 
-#: src/imap.c:966
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
 "DIGEST-MD5 logins only work if libetpan has been compiled with SASL support "
 "and the DIGEST-MD5 SASL plugin is installed."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "DIGEST-MD5 logind fungerer kun, hvis libetpan er oversat med SASL støtte, og "
 "udvidelsesmodulet DIGEST-MD5 SASL installeret."
 
-#: src/imap.c:972
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
 "SCRAM-SHA-1 logins only work if libetpan has been compiled with SASL support "
 "and the SCRAM SASL plugin is installed."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "SCRAM-SHA-1 logind fungerer kun, hvis libetpan er oversat med SASL støtte, "
 "og udvidelsesmodulet SCRAM SASL er installeret."
 
-#: src/imap.c:978
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
 "PLAIN logins only work if libetpan has been compiled with SASL support and "
 "the PLAIN SASL plugin is installed."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "PLAIN logind fungerer kun, hvis libetpan er oversat med SASL støtte, og "
 "udvidelsesmodulet PLAIN SASL er installeret."
 
-#: src/imap.c:984
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
 "LOGIN logins only work if libetpan has been compiled with SASL support and "
 "the LOGIN SASL plugin is installed."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "LOGIN logind fungerer kun, hvis libetpan er oversat med SASL støtte, og "
 "udvidelsesmodulet LOGIN SASL er installeret."
 
-#: src/imap.c:991
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Fejl i forbindelsen til %s: logind afvist.%s"
 
-#: src/imap.c:995
+#: src/imap.c:1003
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Fejl i forbindeelsen til %s: logind afvist.%s\n"
 
-#: src/imap.c:1013
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Fejl ved forbindelsen til %s"
 
-#: src/imap.c:1020 src/imap.c:1023
+#: src/imap.c:1028 src/imap.c:1031
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP forbindelsen til %s er blevet afbrudt. Forbinder 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:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail behøver netadgang for at kunne få adgang til IMAP-serveren."
 
-#: src/imap.c:1163 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Usikker forbindelse"
 
-#: src/imap.c:1164 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/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 ""
-"Denne forbindelse er konfigureret til at være sikret ved brug af SSL/TLS, "
+msgstr "Denne forbindelse er konfigureret til at være sikret ved brug af SSL/TLS, "
 "men SSL/TLS er ikke til rådighed i denne udgave af Claws Mail. \n"
 "\n"
 "Vil du fortsætte at forbinde til denne server? Kommunikationen bliver ikke "
 "sikker."
 
-#: src/imap.c:1170 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "Fort_sæt med at forbinde"
 
-#: src/imap.c:1179
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Konto '%s': Forbinder til IMAP server: %s:%d..."
 
-#: src/imap.c:1244
+#: src/imap.c:1252
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Kan ikke forbinde til IMAP server: %s:%d"
 
-#: src/imap.c:1247
+#: src/imap.c:1255
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Kan ikke forbinde til IMAP server: %s:%d\n"
 
-#: src/imap.c:1279 src/imap.c:4146
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "Kan ikke starte STARTTLS session.\n"
 
-#: src/imap.c:1348
+#: src/imap.c:1359
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunne ikke logge ind til IMAP server %s.\n"
 
-#: src/imap.c:1351
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunne ikke logge ind til IMAP server %s."
 
-#: src/imap.c:1779
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "Tilføjer e-mails..."
 
-#: src/imap.c:1984 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopierer e-mails..."
 
-#: src/imap.c:2510
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr "Søgning fejlede pga serverfejl."
 
-#: src/imap.c:2594
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "kan ikke sætte sletteflag\n"
 
-#: src/imap.c:2601 src/imap.c:5097
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "kan ikke tømme\n"
 
-#: src/imap.c:2976
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Søger efter opsagte mapper i %s..."
 
-#: src/imap.c:2979
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Søger efter undermapper til %s..."
 
-#: src/imap.c:3267
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke oprette postkasse: Fejl i LIST\n"
 
-#: src/imap.c:3280
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "kan ikke oprette postkasse\n"
 
-#: src/imap.c:3411
+#: src/imap.c:3422
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke omdøbe postkasse: %s til %s\n"
 
-#: src/imap.c:3524
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette postkasse\n"
 
-#: src/imap.c:3803
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "Der opstod fejl i LIST\n"
 
-#: src/imap.c:3888
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr "Sætter e-mailflag..."
 
-#: src/imap.c:3991
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke vælge mappe: %s\n"
 
-#: src/imap.c:4143
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server kræver STARTTLS for logind.\n"
 
-#: src/imap.c:4153
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr "kan ikke genopfriske mulighederne.\n"
 
-#: src/imap.c:4158
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
 "compiled without STARTTLS support.\n"
-msgstr ""
-"Der opstod fejl i forbindelsen til %s: serveren kræver STARTTLS, men Claws "
+msgstr "Der opstod fejl i forbindelsen til %s: serveren kræver STARTTLS, men Claws "
 "Mail er oversat uden STARTTLS støtte.\n"
 
-#: src/imap.c:4166
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr "Server logind er deaktiveret.\n"
 
-#: src/imap.c:4389
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "Henter e-mail..."
 
-#: src/imap.c:5090
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan ikke sætte sletteflag: %d\n"
 
-#: src/imap.c:6125
+#: src/imap.c:6136
 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"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
-msgstr ""
-"Der er en eller flere IMAP-konti defineret. Imidlertid er denne version af "
+msgstr "Der er en eller flere IMAP-konti defineret. Imidlertid er denne version af "
 "Claws Mail opbygget uden IMAP støtte; dine IMAP konti er deaktiveret.\n"
 "\n"
 "Libetpan bør sandsynligvis installeres og Claws Mail rekompileres."
@@ -6036,8 +5944,7 @@ msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 "only and no mail, append '/' to the folder name)"
-msgstr ""
-"Indtast navnet på ny mappe:\n"
+msgstr "Indtast navnet på ny mappe:\n"
 "(hvis en mappe blot skal gemme undermapper\n"
 "og ingen e-mails, indsæt '/' efter mappenavnet)"
 
@@ -6060,8 +5967,7 @@ msgstr "Omdøb mappe"
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
-msgstr ""
-"Mappen kunne ikke omdøbes.\n"
+msgstr "Mappen kunne ikke omdøbes.\n"
 "Det ny mappenavn er ikke tilladt."
 
 #: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:372
@@ -6081,8 +5987,7 @@ msgid ""
 "will not be possible.\n"
 "\n"
 "Do you really want to delete?"
-msgstr ""
-"Alle mapper og e-mails under '%s' bliver slettet permanent. Genoprettelse "
+msgstr "Alle mapper og e-mails under '%s' bliver slettet permanent. Genoprettelse "
 "vil ikke være muligt.\n"
 "\n"
 "Skal de virkelig slettes?"
@@ -6130,8 +6035,7 @@ msgid ""
 "\n"
 "If there are new folders, created and subscribed to from another client, use "
 "\"Check for new folders\" at the mailbox's root folder."
-msgstr ""
-"Denne mappe er allerede abonneret og har ingen opsagte undermapper.\n"
+msgstr "Denne mappe er allerede abonneret og har ingen opsagte undermapper.\n"
 "\n"
 "Hvis der er nye mapper, oprettet og abonneret af en anden klient, brug "
 "\"Tjek for nye mapper\" ved postkassens rodmappe."
@@ -6182,8 +6086,7 @@ msgstr "Feltet med filnavn for kilde-mbox-filen må ikke være tomt."
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
-msgstr ""
-"Målmappen er ikke anført.\n"
+msgstr "Målmappen er ikke anført.\n"
 "Skal mbox-filen importeres til indbakken?"
 
 #: src/import.c:231
@@ -6281,8 +6184,7 @@ msgid ""
 "anywhere in the row will select that field for rename in the input area "
 "below the list. A double click anywhere in the row will also select the "
 "field for import."
-msgstr ""
-"Vælg det LDIF felt, som skal omdøbes eller udvælges til import i listen "
+msgstr "Vælg det LDIF felt, som skal omdøbes eller udvælges til import i listen "
 "ovenfor. Reserverede felter (markeret med afkrydsning i \"R\" kolonnen), "
 "bliver automatisk importeret og kan ikke omdøbes. Enkeltklik i Udvælg (\"U"
 "\") kolonnen anfører feltet til import med en afkrydsning. Enkeltklik hvor "
@@ -6350,250 +6252,246 @@ msgstr "Vælg Pine-fil"
 msgid "Import Pine file into Address Book"
 msgstr "Importér Pine-fil til adressebog"
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail behøver netadgang for at hente post."
 
-#: src/inc.c:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "%s mislykkedes\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "Henter nye e-mails"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "Annulleret"
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Henter"
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Færdig (%d e-mail (%s) hentet)"
 msgstr[1] "Færdig (%d e-mails (%s) hentet)"
 
-#: src/inc.c:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "Færdig (Ingen nye e-mails)"
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Der opstod fejl i forbindelsen"
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
-#: 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: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
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:397
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr "Tidsudløb"
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Færdig (%d ny e-mail)"
 msgstr[1] "Færdig (%d nye e-mails)"
 
-#: src/inc.c:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "Færdig (ingen nye e-mails)"
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Henter nye e-mails"
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Konto '%s': Forbinder til POP3 server: %s:%d..."
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Kan ikke forbinde til POP3 server: %s:%d"
 
-#: src/inc.c:927
+#: src/inc.c:932
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan ikke forbinde til POP3 server: %s:%d\n"
 
-#: src/inc.c:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Henter e-mails fra %s (%s)..."
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Henter antallet af nye e-mails (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Henter antallet af nye e-mails (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Henter antallet af nye e-mails (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "Henter antallet af nye e-mails (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Henter e-mail (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Henter (%d e-mail (%s) modtaget)"
 msgstr[1] "Henter (%d e-mails (%s) modtaget)"
 
-#: src/inc.c:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Forbindelsen til %s:%d mislykkedes."
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "Der opstod en fejl under behandling af email."
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
-msgstr ""
-"Der opstod en fejl under behandling af email:\n"
+msgstr "Der opstod en fejl under behandling af email:\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "Der er ikke mere diskplads"
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "Kan ikke skrive fil"
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "Sokkelfejl"
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Sokkelfejl ved forbindelse til %s:%d."
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "Forbindelsen lukket af ekstern vært."
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Forbindelsen til %s:%d lukket af ekstern vært."
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "Postkassen er låst."
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
-msgstr ""
-"Postkassen er låst:\n"
+msgstr "Postkassen er låst:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "Godkendelse mislykkedes."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
-msgstr ""
-"Godkendelse mislykkedes:\n"
+msgstr "Godkendelse mislykkedes:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
-msgstr ""
-"Sessionen løb ud for tid. Kan måske genoprettes ved at forøge værdien for "
+msgstr "Sessionen løb ud for tid. Kan måske genoprettes ved at forøge værdien for "
 "tidsudløbet i Indstillinger/Andet/Diverse."
 
-#: src/inc.c:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Forbindelsen til %s:%d løb ud for tid."
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr " Inkorporering annulleret\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1766
+#: 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
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutter"
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sDu arbejder offline. Skal det ophæves i %d %s?"
 
-#: src/inc.c:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sDu arbejder offline. Skal det ophæves?"
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "Ku_n én gang"
 
@@ -6635,8 +6533,7 @@ msgstr "Kaldenavn"
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
-msgstr ""
-"Filen '%s' findes allerede.\n"
+msgstr "Filen '%s' findes allerede.\n"
 "Mappen kan ikke oprettes."
 
 #: src/main.c:380
@@ -6644,8 +6541,7 @@ msgstr ""
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
-msgstr ""
-"Konfigurationen af %s er fundet.\n"
+msgstr "Konfigurationen af %s er fundet.\n"
 "Skal denne konfiguration migreres?"
 
 #: src/main.c:382
@@ -6655,8 +6551,7 @@ msgid ""
 "\n"
 "Your Sylpheed filtering rules can be converted by a\n"
 "script available at %s."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "Sylpheed filtreringsregler kan konverteres af et\n"
 "skript tilgængelig i %s."
@@ -6670,8 +6565,7 @@ 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 "
 "on your disk."
-msgstr ""
-"Med en backup har man mulighed for at genskabe en ældre version, men det kan "
+msgstr "Med en backup har man mulighed for at genskabe en ældre version, men det kan "
 "vare et stykke tid, hvis der er mellemlagret IMAP- eller nyhedsdata, og vil "
 "optage lidt ekstra diskplads."
 
@@ -6723,8 +6617,7 @@ 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 "
 "mailbox parent folder's context menu to try to fix it."
-msgstr ""
-"Claws Mail har fundet en konfigureret postkasse, som ikke er komplet. Det er "
+msgstr "Claws Mail har fundet en konfigureret postkasse, som ikke er komplet. Det er "
 "muligvis pga en fejlende IMAP konto. Brug \"Genopret mappetræ\" fra "
 "kontekstmenuen i postkassens forældermappe for at prøve at rette det."
 
@@ -6733,8 +6626,7 @@ 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 "
 "plugin and try again."
-msgstr ""
-"Claws Mail har fundet en konfigureret postkasse, men kunne ikke indlæse den. "
+msgstr "Claws Mail har fundet en konfigureret postkasse, men kunne ikke indlæse den. "
 "Det skyldes sandsynligvis et forældet eksternt udvidelsesmodul. Geninstallér "
 "modulet og prøv igen."
 
@@ -6816,8 +6708,7 @@ msgid ""
 "                         content format: headers first (To: required) until "
 "an\n"
 "                         empty line, then mail body until end of file."
-msgstr ""
-"  --compose-from-file filnavn\n"
+msgstr "  --compose-from-file filnavn\n"
 "                         åbn redigeringsvinduet med data fra den angivne "
 "fil;\n"
 "                         anvendelse - som filnavn for læsning fra standard "
@@ -6835,8 +6726,7 @@ msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
-msgstr ""
-"  --attach filnavn1 [filnavn2]...\n"
+msgstr "  --attach filnavn1 [filnavn2]...\n"
 "                          åbn redigeringsvinduet med de angivne filer\n"
 "                          vedhæftet"
 
@@ -6845,8 +6735,7 @@ msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         inserted"
-msgstr ""
-"  --insert filnavn1 [filnavn2]...\n"
+msgstr "  --insert filnavn1 [filnavn2]...\n"
 "                          åbn redigeringsvinduet med de angivne filer\n"
 "                          indsat"
 
@@ -6875,8 +6764,7 @@ msgid ""
 "g: tag\n"
 "                         request: search string\n"
 "                         recursive: false if arg. starts with 0, n, N, f or F"
-msgstr ""
-"  --search mappe type forespørgsel [recursivt]\n"
+msgstr "  --search mappe type forespørgsel [recursivt]\n"
 "                                                  søger postkasse\n"
 "                         eks: \"#mh/postkassepost/indbakke\" eller \"Post\"\n"
 "                         type: s[ubject] for emne, t[o] for Til:, "
@@ -6897,8 +6785,7 @@ msgstr "  --status [mappe]...   vis det totale antal af e-mails"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
-msgstr ""
-"  --status-full [mappe]...\n"
+msgstr "  --status-full [mappe]...\n"
 "                         vis status for hver mappe"
 
 #: src/main.c:2072
@@ -6914,10 +6801,9 @@ msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
 "file:// uri or an absolute path"
-msgstr ""
-"  --select mappe[/msg]   gå til den anførte mappe/e-mail\n"
-"                         mappe er en mappe-ID som f.eks.'mappe/under_mappe', en "
-"file:// uri eller en fuldstændig sti"
+msgstr "  --select mappe[/msg]   gå til den anførte mappe/e-mail\n"
+"                         mappe er en mappe-ID som f.eks.'mappe/under_mappe', "
+"en file:// uri eller en fuldstændig sti"
 
 #: src/main.c:2076
 msgid "  --online               switch to online mode"
@@ -6940,20 +6826,17 @@ msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug        slå fejlsøgningstilstand til/fra"
 
 #: src/main.c:2081
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h             vis hjælp og afslut"
+msgid "  --help -h              display this help"
+msgstr "  --help -h             vis hjælp"
 
 #: src/main.c:2082
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v          vis versionsinformation og afslut"
+msgid "  --version -v           output version information"
+msgstr "  --version -v          vis versionsinformation"
 
 #: src/main.c:2083
 msgid ""
-"  --version-full -V      output version and built-in features information "
-"and exit"
-msgstr ""
-"  --version-full -V      vis information om version og indbyggede funktioner "
-"og afslut"
+"  --version-full -V      output version and built-in features information"
+msgstr "  --version-full -V      vis version og indbyggede funktioner og afslut"
 
 #: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
@@ -6963,16 +6846,14 @@ msgstr "  --config-dir          vis konfigurationsmappen"
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
-msgstr ""
-"  --alternate-config-dir mappe\n"
+msgstr "  --alternate-config-dir mappe\n"
 "                         brug anførte konfigurationsmappe"
 
 #: src/main.c:2087
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
-msgstr ""
-"  --geometry -geometry [WxH][+X+Y]\n"
+msgstr "  --geometry -geometry [WxH][+X+Y]\n"
 "                         sæt geometrien for hovedvinduet"
 
 #: src/main.c:2104
@@ -7012,11 +6893,11 @@ msgstr "E-mails i kø"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nogle usendte e-mails er sat i kø. Vil du afslutte nu?"
 
-#: src/main.c:3019
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr "Netværkshåndtering: netværk online.\n"
 
-#: src/main.c:3025
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr "Netværkshåndtering: netværk offline.\n"
 
@@ -7778,7 +7659,7 @@ msgstr "Faldende"
 msgid "_Auto detect"
 msgstr "_Genkend automatisk"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr "Anvend mærker..."
 
@@ -7844,8 +7725,7 @@ msgid ""
 "home directory.\n"
 "If the location of an existing mailbox is specified, it will be\n"
 "scanned automatically."
-msgstr ""
-"Indtast placering af postkassen.\n"
+msgstr "Indtast placering af postkassen.\n"
 "Det kan enten være hele stien eller stien relativt til hjemmemappenHvis en "
 "eksisterende postkasse er angivet, bliver\n"
 "den automatisk skannet."
@@ -7866,8 +7746,7 @@ msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
-msgstr ""
-"Oprettelse af postkassen mislykkedes.\n"
+msgstr "Oprettelse af postkassen mislykkedes.\n"
 "Måske eksisterer nogle filer allerede, eller der er ikke skriveadgang."
 
 #: src/mainwindow.c:3415
@@ -7945,7 +7824,7 @@ msgstr "Der blev ikke fundet dublerede e-mails i %d mapper.\n"
 msgid "Select folder to go to"
 msgstr "Vælg mappe at gå til"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr "Behandlingsregler, som skal anvendes før mapperegler"
 
@@ -7953,14 +7832,13 @@ msgstr "Behandlingsregler, som skal anvendes før mapperegler"
 msgid "Processing rules to apply after folder rules"
 msgstr "Behandlingsregler, som skal anvendes efter mapperegler"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr "Konfiguration af filtrering"
 
 #: src/mainwindow.c:5200
 msgid "Can not register as default client: impossible to get executable path."
-msgstr ""
-"Kan ikke registreres som standardklient: umuligt at finde programstien."
+msgstr "Kan ikke registreres som standardklient: umuligt at finde programstien."
 
 #: src/mainwindow.c:5259
 msgid "Claws Mail has been registered as default client."
@@ -7969,8 +7847,7 @@ msgstr "Claws Mail er registreret som standardklient."
 #: src/mainwindow.c:5261
 msgid ""
 "Can not register as default client: impossible to write to the registry."
-msgstr ""
-"Kan ikke registreres som standardklient: umuligt at skrive på "
+msgstr "Kan ikke registreres som standardklient: umuligt at skrive på "
 "registreringsdatabasen."
 
 #: src/mainwindow.c:5275 src/setup.c:91
@@ -8039,8 +7916,7 @@ msgstr "(ingen)"
 msgid ""
 "Could not stat mbox file:\n"
 "%s\n"
-msgstr ""
-"Kunne ikke få status på mbox-fil:\n"
+msgstr "Kunne ikke få status på mbox-fil:\n"
 "%s\n"
 
 #: src/mbox.c:104
@@ -8048,8 +7924,7 @@ msgstr ""
 msgid ""
 "Could not open mbox file:\n"
 "%s\n"
-msgstr ""
-"Kunne ikke åbne mbox-fil:\n"
+msgstr "Kunne ikke åbne mbox-fil:\n"
 "%s\n"
 
 #: src/mbox.c:142
@@ -8076,8 +7951,7 @@ msgstr "Overskriv"
 msgid ""
 "Could not create mbox file:\n"
 "%s\n"
-msgstr ""
-"Kunne ikke oprette mbox-fil:\n"
+msgstr "Kunne ikke oprette mbox-fil:\n"
 "%s\n"
 
 #: src/mbox.c:565
@@ -8132,8 +8006,7 @@ msgid ""
 "Notification address: %s\n"
 "Return path: %s\n"
 "It is advised to not send the return receipt."
-msgstr ""
-"Beskedadressen til hvilken returkvitteringen sendes\n"
+msgstr "Beskedadressen til hvilken returkvitteringen sendes\n"
 "svarer ikke til returstien:\n"
 "Beskedadresse: %s\n"
 "Retursti: %s\n"
@@ -8170,8 +8043,7 @@ msgstr "Kun den første megabyte tekst vises"
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
-msgstr ""
-"Der kom en returkvittering for denne e-mail: Det blev set af modtageren."
+msgstr "Der kom en returkvittering for denne e-mail: Det blev set af modtageren."
 
 #: src/messageview.c:1904
 msgid "You asked for a return receipt in this message."
@@ -8189,8 +8061,7 @@ msgstr "Send kvittering"
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
-msgstr ""
-"Denne e-mail blev kun delvist hentet,\n"
+msgstr "Denne e-mail blev kun delvist hentet,\n"
 "og blev slettet på serveren."
 
 #: src/messageview.c:1960
@@ -8198,8 +8069,7 @@ msgstr ""
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
-msgstr ""
-"Denne e-mail blev kun delvist hentet;\n"
+msgstr "Denne e-mail blev kun delvist hentet;\n"
 "det drejer sig om %s."
 
 #: src/messageview.c:1964 src/messageview.c:1986
@@ -8215,8 +8085,7 @@ msgstr "Markér for sletning"
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
-msgstr ""
-"Denne e-mail blev kun delvist hentet;\n"
+msgstr "Denne e-mail blev kun delvist hentet;\n"
 "det drejer sig om %s og vil blive helt hentet."
 
 #: src/messageview.c:1975 src/messageview.c:1988
@@ -8229,8 +8098,7 @@ msgstr "Fjern markering"
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
-msgstr ""
-"Denne e-mail blev kun delvist hentet;\n"
+msgstr "Denne e-mail blev kun delvist hentet;\n"
 "det drejer sig om %s og vil blive slettet."
 
 #: src/messageview.c:2058
@@ -8241,8 +8109,7 @@ msgid ""
 "but according to its '%s' and '%s' headers it was not\n"
 "officially addressed to you.\n"
 "It is advised to not send the return receipt."
-msgstr ""
-"Denne e-mail anmoder om en returkvittering\n"
+msgstr "Denne e-mail anmoder om en returkvittering\n"
 "men ifølge dets '%s' og '%s' posthoveder var det ikke\n"
 "officielt adresseret til dig.\n"
 "Det anbefales at undlade at sende returkvittering."
@@ -8266,8 +8133,7 @@ msgid ""
 "to.\n"
 "Please choose which account you want to use for sending the receipt "
 "notification:"
-msgstr ""
-"Mere end én af dine konti bruger den adresse, som denne e-mail blev sendt "
+msgstr "Mere end én af dine konti bruger den adresse, som denne e-mail blev sendt "
 "til.\n"
 "Vælg konto for hvilken der skal sendes besked om modtagelse:"
 
@@ -8279,28 +8145,25 @@ msgstr "Kan ikke udskrive: e-mailen indeholder ikke tekst."
 msgid ""
 "\n"
 "  There are no messages in this folder"
-msgstr ""
-"\n"
+msgstr "\n"
 "  Der er ingen e-mails i denne mappe"
 
 #: src/messageview.c:2952
 msgid ""
 "\n"
 "  Message has been deleted"
-msgstr ""
-"\n"
+msgstr "\n"
 "  E-mailen blev slettet"
 
 #: src/messageview.c:2953
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
-msgstr ""
-"\n"
+msgstr "\n"
 "  E-mailen blev slettet eller flyttet til en anden mappe"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr "Der opstod en fejl under læring.\n"
 
@@ -8322,8 +8185,7 @@ msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr ""
-"Kan ikke flytte mappen '%s'\n"
+msgstr "Kan ikke flytte mappen '%s'\n"
 "\n"
 "%s."
 
@@ -8332,8 +8194,7 @@ msgstr ""
 msgid ""
 "Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
-msgstr ""
-"Skal postkassen '%s' virkelig flyttes?\n"
+msgstr "Skal postkassen '%s' virkelig flyttes?\n"
 "(E-mailene er ikke slettet fra disken)"
 
 #: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:300
@@ -8399,8 +8260,7 @@ msgstr "Tiden løb ud under tjek af signaturen. Klik ikonet for at prøve igen."
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
-msgstr ""
-"Tiden løb ud under tjek af signaturen. Klik ikonet eller tryk på '%s' for at "
+msgstr "Tiden løb ud under tjek af signaturen. Klik ikonet eller tryk på '%s' for at "
 "prøve igen."
 
 #: src/mimeview.c:1345
@@ -8412,7 +8272,7 @@ msgid "Go back to email"
 msgstr "Gå tilbage til e-mailen"
 
 #: 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:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kunne ikke gemme delen af en flerleddet e-mail: %s"
@@ -8427,8 +8287,7 @@ msgstr "Overskriv eksisterende fil '%s'?"
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
 "operation or skip error and continue?"
-msgstr ""
-"Der opstod en fejl mens en beskeddel #%d blev gemt. Vil du annullere "
+msgstr "Der opstod en fejl mens en beskeddel #%d blev gemt. Vil du annullere "
 "handlingen eller ignorere fejlen og fortsætte?"
 
 #: src/mimeview.c:1921
@@ -8474,8 +8333,8 @@ msgstr "Vælg målmappe"
 msgid "'%s' is not a directory."
 msgstr "'%s' er ikke en mappe."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr "Gem som"
 
@@ -8488,8 +8347,7 @@ msgstr "Åbn med"
 msgid ""
 "Enter the command-line to open file:\n"
 "('%s' will be replaced with file name)"
-msgstr ""
-"Indtast kommandoen for at åbne fil:\n"
+msgstr "Indtast kommandoen for at åbne fil:\n"
 "('%s' bliver erstattet med filnavnet)"
 
 #: src/mimeview.c:2335
@@ -8498,8 +8356,7 @@ msgid ""
 "Could not convert attachment name to UTF-16:\n"
 "\n"
 "%s"
-msgstr ""
-"Kunne ikke konvertere navnet af vedhæftet fil til UTF-16:\n"
+msgstr "Kunne ikke konvertere navnet af vedhæftet fil til UTF-16:\n"
 "\n"
 "%s"
 
@@ -8513,8 +8370,7 @@ msgid ""
 "dangerous and could compromise your computer.\n"
 "\n"
 "Do you want to run this file?"
-msgstr ""
-"Denne vedhæftning er en eksekverbar fil. At køre utroværdige binære "
+msgstr "Denne vedhæftning er en eksekverbar fil. At køre utroværdige binære "
 "programmer er farligt og kan kompromitere din computer.\n"
 "\n"
 "Skal dette program køres?"
@@ -8532,7 +8388,7 @@ msgstr "Type:"
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: 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
 msgid "Description:"
@@ -8614,8 +8470,7 @@ msgid ""
 "Mail has been built without News support; your News accounts are disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
-msgstr ""
-"Der er defineret en eller flere nyhedskonti. Imidlertid er denne version af "
+msgstr "Der er defineret en eller flere nyhedskonti. Imidlertid er denne version af "
 "Claws Mail opbygget uden nyhedsstøtte; dine nyhedskonti er deaktiveret.\n"
 "\n"
 "libetpan bør sandsynligvis installeres og Claws Mail kompileres igen."
@@ -8641,6 +8496,76 @@ msgstr "Aflys nyhedsgruppe"
 msgid "Rename newsgroup folder"
 msgstr "Omdøb nyhedsgruppemappe"
 
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr "OAuth2 mangler autorisationskode\n"
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr "OAuth2 forbindelsesfejl\n"
+
+#: src/oauth2.c:253 src/oauth2.c:367
+msgid "OAuth2 SSL connection error\n"
+msgstr "OAuth2 SSL forbindelsesfejl\n"
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr "OAuth2 access token modtaget\n"
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr "OAuth2 access token ikke modtaget\n"
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr "OAuth2 genopfrisket token modtaget\n"
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "OAuth2 genopfrisket token ikke modtaget\n"
+
+#: src/oauth2.c:452
+msgid "OAuth2 socket write error\n"
+msgstr "OAuth2 skrivefejl på sokkel\n"
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr "OAuth2 tidsudløb for sokkel\n"
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr "OAuth2 access token stadig opfrisket\n"
+
+#: src/oauth2.c:534
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr "OAuth2 modtaget access token ved brug af genopfrisket token\n"
+
+#: src/oauth2.c:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr "OAuth2 prøver at få ny access token med autorisationskode\n"
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr "OAuth2 modtaget access token\n"
+
+#: src/oauth2.c:583
+#, c-format
+msgid "OAuth2 original: %s\n"
+msgstr "OAuth2 original: %s\n"
+
+#: src/oauth2.c:584
+#, c-format
+msgid "OAuth2 encoded: %s\n"
+msgstr "OAuth2 indkodet: %s\n"
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr "OAuth2 afkodet: %s\n"
+"\n"
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr "Indtast masterløsen"
@@ -8665,8 +8590,7 @@ msgstr "Skifter masterløsen"
 msgid ""
 "If a master passphrase is currently active, it\n"
 "needs to be entered."
-msgstr ""
-"Hvis et masterløsen i øjeblikket er aktivt,\n"
+msgstr "Hvis et masterløsen i øjeblikket er aktivt,\n"
 "skal det indtastet."
 
 #: src/password_gtk.c:175
@@ -8689,16 +8613,14 @@ msgstr "Acpi underretter"
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
-msgstr ""
-"Sørg for at kernemodulet 'acerhk' er indlæst.\n"
+msgstr "Sørg for at kernemodulet 'acerhk' er indlæst.\n"
 "Det kan hentes fra http://www.cakey.de/acerhk/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
-msgstr ""
-"Sørg for at kernemodulet 'acer_acpi' er indlæst.\n"
+msgstr "Sørg for at kernemodulet 'acer_acpi' er indlæst.\n"
 "Det kan hentes fra http://www.cakey.de/aceracpi/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:73
@@ -8717,8 +8639,7 @@ msgstr "Sørg for at kernemodulet 'ibm_acpi' er indlæst."
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
-msgstr ""
-"Sørg for at have apanelc installeret.\n"
+msgstr "Sørg for at have apanelc installeret.\n"
 "Det kan hentes fra http://apanel.sourceforge.net/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:209
@@ -8875,8 +8796,7 @@ msgid ""
 "\n"
 "Default options can be set in /Configuration/Preferences/Plugins/Mail "
 "Archiver"
-msgstr ""
-"Dette udvidelsesmodul udstyrer Claws Mail med arkiveringsfunktioner.\n"
+msgstr "Dette udvidelsesmodul udstyrer Claws Mail med arkiveringsfunktioner.\n"
 "\n"
 "Det sætter dig i stand til at udvælge en e-mailmappe til arkivering, og "
 "derefter vælge navn, format og placering af arkivet. Undermapper kan "
@@ -8919,8 +8839,7 @@ msgid ""
 "Some uninitialized data prevents from starting\n"
 "the archiving process:\n"
 "%s%s"
-msgstr ""
-"Nogle uinitierede data forhindrer\n"
+msgstr "Noget uinitierede data forhindrer\n"
 "arkiveringsprocessen i at starte:\n"
 "%s%s"
 
@@ -8928,16 +8847,14 @@ msgstr ""
 msgid ""
 "\n"
 "- the folder to archive is not set"
-msgstr ""
-"\n"
+msgstr "\n"
 "- arkivmappen er ikke indsat."
 
 #: src/plugins/archive/archiver_gtk.c:531
 msgid ""
 "\n"
 "- the name for archive is not set"
-msgstr ""
-"\n"
+msgstr "\n"
 "- arkivnavnet er ikke indsat."
 
 #: src/plugins/archive/archiver_gtk.c:554
@@ -8975,8 +8892,7 @@ msgstr "Opretter arkiv"
 msgid ""
 "Not a valid file name:\n"
 "%s."
-msgstr ""
-"Et ugyldigt filnavn:\n"
+msgstr "Et ugyldigt filnavn:\n"
 "%s."
 
 #: src/plugins/archive/archiver_gtk.c:592
@@ -8984,8 +8900,7 @@ msgstr ""
 msgid ""
 "Not a valid Claws Mail folder:\n"
 "%s."
-msgstr ""
-"Ugyldig Claws Mail mappe:\n"
+msgstr "Ugyldig Claws Mail mappe:\n"
 "%s."
 
 #: src/plugins/archive/archiver_gtk.c:616
@@ -8996,8 +8911,7 @@ msgid ""
 "Files in list:   %d\n"
 "\n"
 "Continue anyway?"
-msgstr ""
-"Filer kunne ikke gemmes i mappe\n"
+msgstr "Filer kunne ikke gemmes i mappe\n"
 "Filer i mappe: %d\n"
 "Filer i liste: %d\n"
 "\n"
@@ -9008,8 +8922,7 @@ msgstr ""
 msgid ""
 "Archive creation error:\n"
 "%s"
-msgstr ""
-"Der opstod fejl under oprettelse af arkiv:\n"
+msgstr "Der opstod fejl under oprettelse af arkiv:\n"
 "%s"
 
 #: src/plugins/archive/archiver_gtk.c:746
@@ -9185,8 +9098,7 @@ 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"
 "will take to create the archive"
-msgstr ""
-"Vælg denne mulighed for at føje MD5-tjeksummer til hver fil i arkivet.\n"
+msgstr "Vælg denne mulighed for at føje MD5-tjeksummer til hver fil i arkivet.\n"
 "Vær dog klar over, at dette dramatisk forøger tiden for at\n"
 "oprette arkivet"
 
@@ -9200,8 +9112,7 @@ msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from at to@subject.\n"
 "Names will be truncated to max 96 characters"
-msgstr ""
-"Vælg denne mulighed for at bruge beskrivende navne for hver fil i arkivet.\n"
+msgstr "Vælg denne mulighed for at bruge beskrivende navne for hver fil i arkivet.\n"
 "Navneskema: dato_fra at til@emne.\n"
 "Navne bliver skåret af ved 96 tegn"
 
@@ -9209,8 +9120,7 @@ msgstr ""
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
-msgstr ""
-"Vælg denne mulighed for at slette e-mails efter arkivering\n"
+msgstr "Vælg denne mulighed for at slette e-mails efter arkivering\n"
 "For nærværende håndteres kun IMAP4, lokale mbox og POP3"
 
 #: src/plugins/archive/archiver_gtk.c:1321
@@ -9221,8 +9131,7 @@ msgstr "Valgmuligheder"
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
-msgstr ""
-"Vælg e-mails før en vis dato\n"
+msgstr "Vælg e-mails før en vis dato\n"
 "Datoformat skal overholde ISO-8601 [ÅÅÅÅ-MM-DD]"
 
 #: src/plugins/archive/archiver_prefs.c:217
@@ -9270,8 +9179,7 @@ msgstr "Diverse standardmuligheder"
 
 #: src/plugins/archive/archiver_prefs.c:418
 msgid "Choose this option to include subfolders in the archives by default"
-msgstr ""
-"Vælg denne mulighed for at inkludere undermapper i arkivet som standard"
+msgstr "Vælg denne mulighed for at inkludere undermapper i arkivet som standard"
 
 #: src/plugins/archive/archiver_prefs.c:419
 msgid "MD5sum"
@@ -9283,8 +9191,7 @@ msgid ""
 "default.\n"
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archives"
-msgstr ""
-"Vælg denne mulighed for at tilføje MD5 tjeksummer for hver fil i arkiverne "
+msgstr "Vælg denne mulighed for at tilføje MD5 tjeksummer for hver fil i arkiverne "
 "som standard.\n"
 "Vær dog klar over, at dette dramatisk forøger tiden for oprettelse af "
 "arkiverne"
@@ -9321,8 +9228,7 @@ msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
 "The deleted data will be unrecoverable."
-msgstr ""
-"Skal alle vedhæftninger fra de anførte e-mails virkelig slettes?\n"
+msgstr "Skal alle vedhæftninger fra de anførte e-mails virkelig slettes?\n"
 "\n"
 "De slettede data kan ikke genskabes."
 
@@ -9359,8 +9265,7 @@ msgid ""
 "\n"
 "Warning: this operation will be completely un-cancellable and the deleted "
 "attachments will be lost forever, and ever, and ever."
-msgstr ""
-"Dette udvidelsesmodul fjerner vedhæftninger fra e-mails.\n"
+msgstr "Dette udvidelsesmodul fjerner vedhæftninger fra e-mails.\n"
 "\n"
 "Advarsel: denne handling kan ikke annulleres og de slettede vedhæftninger er "
 "for evigt tabt."
@@ -9376,8 +9281,7 @@ msgid ""
 "attached. Mention appears on line %d, which begins with text: %s\n"
 "\n"
 "%s"
-msgstr ""
-"En vedhæftning er nævnt i denne e-mail, men ingen fil er vedhæftet. "
+msgstr "En vedhæftning er nævnt i denne e-mail, men ingen fil er vedhæftet. "
 "Bemærkningen forekommer i linie %d, som begynder med teksten: %s\n"
 "\n"
 "%s"
@@ -9396,8 +9300,7 @@ msgstr "Vedhæftningsadvarer"
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
-msgstr ""
-"Advarer brugeren, hvis der findes en reference til vedhæftninger i e-mailens "
+msgstr "Advarer brugeren, hvis der findes en reference til vedhæftninger i e-mailens "
 "tekst, og der ikke er nogen fil vedhæftet."
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:52
@@ -9414,8 +9317,7 @@ msgstr "Udtryk skelner mellem store og små bogstaver"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:93
 msgid "Case sensitive when matching for the regular expressions in the list"
-msgstr ""
-"Skelner mellem store og små bogstaver ved match med regulære udtryk i listen"
+msgstr "Skelner mellem store og små bogstaver ved match med regulære udtryk i listen"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:115
 msgid "Lines starting with quotation marks"
@@ -9426,8 +9328,7 @@ msgid ""
 "Exclude quoted lines from checking for the regular expressions above. Note "
 "that handmade quotes cannot be distinguished from quotes generated by "
 "replying."
-msgstr ""
-"Udeluk citatlinier fra tjek for de regulære udtryk ovenfor. Bemærk at "
+msgstr "Udeluk citatlinier fra tjek for de regulære udtryk ovenfor. Bemærk at "
 "indtastede anførselstegn ikke kan skelnes fra anførselstegn genereret af "
 "svaret."
 
@@ -9438,8 +9339,7 @@ msgstr "Fremsendt eller omdirigeret e-mail"
 #: src/plugins/attachwarner/attachwarner_prefs.c:132
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
-msgstr ""
-"Tjek ikke for manglende vedhæftninger ved videresendelse eller omdirigering "
+msgstr "Tjek ikke for manglende vedhæftninger ved videresendelse eller omdirigering "
 "af e-mails"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:310
@@ -9450,8 +9350,7 @@ msgstr "Signaturer"
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
-msgstr ""
-"Udeluk linier fra første signatur-skilletegn og fremad fra at blive tjekket "
+msgstr "Udeluk linier fra første signatur-skilletegn og fremad fra at blive tjekket "
 "med de regulære udtryk ovenfor"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:148
@@ -9502,8 +9401,7 @@ msgid ""
 "error is that it didn't learn from any mail.\n"
 "Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter "
 "with a few hundred spam and ham messages."
-msgstr ""
-"Udvidelsesmodulet bogofilter kunne ikke filtrere en e-mail. Den mulige grund "
+msgstr "Udvidelsesmodulet bogofilter kunne ikke filtrere en e-mail. Den mulige grund "
 "til fejlen er, at det ikke har lært noget fra forskellige e-mails. Brug \"/"
 "Markér/markér som spam\" og \"/Markér/markér som ham\" for at træne "
 "bogofiltret med nogle få hundrede spam- og ham-e-mails."
@@ -9513,8 +9411,7 @@ msgstr ""
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
-msgstr ""
-"Udvidelsesmodulet bogofilter kunne ikke filtrere en e-mail. Kommandoen '%s "
+msgstr "Udvidelsesmodulet bogofilter kunne ikke filtrere en e-mail. Kommandoen '%s "
 "%s %s' kunne ikke køres."
 
 #: src/plugins/bogofilter/bogofilter.c:740
@@ -9536,8 +9433,7 @@ msgstr "Bogofilter: lærer af e-mails..."
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 "%s"
-msgstr ""
-"Der opstod fejl under læring; '%s %s %s' returnerede fejlkode:\n"
+msgstr "Der opstod fejl under læring; '%s %s %s' returnerede fejlkode:\n"
 "%s"
 
 #: src/plugins/bogofilter/bogofilter.c:984
@@ -9554,8 +9450,7 @@ msgid ""
 "specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
-msgstr ""
-"Dette udvidelsesmodul kan tjekke alle e-mails, som modtages fra en IMAP, "
+msgstr "Dette udvidelsesmodul kan tjekke alle e-mails, som modtages fra en IMAP, "
 "LOCAL eller POP konto, for spam ved brug af bogofilter. Bogofiltret skal "
 "være installeret lokalt.\n"
 "\n"
@@ -9599,7 +9494,7 @@ msgstr "E-mails, som er større end dette bliver ikke tjekket"
 
 #: 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
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr "KB"
 
@@ -9662,8 +9557,7 @@ msgstr "Hvidlist afsendere fundet i adressebog/-mappe"
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
-msgstr ""
-"E-mails som kommer fra adressebogskontakter modtages i de normale mapper "
+msgstr "E-mails som kommer fra adressebogskontakter modtages i de normale mapper "
 "selv om de identificeres som spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
@@ -9681,8 +9575,7 @@ msgstr "Lær hvidlistede e-mails som ham"
 msgid ""
 "If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
-msgstr ""
-"Hvis bogofiltret opfatter en e-mail som spam eller usikkert, men det var "
+msgstr "Hvis bogofiltret opfatter en e-mail som spam eller usikkert, men det var "
 "hvidlistet, læres det som ham."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:279
@@ -9717,8 +9610,7 @@ msgid ""
 "error is that it didn't learn from any mail.\n"
 "Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with "
 "a few hundred spam and ham messages."
-msgstr ""
-"Udvidelsesmodule bsfilter kunne ikke filtrere en e-mail. Grunden til fejlen "
+msgstr "Udvidelsesmodule bsfilter kunne ikke filtrere en e-mail. Grunden til fejlen "
 "kan være, at den ikke har lært det af nogen e-mail.\n"
 "Brug \"/Markér/Markér som spam\" og \"/Markér/Markér som ham\" til at træne "
 "bsfilter med nogle få hundrede spam- og ham-e-mails."
@@ -9728,8 +9620,7 @@ msgstr ""
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
-msgstr ""
-"Udvidelsesmodulet bsfilter kunne ikke filtrere en e-mail. Kommandoen '%s' "
+msgstr "Udvidelsesmodulet bsfilter kunne ikke filtrere en e-mail. Kommandoen '%s' "
 "kunne ikke køres."
 
 #: src/plugins/bsfilter/bsfilter.c:475
@@ -9750,8 +9641,7 @@ msgid ""
 "specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
-msgstr ""
-"Dette udvidelsesmodul kan tjekke alle e-mails, som modtages fra en IMAP, "
+msgstr "Dette udvidelsesmodul kan tjekke alle e-mails, som modtages fra en IMAP, "
 "LOCAL eller POP konto, for spam ved brug af bsfilter. Bsfiltret skal være "
 "installeret lokalt.\n"
 "\n"
@@ -9774,8 +9664,7 @@ msgstr "Gem spam i"
 msgid ""
 "If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
-msgstr ""
-"Hvis bsfiltret opfatter en e-mail som spam eller usikkert, men det var "
+msgstr "Hvis bsfiltret opfatter en e-mail som spam eller usikkert, men det var "
 "hvidlistet, læres det som ham."
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:218
@@ -9796,8 +9685,7 @@ msgid ""
 "Scanning\n"
 "No socket information.\n"
 "Antivirus disabled."
-msgstr ""
-"Skanner\n"
+msgstr "Skanner\n"
 "Ingen sokkel-information.\n"
 "Antivirus er deaktiveret."
 
@@ -9806,8 +9694,7 @@ msgid ""
 "Scanning\n"
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
-msgstr ""
-"Skanner\n"
+msgstr "Skanner\n"
 "Clamd svarer ikke på ping.\n"
 "Kører clamd?"
 
@@ -9821,8 +9708,7 @@ msgstr "Fandt %s virus."
 msgid ""
 "Scanning error:\n"
 "%s"
-msgstr ""
-"Der opstod en fejl under skanning:\n"
+msgstr "Der opstod en fejl under skanning:\n"
 "%s"
 
 #: src/plugins/clamd/clamav_plugin.c:146
@@ -9843,8 +9729,7 @@ msgid ""
 "Init\n"
 "No socket information.\n"
 "Antivirus disabled."
-msgstr ""
-"Init\n"
+msgstr "Init\n"
 "Ingen sokkel-information.\n"
 "Antivirus er deaktiveret."
 
@@ -9853,8 +9738,7 @@ msgid ""
 "Init\n"
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
-msgstr ""
-"Init\n"
+msgstr "Init\n"
 "Clamd svarer ikke på ping.\n"
 "Kører clamd?"
 
@@ -9879,8 +9763,7 @@ msgid ""
 "and choose manual configuration for clamd.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
-msgstr ""
-"Dette udvidelsesmodul bruger Clam Antivirus til at skanne alle e-mails, som "
+msgstr "Dette udvidelsesmodul bruger Clam Antivirus til at skanne alle e-mails, som "
 "modtages fra en IMAP, LOCAL eller POP konto.\n"
 "\n"
 "Når en vedhæftning til en e-mail viser sig at indeholde en virus kan det "
@@ -9958,8 +9841,7 @@ msgstr "Hvor er clamd.conf"
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
-msgstr ""
-"Samlet sti til clamd.conf. Hvis feltet ikke er tomt, har udvidelsesmodulet "
+msgstr "Samlet sti til clamd.conf. Hvis feltet ikke er tomt, har udvidelsesmodulet "
 "automatisk lokaliseret filen"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:329
@@ -9995,8 +9877,7 @@ msgid ""
 "New config\n"
 "No socket information.\n"
 "Antivirus disabled."
-msgstr ""
-"Ny config-fil\n"
+msgstr "Ny config-fil\n"
 "Ingen sokkel-information\n"
 "Antivirus deaktiveret."
 
@@ -10005,8 +9886,7 @@ msgid ""
 "New config\n"
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
-msgstr ""
-"Ny config-fil\n"
+msgstr "Ny config-fil\n"
 "clamd svarer ikke på ping.\n"
 "Kører clamd?"
 
@@ -10015,8 +9895,7 @@ msgstr ""
 msgid ""
 "%s: Unable to open\n"
 "clamd will be disabled"
-msgstr ""
-"%s: Kan ikke åbne\n"
+msgstr "%s: Kan ikke åbne\n"
 "clamd deaktiveres"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:217
@@ -10024,8 +9903,7 @@ msgstr ""
 msgid ""
 "%s: Not able to find required information\n"
 "clamd will be disabled"
-msgstr ""
-"%s: Ude af stand til at finde krævet information\n"
+msgstr "%s: Ude af stand til at finde krævet information\n"
 "clamd deaktiveres"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:251
@@ -10069,8 +9947,7 @@ msgid ""
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "It is not really useful."
-msgstr ""
-"Dette udvidelsesmodul er kun en demo af, hvorledes man koder sådanne moduler "
+msgstr "Dette udvidelsesmodul er kun en demo af, hvorledes man koder sådanne moduler "
 "til Claws Mail. Det installerer et hook til ny log output og skriver det på "
 "stdout.\n"
 "\n"
@@ -10116,7 +9993,7 @@ msgstr "Åbn i fremviser (eksternt indhold er tilladt)"
 msgid "Do nothing (remote content is disabled)"
 msgstr "Gør ingenting (eksternt indhold er ikke tilladt)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Proxy"
@@ -10141,8 +10018,7 @@ msgid ""
 "from the network. Rendering of images, scripts, plugin objects or\n"
 "Java applets can still be enabled for content that is attached\n"
 "in the email."
-msgstr ""
-"Indlæsning af eksterne ressourcer kan føre til databeskyttelsesproblemer.\n"
+msgstr "Indlæsning af eksterne ressourcer kan føre til databeskyttelsesproblemer.\n"
 "Når indlæsning af eksternt indhold er deaktiveret, bliver intet\n"
 "hentet fra nettet. Gengivelse af billeder, skripts, objekter for\n"
 "udvidelsesmoduler eller Java applets er stadig tilladt for indhold,\n"
@@ -10168,7 +10044,7 @@ msgstr "CSS i denne fil bliver anvendt af alle dele af 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:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
+#: src/prefs_account.c:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Gen_nemse"
@@ -10177,96 +10053,95 @@ msgstr "Gen_nemse"
 msgid "Select stylesheet"
 msgstr "Vælg stilark"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr "Indlæsning af eksternt indhold er deaktiveret."
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr "Indlæs billeder"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr "Tillad eksternt indhold"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr "Tillad javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr "Tillad udvidelsesmoduler"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr "Tillad Java"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
 msgstr "Åbn links i ekstern browser"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Der opstod en fejl: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s er et misdannet eller ustøttet feed"
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr "Søg på nettet"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr "Åbn i fremviser"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr "Åbn i browser"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr "Åbn billede"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
 msgstr "Kopiér link"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
 msgstr "Hent link"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr "Gem billede som"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr "Kopiér billede"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr "Importér feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML fremviser"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
 "By default all remote content is blocked. Options can be found in /"
 "Configuration/Preferences/Plugins/Fancy"
-msgstr ""
-"Dette udvidelsesmodul gengiver HTML e-mails ved brug af WebKit %d.%d.%d-"
+msgstr "Dette udvidelsesmodul gengiver HTML e-mails ved brug af WebKit %d.%d.%d-"
 "biblioteket\n"
 "Standardmæssigt er al eksternt indhold blokeret. Mulighederne findes i "
 "Konfiguration/Indstillinger/Udvidelsesmoduler/Fancy"
@@ -10288,8 +10163,7 @@ msgid ""
 "ID and retrieval time.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
-msgstr ""
-"Dette udvidelsesmodul modificerer de hentede e-mails. Det indsætter "
+msgstr "Dette udvidelsesmodul modificerer de hentede e-mails. Det indsætter "
 "posthoveder med nogle ekstra oplysninger: UIDL, Claws Mail kontonavn, POP "
 "server, brugerID og tidspunkt for modtagelse.\n"
 "\n"
@@ -10349,8 +10223,7 @@ msgstr "Hentetidspunkt"
 msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
-msgstr ""
-"Tilføjer X-FETCH-TIME posthoved med dato og tidspunkt for modtagelse i "
+msgstr "Tilføjer X-FETCH-TIME posthoved med dato og tidspunkt for modtagelse i "
 "RFC822-format"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:130
@@ -10366,8 +10239,7 @@ msgid ""
 "confirmed the authorization, you will get an authorization code. Enter that "
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
-msgstr ""
-"Claws Mail skal autoriseres til Googles kontaktliste for at bruge "
+msgstr "Claws Mail skal autoriseres til Googles kontaktliste for at bruge "
 "udvidelsesmodulet Gdata.\n"
 "\n"
 "Besøg Googles autorisationsside ved at trykke på knappen nedenunder. Efter "
@@ -10450,16 +10322,14 @@ msgstr "GData modul: Fik autorisationskode, anmoder om autorisation\n"
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
-msgstr ""
-"GData modul: Autorisationskode ikke modtaget, anmodning om autorisation "
+msgstr "GData modul: Autorisationskode ikke modtaget, anmodning om autorisation "
 "annulleret\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:494
 msgid ""
 "GData plugin: Interactive authorization still running, no additional session "
 "started\n"
-msgstr ""
-"GData modul: Interaktiv autorisation kører stadig, yderligere sessioner er "
+msgstr "GData modul: Interaktiv autorisation kører stadig, yderligere sessioner er "
 "ikke startet\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:511
@@ -10475,8 +10345,7 @@ msgstr "GData modul: Autorisation godkendt efter genopfriskning\n"
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr ""
-"GData modul: Tidsforløb siden sidste genopfriskning: %d minutter, opfrisker "
+msgstr "GData modul: Tidsforløb siden sidste genopfriskning: %d minutter, opfrisker "
 "nu\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:603
@@ -10484,7 +10353,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData modul: Prøver at genopfriske autorisation\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:2025
 msgid "Authentication"
 msgstr "Godkendelse"
 
@@ -10508,14 +10377,12 @@ msgstr "GData"
 
 #: src/plugins/gdata/gdata_plugin.c:108
 msgid "Failed to register address completion hook in the GData plugin"
-msgstr ""
-"Kunne ikke registrere \"address completion hook\n"
+msgstr "Kunne ikke registrere \"address completion hook\n"
 "i udvidelsesmodulet GData"
 
 #: src/plugins/gdata/gdata_plugin.c:115
 msgid "Failed to register offline switch hook in the GData plugin"
-msgstr ""
-"Kunne ikke registrere \"offline switch hook\" i udvidelsesmodulet GData"
+msgstr "Kunne ikke registrere \"offline switch hook\" i udvidelsesmodulet GData"
 
 #: src/plugins/gdata/gdata_plugin.c:170
 msgid ""
@@ -10526,8 +10393,7 @@ msgid ""
 "into the Tab-address completion.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Dette udvidelsesmodul muliggør brug af GData-protokol i Claws Mail.\n"
+msgstr "Dette udvidelsesmodul muliggør brug af GData-protokol i Claws Mail.\n"
 "\n"
 "GData-protokollen er en grænseflade mod Google tjenester.\n"
 "For nærværende er den eneste implementerede funktionalitet at inkludere "
@@ -10542,7 +10408,7 @@ msgstr "GData integration"
 #: 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"
 
@@ -10576,8 +10442,7 @@ msgid ""
 "configuration. More details about this and others on README file.\n"
 "\n"
 "Feedback to <ricardo at mones.org> is welcome.\n"
-msgstr ""
-"Vis libravatar profilerbilleder i e-mails. Mere\n"
+msgstr "Vis libravatar profilerbilleder i e-mails. Mere\n"
 "information om libravatar i http://www.libravatar.org/. Med\n"
 "en gravatar.com profil, men ikke en libravatar, bliver disse også\n"
 "hentet (når omdirigering er tilladt i udvidelsesmodulets config).\n"
@@ -10622,8 +10487,7 @@ msgid ""
 "Icon cache successfully cleared:\n"
 "• %u missing entries removed.\n"
 "• %u files removed."
-msgstr ""
-"Icon-mellemlager nulstillet:\n"
+msgstr "Icon-mellemlager nulstillet:\n"
 "• %u manglende poster fjernet.\n"
 "• %u filer fjernet."
 
@@ -10639,8 +10503,7 @@ msgid ""
 "• %u files removed.\n"
 "• %u files failed to be read.\n"
 "• %u files couldn't be removed."
-msgstr ""
-"Fejl ved nulstilling af ikon-mellemlager:\n"
+msgstr "Fejl ved nulstilling af ikon-mellemlager:\n"
 "• %u manglende poster fjernet.\n"
 "• %u filer fjernet.\n"
 "• %u filer kunne ikke læses.\n"
@@ -10664,8 +10527,8 @@ msgid "Cache refresh interval"
 msgstr "Genopfriskningsinterval for mellemlager"
 
 #: 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:323 src/prefs_account.c:1697
+#: src/prefs_account.c:1855 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "timer"
 
@@ -10741,55 +10604,52 @@ msgstr "Omdirigér til et brugertilpasset URL"
 msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
-msgstr ""
-"Indtast den URL, til hvilken man skal omdirigeres, hvis der intet brugerikon "
+msgstr "Indtast den URL, til hvilken man skal omdirigeres, hvis der intet brugerikon "
 "findes. Er URL-feltet tomt, bruges libravatars standard orange ikon."
 
-#: src/plugins/libravatar/libravatar_prefs.c:397
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "_Tillad omdirigering til andre netsteder"
 
-#: 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"
-msgstr ""
-"Følg omdirigeringssvar fra libravatar server til andre avatar tjenester som "
+msgstr "Følg omdirigeringssvar fra libravatar server til andre avatar tjenester som "
 "f.eks. gravatar.com"
 
-#: src/plugins/libravatar/libravatar_prefs.c:407
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "_Tillad føderative servere"
 
-#: 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 "Prøv at hente en avatar fra libravatar serveren i afsenderens domæne"
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr "Anmod om tidsudløb"
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "sekunder"
 
-#: 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."
-msgstr ""
-"sæt til 0 for at bruge det globale tidsudløb for sokkel I/O. Maksimumværdi "
+msgstr "sæt til 0 for at bruge det globale tidsudløb for sokkel I/O. Maksimumværdi "
 "skal være mindre end det globale tidsudløb."
 
-#: src/plugins/libravatar/libravatar_prefs.c:472
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Ikon-mellemlager"
 
-#: src/plugins/libravatar/libravatar_prefs.c:476
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "Standard ved manglende ikontilstand"
 
-#: src/plugins/libravatar/libravatar_prefs.c:480
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Netværk"
 
@@ -10798,8 +10658,7 @@ msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
 "from the network."
-msgstr ""
-"Indlæsning af eksterne ressourcer kan føre til databeskyttelsesproblemer.\n"
+msgstr "Indlæsning af eksterne ressourcer kan føre til databeskyttelsesproblemer.\n"
 "Når indlæsning af eksternt indhold er deaktiveret, bliver intet\n"
 "hentet fra nettet."
 
@@ -10827,9 +10686,8 @@ msgstr "LiteHTML fremviser"
 msgid ""
 "Viewer plugin for HTML emails, using the litehtml library (http://www."
 "litehtml.com/)."
-msgstr ""
-"Fremvisermodulet til HTML email, som bruger litehtml biblioteket "
-"(http://www.litehtml.com/)."
+msgstr "Fremvisermodulet til HTML email, som bruger litehtml biblioteket (http://www."
+"litehtml.com/)."
 
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder"
@@ -10837,8 +10695,7 @@ msgstr "Mbox-postkasse"
 
 #: src/plugins/mailmbox/plugin.c:63
 msgid "This is a plugin to handle mailboxes in mbox format."
-msgstr ""
-"Dette er et udvidelsesmodul til håndtering af postkasser i mbox format."
+msgstr "Dette er et udvidelsesmodul til håndtering af postkasser i mbox format."
 
 #: src/plugins/mailmbox/plugin.c:84
 msgid "MBOX"
@@ -10849,8 +10706,7 @@ msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
-msgstr ""
-"Indtast placering af postkassen.\n"
+msgstr "Indtast placering af postkassen.\n"
 "Hvis en elsisterende postkasse er angivet, bliver\n"
 "den automatisk skannet."
 
@@ -10859,8 +10715,7 @@ msgstr ""
 msgid ""
 "All folders and messages under '%s' will be deleted.\n"
 "Do you really want to delete?"
-msgstr ""
-"Alle mapper og e-mails under '%s' slettes.\n"
+msgstr "Alle mapper og e-mails under '%s' slettes.\n"
 "Skal de virkelig slettes?"
 
 #: src/plugins/managesieve/managesieve.c:436
@@ -10921,7 +10776,7 @@ msgstr "Godkendelsesmetode er ikke tilgængelig"
 msgid "sending error on Sieve session: %s\n"
 msgstr "sender fejlmeddelelse 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:5834
 msgid "_Filter"
 msgstr "_Filter"
 
@@ -10978,7 +10833,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 "Indlæser..."
 
@@ -11030,8 +10885,7 @@ msgstr "Administrér Sieve filtrer"
 
 #: src/plugins/managesieve/sieve_manager.c:806
 msgid "To use Sieve, enable it in an account's preferences."
-msgstr ""
-"For at kunne anvende Sieve, skal det aktiveres i indstillingerne til en "
+msgstr "For at kunne anvende Sieve, skal det aktiveres i indstillingerne til en "
 "konto."
 
 #: src/plugins/managesieve/sieve_plugin.c:36
@@ -11045,14 +10899,13 @@ msgstr "Administrér Sieve filtrer..."
 
 #: src/plugins/managesieve/sieve_plugin.c:114
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
-msgstr ""
-"Administrér Sieve filtrer på en server ved brug af ManageSieve protokollen."
+msgstr "Administrér Sieve filtrer på en server ved brug af ManageSieve protokollen."
 
 #: src/plugins/managesieve/sieve_prefs.c:149
 msgid "Enable Sieve"
 msgstr "Aktivér Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr "Serverinformation"
 
@@ -11062,8 +10915,7 @@ msgstr "Servernavn"
 
 #: src/plugins/managesieve/sieve_prefs.c:172
 msgid "Connect to this host instead of the host used for receiving mail"
-msgstr ""
-"Forbind til denne vært i stedet for den vært, der bruges til at modtage email"
+msgstr "Forbind til denne vært i stedet for den vært, der bruges til at modtage email"
 
 #: src/plugins/managesieve/sieve_prefs.c:176
 msgid "Server port"
@@ -11104,28 +10956,28 @@ msgstr "Angiv godkendelse"
 
 #: 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:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 msgid "User ID"
 msgstr "Bruger-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/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
 msgid "Password"
 msgstr "Adgangskode"
 
-#: 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:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr "Godkendelsesmetode"
 
-#: 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/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
 msgid "Automatic"
 msgstr "Automatisk"
@@ -11164,8 +11016,7 @@ msgid ""
 "Default is ~/Mail/NewLog\n"
 "\n"
 "Current log is %s"
-msgstr ""
-"Dette udvidelsesmodul skriver en summarisk oversigt over posthovederne for "
+msgstr "Dette udvidelsesmodul skriver en summarisk oversigt over posthovederne for "
 "hver e-mail modtaget efter sortering.\n"
 "\n"
 "Standard er ~/Mail/NewLog\n"
@@ -11211,48 +11062,40 @@ msgstr "Udvidelsesmodulet for beskeder behøver støtte for tråde."
 
 #: src/plugins/notification/notification_plugin.c:232
 msgid "Failed to register folder item update hook in the Notification plugin"
-msgstr ""
-"Kunne ikke registrere \"folder item update hook\" i udvidelsesmodulet for "
+msgstr "Kunne ikke registrere \"folder item update hook\" i udvidelsesmodulet for "
 "beskeder"
 
 #: src/plugins/notification/notification_plugin.c:240
 msgid "Failed to register folder update hook in the Notification plugin"
-msgstr ""
-"Kunne ikke registrere \"folder update hook\" i udvidelsesmodulet for beskeder"
+msgstr "Kunne ikke registrere \"folder update hook\" i udvidelsesmodulet for beskeder"
 
 #: src/plugins/notification/notification_plugin.c:250
 msgid "Failed to register msginfo update hook in the Notification plugin"
-msgstr ""
-"Kunne ikke registrere \"msginfo update hook\" i udvidelsesmodulet for "
+msgstr "Kunne ikke registrere \"msginfo update hook\" i udvidelsesmodulet for "
 "beskeder"
 
 #: src/plugins/notification/notification_plugin.c:260
 msgid "Failed to register offline switch hook in the Notification plugin"
-msgstr ""
-"Kunne ikke registrere \"offline switch hook\" i udvidelsesmodulet for "
+msgstr "Kunne ikke registrere \"offline switch hook\" i udvidelsesmodulet for "
 "beskeder"
 
 #: src/plugins/notification/notification_plugin.c:271
 msgid "Failed to register main window close hook in the Notification plugin"
-msgstr ""
-"Kunne ikke registrere \"main window close hook\" i udvidelsesmodulet for "
+msgstr "Kunne ikke registrere \"main window close hook\" i udvidelsesmodulet for "
 "beskeder"
 
 #: src/plugins/notification/notification_plugin.c:284
 msgid "Failed to register got iconified hook in the Notification plugin"
-msgstr ""
-"Kunne ikke registrere \"got iconified hook\" i udvidelsesmodulet for beskeder"
+msgstr "Kunne ikke registrere \"got iconified hook\" i udvidelsesmodulet for beskeder"
 
 #: src/plugins/notification/notification_plugin.c:297
 msgid "Failed to register account list changed hook in the Notification plugin"
-msgstr ""
-"Kunne ikke registrere \"account list changed hook\" i udvidelsesmodulet for "
+msgstr "Kunne ikke registrere \"account list changed hook\" i udvidelsesmodulet for "
 "beskeder"
 
 #: src/plugins/notification/notification_plugin.c:310
 msgid "Failed to register theme change hook in the Notification plugin"
-msgstr ""
-"Kunne ikke registrere \"theme change hook\" i udvidelsesmodulet for beskeder"
+msgstr "Kunne ikke registrere \"theme change hook\" i udvidelsesmodulet for beskeder"
 
 #: src/plugins/notification/notification_plugin.c:429
 msgid ""
@@ -11262,8 +11105,7 @@ msgid ""
 "preferences dialog.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Dette udvidelsesmodul giver på forskellig vis brugeren mulighed for at "
+msgstr "Dette udvidelsesmodul giver på forskellig vis brugeren mulighed for at "
 "modtage beskeder om nye og ulæste e-mails.\n"
 "En mængde konfigureringsmuligheder findes i udvidelsesmodulsektionen af "
 "indstillingsdialogen.\n"
@@ -11753,114 +11595,113 @@ msgstr "Format"
 msgid "Optimized:"
 msgstr "Optimeret"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "PDF egenskaber"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "Indtast adgangskode"
 
-#: 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 "Dette dokument er låst og kræver adgangskode for at åbnes."
 
-#: 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 "af %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 "PDF gengivelse mislykkedes af ukendte grunde."
 
-#: 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 "Dokumentindeks"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "Første side"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr "Foregående side"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "Næste side"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "Sidste side"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "Forstør"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "Formindsk"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "Tilpas til sidehøjde"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "Tilpas til sidebredde"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "Rotér til venstre"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "Rotér til højre"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "Udskriv dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "Dokumentoplysninger"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "Sidenummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "Skalering"
 
-#: 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 "
 "Poppler %s Lib and the gs tool.\n"
 "\n"
 "Any feedback is welcome: iwkse at claws-mail.org"
-msgstr ""
-"Dette udvidelsesmodul muliggør fremvisning af PDF- og PostScript-"
+msgstr "Dette udvidelsesmodul muliggør fremvisning af PDF- og PostScript-"
 "vedhæftninger ved hjælp af Poppler %s biblioteket og gs værktøjet.\n"
 "\n"
 "Tilbagemeldinger er velkomne: 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-fremviser"
 
-#: 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 "
@@ -11868,8 +11709,7 @@ msgid ""
 "enable PostScript support please install gs program.\n"
 "\n"
 "%s"
-msgstr ""
-"Advarsel: kunne ikke finde ghostscript (gs) programmet, som kræves for, at "
+msgstr "Advarsel: kunne ikke finde ghostscript (gs) programmet, som kræves for, at "
 "udvidelsesmodulet %s kan behandle PostScript vedhæftninger, kun PDF-"
 "vedhæftninger vises. For at støtte PostScript skal gs programmet "
 "installeres.\n"
@@ -11912,83 +11752,86 @@ msgstr "Indtast løsendet for:"
 msgid "Bad passphrase.\n"
 msgstr "Forkert løsen.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Nøgleimport"
 
-#: 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?"
-msgstr ""
-"Denne nøgle er ikke i din nøglering. Skal Claws Mail prøve at importere den "
-"fra  en nøgleserver?"
+"This key is not in your keyring. Do you want Claws Mail to try and import it?"
+msgstr "Denne nøgle er ikke i din nøglering. Skal Claws Mail prøve at importere den?"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "_No"
+msgstr "_Nej"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "Fra en nøgleserver"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr "fra en nøglemappe på nettet"
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
-msgstr ""
-"\n"
+msgstr "\n"
 "  Nøgle-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 "   Denne nøgle er ikke i din nøglering.\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 burde være muligt at importere den "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
-msgstr ""
-"når du arbejder online,\n"
+msgstr "når du arbejder online,\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ølgende kommando: \n"
+msgstr "med en af følgende kommandoer: \n"
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
-msgstr ""
-"\n"
+msgstr "\n"
 "  Importerer nøgle-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 "   Denne nøgle er importeret til din nøglering.\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 "   Denne nøgle kunne ikke importeres til din nøglering.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Nøgleservere er ofte langsomme.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Prøv at importere den manuelt med komandoen:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
+msgstr "   Prøv at importere den manuelt med komandoen:"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr "eller"
+
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   Denne nøgle er i din nøglering.\n"
 
@@ -12007,8 +11850,7 @@ msgid ""
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
-msgstr ""
-"Dette udvidelsesmodul håndterer PGP kernefunktioner og muliggør automatisk "
+msgstr "Dette udvidelsesmodul håndterer PGP kernefunktioner og muliggør automatisk "
 "adressefuldførelse fra GPG-nøgleringen. Det bruges af andre "
 "udvidelsesmoduler, som f.eks. PGP/Mime.\n"
 "\n"
@@ -12048,8 +11890,8 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Sættes tiden til '0' holdes løsenet under hele 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:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minutter"
 
@@ -12069,8 +11911,7 @@ msgstr "Sti til GnuPG-programmet"
 msgid ""
 "If left blank the location of the GnuPG executable will be automatically "
 "determined."
-msgstr ""
-"Hvis placeringen af GnuPG-programmet ikke er angivet, bestemmes den "
+msgstr "Hvis placeringen af GnuPG-programmet ikke er angivet, bestemmes den "
 "automatisk."
 
 #: src/plugins/pgpcore/prefs_gpg.c:248
@@ -12181,8 +12022,7 @@ msgid ""
 "Key details: ID %s, primary identity %s <%s>\n"
 "\n"
 "Do you trust this key enough to use it anyway?"
-msgstr ""
-"Denne krypteringsnøgle er ikke fuldstændig troværdig.\n"
+msgstr "Denne krypteringsnøgle er ikke fuldstændig troværdig.\n"
 "Hvis du vælger at kryptere e-mailen med denne nøgle, ved du ikke\n"
 "med sikkerhed, om den ankommer hos den person, du ønsker.\n"
 "\n"
@@ -12359,16 +12199,14 @@ msgstr "Der opstod fejl ved at sætte den personlige nøgle: %s"
 #: src/plugins/pgpcore/sgpgme.c:782
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
-msgstr ""
-"Gpgme protokol '%s' er ubrugelig: driver '%s' er ikke korrekt installeret."
+msgstr "Gpgme protokol '%s' er ubrugelig: driver '%s' er ikke korrekt installeret."
 
 #: src/plugins/pgpcore/sgpgme.c:788
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 "version %s is required.\n"
-msgstr ""
-"Gpgme protokol '%s' er ubrugelig: driver '%s' version %s er installeret, men "
+msgstr "Gpgme protokol '%s' er ubrugelig: driver '%s' version %s er installeret, men "
 "version %s er påkrævet.\n"
 
 #: src/plugins/pgpcore/sgpgme.c:796
@@ -12380,16 +12218,14 @@ msgstr "Gpgme protokol '%s' er ubrugelig (ukendt problem)"
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
-msgstr ""
-"GnuPG er ikke korrekt installeret eller skal opgraderes.\n"
+msgstr "GnuPG er ikke korrekt installeret eller skal opgraderes.\n"
 "Støtte for OpenPGP er deaktiveret."
 
 #: src/plugins/pgpcore/sgpgme.c:889
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
-msgstr ""
-"Kontoens oplysninger skal gemmes med \"OK\", før der kan genereres et "
+msgstr "Kontoens oplysninger skal gemmes med \"OK\", før der kan genereres et "
 "nøglepar.\n"
 
 #: src/plugins/pgpcore/sgpgme.c:894
@@ -12401,8 +12237,7 @@ 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"
 "Do you want to create a new key pair now?"
-msgstr ""
-"Claws Mail fandt ikke en personlig PGP-nøgle, hvilket betyder, at du vil "
+msgstr "Claws Mail fandt ikke en personlig PGP-nøgle, hvilket betyder, at du vil "
 "være ude af stand til at signere e-mails eller modtage krypterede e-mails.\n"
 "Skal et nyt nøglepar oprettes nu?"
 
@@ -12415,8 +12250,7 @@ msgstr "Kunne ikke generere et nyt nøglepar: %s"
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
-msgstr ""
-"Genererer nyt nøglepar... Bevæg gerne musen rundt for at skabe en større "
+msgstr "Genererer nyt nøglepar... Bevæg gerne musen rundt for at skabe en større "
 "entropi..."
 
 #: src/plugins/pgpcore/sgpgme.c:1012
@@ -12430,8 +12264,7 @@ msgid ""
 "%s\n"
 "\n"
 "Do you want to export it to a keyserver?"
-msgstr ""
-"Dit nye nøglepar er genereret. Dets fingeraftryk er:\n"
+msgstr "Dit nye nøglepar er genereret. Dets fingeraftryk er:\n"
 "%s\n"
 "\n"
 "Skal det eksporteres til en nøgleserver?"
@@ -12495,8 +12328,7 @@ msgstr "Kunne ikke skrive på dekrypteret fil %s"
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
-msgstr ""
-"\n"
+msgstr "\n"
 "--- Start af PGP/Inline krypteret data ---\n"
 
 #: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
@@ -12549,8 +12381,7 @@ msgstr "Fejl ved datasignering, intet indhold."
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
-msgstr ""
-"Bemærk, at vedhæftninger ikke krypteres af PGP/Inline systemet, ej heller "
+msgstr "Bemærk, at vedhæftninger ikke krypteres af PGP/Inline systemet, ej heller "
 "posthoveder som f.eks. Emne."
 
 #: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
@@ -12584,8 +12415,7 @@ msgid ""
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
-msgstr ""
-"Dette udvidelsesmodul håndterer den forældede Inline-metode til signering og/"
+msgstr "Dette udvidelsesmodul håndterer den forældede Inline-metode til signering og/"
 "eller kryptering af e-mails. E-mails kan dekrypteres, signaturer bekræftes "
 "eller signeres, og dine egne e-mails krypteres.\n"
 "\n"
@@ -12622,8 +12452,7 @@ msgstr "OpenPGP digital underskrift"
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
-msgstr ""
-"Bemærk, at posthoveder, som f.eks. Emne, ikke krypteres af PGP/Mime systemet."
+msgstr "Bemærk, at posthoveder, som f.eks. Emne, ikke krypteres af PGP/Mime systemet."
 
 #: src/plugins/pgpmime/pgpmime.c:798
 msgid "PGP/Mime"
@@ -12645,8 +12474,7 @@ msgid ""
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
-msgstr ""
-"Dette Udvidelsesmodul håndterer PGP/MIME signerede og/eller krypterede e-"
+msgstr "Dette Udvidelsesmodul håndterer PGP/MIME signerede og/eller krypterede e-"
 "mails. E-mails kan dekrypteres, signaturer bekræftes eller underskrives og "
 "egne e-mails krypteres.\n"
 "\n"
@@ -12672,8 +12500,8 @@ msgstr "Vis Python konsol..."
 msgid "Refresh"
 msgstr "Genopfrisk"
 
-#: 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/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
 msgid "Browse"
 msgstr "Gennemse"
@@ -12685,8 +12513,7 @@ msgstr "Python"
 
 #: src/plugins/python/python_plugin.c:681
 msgid "Failed to register \"compose create hook\" in the Python plugin"
-msgstr ""
-"Registrering af \"compose create hook\" i Python udvidelsesmodul mislykkedes"
+msgstr "Registrering af \"compose create hook\" i Python udvidelsesmodul mislykkedes"
 
 #: src/plugins/python/python_plugin.c:767
 msgid ""
@@ -12733,8 +12560,7 @@ msgid ""
 "inclusion in the examples.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Dette udvidelsesmodul giver mulighed for integration af Python funktioner.\n"
+msgstr "Dette udvidelsesmodul giver mulighed for integration af Python funktioner.\n"
 "Python-kode kan interaktivt indtastes i en indlejret Python-konsol, under "
 "Værktøjer -> Vis Python-konsol eller gemmes i skripter.\n"
 "\n"
@@ -12786,15 +12612,13 @@ msgstr "Python integration"
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
 "%s"
-msgstr ""
-"Kunne ikke læse indholdet af gammel feeds.xml fil:\n"
+msgstr "Kunne ikke læse indholdet af gammel feeds.xml fil:\n"
 "%s"
 
 #: src/plugins/rssyl/opml_export.c:111
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
-msgstr ""
-"RSSYL:Der opstod fejl ved skrivning af '%s' til eksportlisten for dine "
+msgstr "RSSYL:Der opstod fejl ved skrivning af '%s' til eksportlisten for dine "
 "feeds.\n"
 
 #: src/plugins/rssyl/opml_export.c:132
@@ -12818,8 +12642,7 @@ msgid ""
 "%s\n"
 "\n"
 "Folder name '%s' is not allowed."
-msgstr ""
-"Fejl ved abonnering på feed\n"
+msgstr "Fejl ved abonnering på feed\n"
 "%s\n"
 "\n"
 "Navnet '%s' er ikke tilladt for mapper."
@@ -12831,8 +12654,7 @@ msgid ""
 "\n"
 "Each newsfeed will create a folder with appropriate entries, fetched from "
 "the web. You can read them, and delete or keep old entries."
-msgstr ""
-"Dette udvidelsesmodul tillader, at man opretter et postkasse-træ, hvor man "
+msgstr "Dette udvidelsesmodul tillader, at man opretter et postkasse-træ, hvor man "
 "kan tilføje nyheder fra feeds i RSS 1.0, RSS 2.0 eller Atom format.\n"
 "\n"
 "Hvert feed opretter en mappe med passende elementer, hentet fra nettet. Man "
@@ -12922,8 +12744,7 @@ msgstr "RSSYL: Kunne ikke behandle feed hos '%s'\n"
 #: src/plugins/rssyl/rssyl_feed.h:17
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
-msgstr ""
-"RSSYL: Programmet eksisterer, men kunne ikke afslutte opdateringen af feed "
+msgstr "RSSYL: Programmet eksisterer, men kunne ikke afslutte opdateringen af feed "
 "hos '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:270
@@ -12974,8 +12795,7 @@ msgstr "Ignorér omdåb af titel"
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
-msgstr ""
-"Aktivér dette for at beholde nuværende mappenavn, selv hvis feed-forfatter "
+msgstr "Aktivér dette for at beholde nuværende mappenavn, selv hvis feed-forfatter "
 "ændrer feedets titel."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:360
@@ -12997,7 +12817,7 @@ msgstr "Hent kommentarer om post yngre end"
 
 #: 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/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dage"
 
@@ -13074,8 +12894,7 @@ msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there?"
-msgstr ""
-"Oprettelse af nyt mappetræ mislykkedes.\n"
+msgstr "Oprettelse af nyt mappetræ mislykkedes.\n"
 "Måske eksisterer nogle filer allerede, eller der er ikke skrivetilladelse?"
 
 #: src/plugins/rssyl/rssyl.h:20
@@ -13131,8 +12950,7 @@ msgstr "Feed-mappe:"
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
-msgstr ""
-"I stedet for at bruge den officielle titel kan man indtaste et andet "
+msgstr "I stedet for at bruge den officielle titel kan man indtaste et andet "
 "mappenavn til feedet."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
@@ -13171,8 +12989,7 @@ msgid ""
 "<b>%s</b>:\n"
 "\n"
 "%s"
-msgstr ""
-"Der opstod fejl ved hentning af feed på\n"
+msgstr "Der opstod fejl ved hentning af feed på\n"
 "<b>%s</b>:\n"
 "\n"
 "%s"
@@ -13182,8 +12999,7 @@ msgstr ""
 msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
-msgstr ""
-"Intet gyldigt feed fundet\n"
+msgstr "Intet gyldigt feed fundet\n"
 "<b>%s</b>"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:154
@@ -13207,8 +13023,7 @@ msgid ""
 "<b>%s</b>\n"
 "\n"
 "Please contact developers, this should not happen."
-msgstr ""
-"Kunne ikke behandle feed fra\n"
+msgstr "Kunne ikke behandle feed fra\n"
 "<b>%s</b>\n"
 "\n"
 "Meddel dette til udviklerne, det skulle ikke kunne ske."
@@ -13221,8 +13036,7 @@ msgstr "Claws Mail behøver netadgang for at kunne opdatere dine feeds."
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
-msgstr ""
-"Der opstod et internt problem under opgradering af lagringsformat. Det "
+msgstr "Der opstod et internt problem under opgradering af lagringsformat. Det "
 "skulle ikke kunne ske. Rapportér hændelsen med debug output vedhæftet.\n"
 
 #: src/plugins/smime/plugin.c:59
@@ -13243,8 +13057,7 @@ msgid ""
 "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
-msgstr ""
-"Dette udvidelsesmodul håndterer S/MIME signerede og/eller krypterede e-"
+msgstr "Dette udvidelsesmodul håndterer S/MIME signerede og/eller krypterede e-"
 "mails. E-mails kan dekrypteres, signaturer kan bekræftes eller egne e-mails "
 "signeres og krypteres.\n"
 "\n"
@@ -13281,8 +13094,7 @@ msgstr "Kunne ikke lukke midlertidig fil"
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
-msgstr ""
-"Bemærk, at posthoveder, som f.eks. Emne, ikke krypteres af S/MIME systemet."
+msgstr "Bemærk, at posthoveder, som f.eks. Emne, ikke krypteres af S/MIME systemet."
 
 #: src/plugins/spam_report/spam_report.c:307
 msgid "Reporting spam..."
@@ -13306,8 +13118,7 @@ msgid ""
 " * spam-signal.fr\n"
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
-msgstr ""
-"Dette udvidelsesmodul rapporterer spam til forskellige steder.\n"
+msgstr "Dette udvidelsesmodul rapporterer spam til forskellige steder.\n"
 "For nærværende støttes følgende netsteder og metoder:\n"
 "\n"
 " * spam-signal.fr\n"
@@ -13356,8 +13167,7 @@ msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 "accessible."
-msgstr ""
-"Spamassassin kunne ikke filtrere en e-mail. Sandsynligvis skyldes fejlen, at "
+msgstr "Spamassassin kunne ikke filtrere en e-mail. Sandsynligvis skyldes fejlen, at "
 "en spamd dæmon ikke var indenfor rækkevidde. Se efter om spamd kører og kan "
 "nås."
 
@@ -13365,8 +13175,7 @@ msgstr ""
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
-msgstr ""
-"Claws Mail behøver netadgang for at kunne aflevere post til den eksterne "
+msgstr "Claws Mail behøver netadgang for at kunne aflevere post til den eksterne "
 "\"elev\"."
 
 #: src/plugins/spamassassin/spamassassin.c:561
@@ -13389,8 +13198,7 @@ msgid ""
 "specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
-msgstr ""
-"Dette udvidelsesmodul kan tjekke alle e-mails, som modtages fra en IMAP "
+msgstr "Dette udvidelsesmodul kan tjekke alle e-mails, som modtages fra en IMAP "
 "LOCAL eller POP konto, for spam ved brug af en SpamAssassin-server. Der skal "
 "køre en SpamAssassin-server (spamd) et eller andet sted.\n"
 "\n"
@@ -13464,8 +13272,7 @@ msgstr "Aktivér komprimering, hvis spamd bruger det, ellers deaktivér."
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
-msgstr ""
-"Længste tid for spam-tjek. Hvis tjekket tager længere tid bliver det afbrudt."
+msgstr "Længste tid for spam-tjek. Hvis tjekket tager længere tid bliver det afbrudt."
 
 #: src/plugins/tnef_parse/tnef_parse.c:74
 #, c-format
@@ -13474,8 +13281,7 @@ msgid ""
 "Claws Mail TNEF parser:\n"
 "\n"
 "%s\n"
-msgstr ""
-"\n"
+msgstr "\n"
 "Claws Mail TNEF fortolker:\n"
 "\n"
 "%s\n"
@@ -13508,8 +13314,7 @@ msgid ""
 "\n"
 "The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
 "Hand <yerase at yerot.com>"
-msgstr ""
-"Dette Claws Mail udvidelsesmodul kan læse vedhæftninger af typen "
+msgstr "Dette Claws Mail udvidelsesmodul kan læse vedhæftninger af typen "
 "\"application/ms-tnef\".\n"
 "\n"
 "Modulet bruger Ytnef biblioteket, som er copyright 2002-2007 af Randall Hand "
@@ -13642,8 +13447,7 @@ msgid ""
 "You will also be able to subscribe to remote Webcal feeds, export your "
 "meetings and calendars, publish your free/busy information and retrieve that "
 "information from others."
-msgstr ""
-"Dette udvidelsesmodul håndterer vCalendar-meddelelser som f.eks. produceret "
+msgstr "Dette udvidelsesmodul håndterer vCalendar-meddelelser som f.eks. produceret "
 "af Evolution eller Outlook.\n"
 "\n"
 "Når det er indlæst, oprettes i mappelisten en vCalendar-postkasse, som "
@@ -13691,151 +13495,149 @@ msgstr "Foreløbig accept"
 msgid "Decline"
 msgstr "Afslag"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr "Du har en Todo-opgave."
 
-#: 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:718
 msgid "Details follow:"
 msgstr "Detaljer følger:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "Du har oprettet et møde."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr "Du er blevet inviteret til et møde."
 
-#: 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 "Et møde, du er inviteret til, er aflyst."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr "En aftale er blevet videresendt til dig."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr "(dette er en gentagende begivenhed)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr "(dette er en del af en gentagende begivenhed)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Du har modtaget svar på et ukendt forslag."
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
 "%s has %s the invitation whose details follow:"
-msgstr ""
-"Du har modtaget svar på et mødeforslag.\n"
+msgstr "Du har modtaget svar på et mødeforslag.\n"
 "%s har %s invitationen, hvis detaljer følger:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr "Fejl - kunne ikke hente kalenderens MIME-del."
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr "Fejl - ingen kalenderdel fundet."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr "Fejl - Ukendt type af kalenderkomponent."
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
 msgstr "Send en besked til deltagerne"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr "Aflys møde"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Skal dette møde virkelig aflyses?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr "Ingen konto fundet"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
-msgstr ""
-"Du har ingen konto som matcher nogen af deltagerne.\n"
+msgstr "Du har ingen konto som matcher nogen af deltagerne.\n"
 "Skal der svares alligevel?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr "Svar alligevel"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr "Svar"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr "Redigér mødet..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr "Aflys mødet..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr "Åbn netside"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr "Du er allerede optaget på det tidspunkt."
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Begivenhed:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Lokation:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr "Starttidspunkt:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr "Sluttidspunkt:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Deltagere:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr "Handling:"
 
@@ -13900,8 +13702,7 @@ msgstr "senere"
 msgid ""
 "\n"
 "These are the events planned %s:\n"
-msgstr ""
-"\n"
+msgstr "\n"
 "Dette er de planlagte begivenheder %s:\n"
 
 #: src/plugins/vcalendar/vcal_folder.c:1615
@@ -13925,8 +13726,7 @@ msgid ""
 "%s:\n"
 "\n"
 "%s"
-msgstr ""
-"Kunne ikke hente Webcal's URL:\n"
+msgstr "Kunne ikke hente Webcal's URL:\n"
 "%s:\n"
 "\n"
 "%s"
@@ -13937,8 +13737,7 @@ msgid ""
 "This URL does not look like a Webcal URL:\n"
 "%s\n"
 "%s"
-msgstr ""
-"Denne URL ligner ikke en Webcal URL:\n"
+msgstr "Denne URL ligner ikke en Webcal URL:\n"
 "%s\n"
 "%s"
 
@@ -14069,8 +13868,7 @@ msgstr "Tilføj..."
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
-msgstr ""
-"Følgende personer er optaget på tidspunktet for dit planlagte møde:\n"
+msgstr "Følgende personer er optaget på tidspunktet for dit planlagte møde:\n"
 "- "
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:729
@@ -14134,8 +13932,7 @@ msgid ""
 "\n"
 "\n"
 "Everyone would be available %s or %s."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "Alle kan deltage %s eller %s."
 
@@ -14145,8 +13942,7 @@ msgid ""
 "\n"
 "\n"
 "Everyone would be available %s."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "Alle kan deltage %s."
 
@@ -14156,8 +13952,7 @@ msgid ""
 "\n"
 "It isn't possible to have this meeting with everyone in the previous or next "
 "6 hours."
-msgstr ""
-"\n"
+msgstr "\n"
 "\n"
 "Det er ikke muligt at afholde mødet med alle i de foregående og "
 "efterfølgende 6 timer."
@@ -14190,8 +13985,7 @@ msgstr ", men det kan lade sig gøre %s."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:777
 msgid ", and isn't available in the previous or next 6 hours."
-msgstr ""
-", og kan ikke være til rådighed i de forløbne eller efterfølgende 6 timer."
+msgstr ", og kan ikke være til rådighed i de forløbne eller efterfølgende 6 timer."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:834
 msgid "available"
@@ -14233,16 +14027,14 @@ msgstr "Alle er til rådighed."
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
-msgstr ""
-"Alle synes at være til rådighed, men nogles ledig/optaget oplysninger kunne "
+msgstr "Alle synes at være til rådighed, men nogles ledig/optaget oplysninger kunne "
 "ikke hentes."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
-msgstr ""
-"Kunne ikke sende mødeinvitationen.\n"
+msgstr "Kunne ikke sende mødeinvitationen.\n"
 "Tjek modtagerne."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
@@ -14308,8 +14100,7 @@ msgid ""
 "More information:\n"
 "\n"
 "%s"
-msgstr ""
-"Du har snart et møde eller en begivenhed.\n"
+msgstr "Du har snart et møde eller en begivenhed.\n"
 "Det starter kl. %s og slutter %s senere.\n"
 "Sted: %s\n"
 "Mere information:\n"
@@ -14405,8 +14196,7 @@ msgstr "Eksportér som GNOME shell kalenderserver"
 #: src/plugins/vcalendar/vcal_prefs.c:469
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
-msgstr ""
-"Registrér grænseflade for D-Bus  kalenderserver for at kunne eksportere "
+msgstr "Registrér grænseflade for D-Bus  kalenderserver for at kunne eksportere "
 "Claws Mail's kalender"
 
 #: src/plugins/vcalendar/vcal_prefs.c:479
@@ -14434,8 +14224,7 @@ msgstr "Hent andres ledig/optaget status fra"
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
 "left part of the email address, %d for the domain"
-msgstr ""
-"Angiv en lokal fil eller URL (http://server/path/file.ifb). Brug %u for "
+msgstr "Angiv en lokal fil eller URL (http://server/path/file.ifb). Brug %u for "
 "venstre del af e-mailadressen, %d for domænet"
 
 #: src/plugins/vcalendar/vcal_prefs.c:581
@@ -14454,617 +14243,663 @@ msgstr "Syntaksfejl i tidsstempel i hilsenen\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Syntaksfejl i tidsstempel i hilsenen (ikke ASCII)\n"
 
-#: src/pop.c:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "Fejl i POP protokol\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "Ugyldigt UIDL svar: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Sletter udløbet e-mail %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Overspringer e-mail %d [%s] (%d byte)\n"
 
-#: src/pop.c:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "postkassen er låst\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "Tidsudløb for session\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "Ustøttet kommando\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "Der opstod fejl i en POP session\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "Kommandoen TOP er ikke støttet\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr "Nyheder (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Lokal mbox-fil"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr "Intet (kun SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr "Kontonavn"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
 msgstr "Sæt som standard"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr "Fulde navn"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
 msgstr "E-mailadresse"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Automatisk konfigurering"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Annullér"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
-msgstr ""
-"Advarsel: Denne version af Claws Mail\n"
+msgstr "Advarsel: Denne version af Claws Mail\n"
 "er ikke bygget med støtte for IMAP og nyheder."
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr "Denne server kræver godkendelse"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr "Godkend forbindelsen"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr "Nyhedsserver"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr "Server for modtagelse"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr "Lokal postkasse"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr "SMTP server (send)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr "Brug post-kommando snarere end SMTP server"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr "kommando for afsendelse af e-mails"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr "Lokal"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr "Standardindbakke"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ufiltrerede e-mails bliver gemt i denne mnappe"
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
-msgstr "Brug sikker godkendelse (APOP)"
+#: src/prefs_account.c:1634
+msgid "Authenticate before POP connection"
+msgstr "Godkend før POP-forbindelse"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1658 src/prefs_account.c:2259
+msgid "Select"
+msgstr "Vælg"
+
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr "Fjern e-mails på serveren ved modtagelse"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr "Fjern efter"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dage og 0 timer : fjern med det samme"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr "Størrelsesbegrænsning ved modtagelse"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
-msgstr ""
-"E-mails over denne grænse bliver delvist modtaget. Når man vælger dem får "
+msgstr "E-mails over denne grænse bliver delvist modtaget. Når man vælger dem får "
 "man mulighed for at hente dem igen eller slette dem."
 
-#: src/prefs_account.c:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr "Det maksimale antal artikler, der kan hentes"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr "Ubegrænset, hvis 0 er angivet"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr "Flad tekst"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr "IMAP server-mappe"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr "(normalt tomt)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
 msgstr "Vis kun abonnerede mapper"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1831
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Båndbredde-effektiv tilstand (forhindrer, at fjerne mærker hentes))"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1833
 msgid "This mode uses less bandwidth, but can be slower with some servers."
-msgstr ""
-"Denne tilstand bruger mindre båndsbredde, men kan være langsommere med visse "
+msgstr "Denne tilstand bruger mindre båndsbredde, men kan være langsommere med visse "
 "servere."
 
-#: src/prefs_account.c:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatisk hentning"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr "Brug globale indstillinger"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Tjek for nye e-mails hver"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr "Filtrér e-mails ved modtagelse"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr "Tillad filtrering ved modtagelse ved brug af udvidelsesmoduler"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1908
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Hent Post' tjekker for nye e-mails til denne konto"
 
-#: src/prefs_account.c:1894 src/prefs_customheader.c:210
+#: 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
 msgid "Header"
 msgstr "Posthoved"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr "Generér E-mail-ID"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
 msgstr "Send kontoens e-mailadresse i E-mail-ID"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr "Tilføj posthoved med brugeragent"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr "Tilføj brugerdefineret posthoved"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP godkendelse (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
-msgstr ""
-"Hvis man lader disse felter være tomme, bruges den samme bruger-ID og "
+msgstr "Hvis man lader disse felter være tomme, bruges den samme bruger-ID og "
 "adgangskode som ved modtagelse."
 
-#: src/prefs_account.c:2033
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr "Godkend med POP før afsendelse"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr "Tidsudløb for POP godkendelse"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2233
+msgid "Authorization"
+msgstr "Autorisation"
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr "Vælg OAuth2 email service provider"
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr "Klient ID"
+
+#: src/prefs_account.c:2296
+msgid "Client secret"
+msgstr "Klient hemmelighed"
+
+#: src/prefs_account.c:2328
+msgid "Obtain authorization code"
+msgstr "Modtag autorisationskode"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr "Åbn standardbrowser med påkrav"
+
+#: src/prefs_account.c:2338
+msgid "Copy link"
+msgstr "Kopiér link"
+
+#: src/prefs_account.c:2350
+msgid "Authorization code"
+msgstr "Autorisationskode"
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr "Indsæt fuldstændig URL fra browser eller den anskaffede autorisationskode"
+
+#: src/prefs_account.c:2364
+msgid "Complete authorization"
+msgstr "Fuldfør autorisation"
+
+#: src/prefs_account.c:2368
+msgid "Authorize"
+msgstr "Autorisér"
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
 msgstr "Indsæt signatur automatisk"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr "Signaturskilletegn"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr "Kommando-output"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
 msgstr "Indsæt automatisk følgende adresser"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr "Ordbøger for stavekontrol"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Standardordbog"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Alternativ standardordbog"
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Skriv e-mail"
 
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: 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
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr "Standard databeskyttelsessystem"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Signér altid e-mails"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Kryptér altid e-mails"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2792
 msgid "Always sign messages when replying to a signed message"
 msgstr "Signér altid e-mails som svar på en signeret e-mail"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2795
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Kryptér altid e-mails som svar på en krypteret e-mail"
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2798
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Kryptér afsendte e-mails med egen nøgle i tillæg til modtagerens"
 
-#: src/prefs_account.c:2481
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr "Gem afsendte krypterede e-mails i klar tekst"
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
 msgid "Don't use SSL/TLS"
 msgstr "Brug ikke SSL/TLS"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: 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 "Brug SSL/TLS"
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Brug STARTTLS kommando for at starte en krypteret session"
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr "Send (SMTP)"
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:3004
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Brug ikke SSL/TLS (men brug STARTTLS om nødvendigt)"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr "Klientcertifikater"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr "Certifikat for modtagelse"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Klientcertifikatfil som en PKCS12 eller PEM fil"
 
-#: src/prefs_account.c:2732
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr "Certifikat for afsendelse"
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Acceptér automatisk gyldige SSL/TLS certifikater"
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr "Brug ikke-blokerende SSL/TLS"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3106
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Slå denne funktion fra, hvis der er problemer med SSL/TLS forbindelsen"
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Brug proxy server"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3207
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Brug standardindstillinger"
 
-#: src/prefs_account.c:2890
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
 msgstr "Brug globale proxy serverindstillinger"
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Brug godkendelse"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Brugernavn"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
 msgstr "Brug proxy server ved afsendelse"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
-msgstr ""
-"Hvis deaktiveret bliver e-mails sendt over den direkte forbindelse til "
+msgstr "Hvis deaktiveret bliver e-mails sendt over den direkte forbindelse til "
 "udgående server udenom evt. konfigureret proxy server."
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr "Domænenavn"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
-msgstr ""
-"Domænenavnet bruges i den genererede E-mail-ID, og når man forbinder til "
+msgstr "Domænenavnet bruges i den genererede E-mail-ID, og når man forbinder til "
 "SMTP-servere."
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr "Brug kommando til at kommunikere med serveren"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3451
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markér krydssendte e-mails som læste og med farve:"
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr "Læg sendte e-mails i"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr "Læg køede e-mails i"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr "Læg udkast i"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr "Læg slettede e-mails i"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr "Kontonavn er ikke angivet."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
 msgstr "E-mailadresse er ikke angivet."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr "SMTP-server er ikke angivet."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr "Bruger-ID er ikke angivet."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr "POP server er ikke angivet."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr "Standard-indbakkemappe findes ikke."
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr "IMAP server er ikke angivet."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr "NNTP server er ikke angivet."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3626
 msgid "local mailbox filename is not entered."
 msgstr "Filnavn for lokal postkasse er ikke angivet."
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
 msgstr "Postkommando er ikke angivet."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3642
 msgid "User ID cannot contain a newline character."
 msgstr "Bruger-ID må ikke indeholde tegn for ny linie."
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3647
 msgid "Password cannot contain a newline character."
 msgstr "Adgangskode må ikke indeholde tegn for ny linie."
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3678
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP bruger-ID må ikke indeholde tegn for ny linie."
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3683
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP adgangskode må ikke indeholde tegn for ny linie."
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr "Der er ikke valgt domæne."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr "Der er ikke valgt Sendt mappe."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr "Der er ikke vaLgt Kø mappe."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr "Der er ikke valgt Udkast mappe."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "Der er ikke valgt Papirkurv mappe."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr "Modtag"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Skabeloner"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr "Databeskyttelse"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr "Indstillinger for ny konto"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoindstillinger"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Mislykket (forkert adresse)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr "Vælg signaturfil"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Vælg certifikatfil"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (udvidelsesmodul ikke indlæst)"
@@ -15160,8 +14995,7 @@ msgid ""
 "The command\n"
 "%s\n"
 "has a syntax error."
-msgstr ""
-"Der er syntaksfejl i kommandoen\n"
+msgstr "Der er syntaksfejl i kommandoen\n"
 "%s.\n"
 " "
 
@@ -15225,8 +15059,7 @@ msgstr "<span weight=\"bold\">Begynd med:</span>"
 
 #: src/prefs_actions.c:975
 msgid "to send message body or selection to command's standard input"
-msgstr ""
-"for at sende brødtekst eller udvælgelse til en kommandos standard-input"
+msgstr "for at sende brødtekst eller udvælgelse til en kommandos standard-input"
 
 #: src/prefs_actions.c:976
 msgid "to send user provided text to command's standard input"
@@ -15234,8 +15067,7 @@ msgstr "for at sende brugerformidlet tekst til en kommandos standard-input"
 
 #: src/prefs_actions.c:977
 msgid "to send user provided hidden text to command's standard input"
-msgstr ""
-"for at sende brugerformidlet skjult tekst til en kommandos standard-input"
+msgstr "for at sende brugerformidlet skjult tekst til en kommandos standard-input"
 
 #: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">End with:</span>"
@@ -15243,13 +15075,11 @@ msgstr "<span weight=\"bold\">Afslut med:</span>"
 
 #: src/prefs_actions.c:979
 msgid "to replace message body or selection with command's standard output"
-msgstr ""
-"for at erstatte brødtekst eller udvælgelse med en kommandos standard-output"
+msgstr "for at erstatte brødtekst eller udvælgelse med en kommandos standard-output"
 
 #: src/prefs_actions.c:980
 msgid "to insert command's standard output without replacing old text"
-msgstr ""
-"For at indsætte en kommandos standard-output uden at erstatte den gamle tekst"
+msgstr "For at indsætte en kommandos standard-output uden at erstatte den gamle tekst"
 
 #: src/prefs_actions.c:981
 msgid "to run command asynchronously"
@@ -15300,8 +15130,7 @@ msgstr "Handlinger"
 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 ""
-"Handlingsfaciliteten er en måde, hvormed brugeren kan køre en ekstern "
+msgstr "Handlingsfaciliteten er en måde, hvormed brugeren kan køre en ekstern "
 "kommando for at behandle en hel e-mailfil eller blot en af dens dele."
 
 #: src/prefs_actions.c:1088 src/prefs_filtering.c:1702
@@ -15330,11 +15159,10 @@ msgstr "På %d\\n%f skrev:\\n%q\\n%X"
 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"
-msgstr ""
-"\\n\\nBegynd videresendt e-mail:\\n\\n?d{Dato: %d\\n}?f{Fra: %f\\n}?t{Til: %t"
+msgstr "\\n\\nBegynd videresendt e-mail:\\n\\n?d{Dato: %d\\n}?f{Fra: %f\\n}?t{Til: %t"
 "\\n}?c{Cc: %c\\n}?n{Nyhedsgrupper: %n\\n}?s{Emne: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:456
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15554,12 +15382,11 @@ msgstr "Kommando for 'Vis som tekst'"
 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 ""
-"Denne mulighed gør MIME-dele i stand til at blive vist i e-mailfremvisning "
+msgstr "Denne mulighed gør MIME-dele i stand til at blive vist i e-mailfremvisning "
 "vha et skript, som bruger det kontekstuelle menupunkt 'Vis som tekst'"
 
-#: 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:180
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "E-mailfremvisning"
 
@@ -15738,8 +15565,7 @@ msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
 "The following symbols can be used:"
-msgstr ""
-"'Kør' sender en e-mail eller et e-mailelement til et eksternt program eller "
+msgstr "'Kør' sender en e-mail eller et e-mailelement til et eksternt program eller "
 "skript.\n"
 "Følgende symboler kan bruges:"
 
@@ -15863,8 +15689,7 @@ msgstr "Filtreringsregel er ikke gemt"
 
 #: src/prefs_filtering.c:1483
 msgid "The list of filtering rules have been modified. Close anyway?"
-msgstr ""
-"Listen med filtreringsregler er blevet ændret. Skal den alligevel lukkes?"
+msgstr "Listen med filtreringsregler er blevet ændret. Skal den alligevel lukkes?"
 
 #: src/prefs_filtering.c:1705
 msgid "Move one page up"
@@ -15886,8 +15711,7 @@ msgstr "Konfiguration af mappelistens kolonner"
 msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
-msgstr ""
-"Udvælg kolonner for visning af mappelisten. Man kan ændre rækkefølgen\n"
+msgstr "Udvælg kolonner for visning af mappelisten. Man kan ændre rækkefølgen\n"
 "ved brug af Op/Ned pilene eller ved at trække dem med musen."
 
 #: src/prefs_folder_column.c:259 src/prefs_summary_column.c:273
@@ -15909,8 +15733,7 @@ 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 "
 "subfolders\"."
-msgstr ""
-"Disse indstillinger bliver ikke gemt, da dette er en topniveau-mappe.\n"
+msgstr "Disse indstillinger bliver ikke gemt, da dette er en topniveau-mappe.\n"
 "Imidlertid kan de indstilles for hele postkasse-træet ved brug af \"Anvend "
 "på undermapper\"."
 
@@ -15918,8 +15741,7 @@ msgstr ""
 msgid ""
 "Apply to\n"
 "subfolders"
-msgstr ""
-"Anvend på\n"
+msgstr "Anvend på\n"
 "undermapper"
 
 #: src/prefs_folder_item.c:318
@@ -15974,8 +15796,7 @@ msgstr "Skan for nye e-mails"
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
-msgstr ""
-"Slå denne mulighed til, hvis e-mailene leveres direkte til denne mappe af "
+msgstr "Slå denne mulighed til, hvis e-mailene leveres direkte til denne mappe af "
 "IMAP-filtrering fra serveren eller af et eksternt program"
 
 #: src/prefs_folder_item.c:513
@@ -15986,8 +15807,7 @@ msgstr "Vælg HTML-delen af en flerleddet e-mail"
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
-msgstr ""
-"\"Standard\" følger globale indstillinger (fundet i /Indstillinger/E-"
+msgstr "\"Standard\" følger globale indstillinger (fundet i /Indstillinger/E-"
 "mailliste/Tekstindstillinger)"
 
 #: src/prefs_folder_item.c:540
@@ -16097,27 +15917,43 @@ msgstr "Skrifttyper"
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Vis automatisk vedhæftede billeder"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr "Ændre billedstørrelse som standard"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
 msgstr "Ved klik på et billede skiftes skalering"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:96
+msgid "Fit image"
+msgstr "Tilpas bilede"
+
+#: src/prefs_image_viewer.c:99
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "Højreklik på et billede skifter tilpasning af højde/bredde"
+
+#: src/prefs_image_viewer.c:102
+msgid "Height"
+msgstr "Højde"
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr "Bredde"
+
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr "Vis billeder i brødteksten"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr "Udskriv billeder"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr "Billedfremviser"
 
@@ -16147,8 +15983,7 @@ msgid ""
 "The log is accessible from 'Tools/Filtering log'.\n"
 "Caution: enabling this option will slow down the filtering/processing, this "
 "might be critical when applying many rules upon thousands of messages."
-msgstr ""
-"Hvis afkrydset, logges filtrerings- og behandlingsregler.\n"
+msgstr "Hvis afkrydset, logges filtrerings- og behandlingsregler.\n"
 "Loggen findes under 'Værktøjer/Filtreringslog'.\n"
 "Forsigtig: aktivering af denne mulighed sænker hastigheden af filtrering/"
 "behandling, hvilket kan være kritisk ved anvendelse af mange regler på "
@@ -16204,8 +16039,7 @@ msgid ""
 "Choose High to explicitly show the reason why all rules are processed or "
 "skipped, and why all conditions are matched or not matched.\n"
 "Caution: the higher the level, the greater the impact on performance."
-msgstr ""
-"Vælg detaljeringsniveau for logning.\n"
+msgstr "Vælg detaljeringsniveau for logning.\n"
 "Anvend Lav for at se, hvilke betingelser matcher eller ikke matcher, og "
 "hvilke handlinger udføres, når reglerne er aktive.\n"
 "Anvend Mellem for at se flere detaljer om den e-mail, der behandles, og "
@@ -16322,11 +16156,11 @@ msgstr "Afsnit med brødteksten"
 msgid "whole message"
 msgstr "hele e-mailen"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr "Markeret"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr "slettet"
 
@@ -16334,11 +16168,11 @@ msgstr "slettet"
 msgid "Replied"
 msgstr "Besvaret"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Spam"
@@ -16347,7 +16181,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Har vedhæftning"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr "Signeret"
 
@@ -16451,8 +16285,7 @@ msgstr "Ekstern programtest"
 msgid ""
 "Use selector on the right to pick the header name. Type the name of the "
 "header if not available in the list."
-msgstr ""
-"Brug vælgeren tilhøjre til at hente navnet på posthovedet. Indtast "
+msgstr "Brug vælgeren tilhøjre til at hente navnet på posthovedet. Indtast "
 "posthovednavnet, hvis det ikke findes i listen."
 
 #: src/prefs_matcher.c:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
@@ -16513,8 +16346,7 @@ msgid ""
 "\n"
 "If you want to match %s against the whole address book, you have to select "
 "'%s' from the book/folder drop-down list."
-msgstr ""
-"Sti til bog/mappe er ikke angivet.\n"
+msgstr "Sti til bog/mappe er ikke angivet.\n"
 "\n"
 "Hvis %s skal matches mod hele adressebogen, skal '%s' vælges fra bogens/"
 "mappens rullegardin."
@@ -16603,8 +16435,7 @@ msgstr "Programreturneringer"
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
-msgstr ""
-"Elementet blev ikke gemt.\n"
+msgstr "Elementet blev ikke gemt.\n"
 "Skal der lukkes alligevel?"
 
 #: src/prefs_matcher.c:2233
@@ -16617,8 +16448,7 @@ msgid ""
 "program or script. The program will return either 0 or 1.\n"
 "\n"
 "The following symbols can be used:"
-msgstr ""
-"'Test' tillader afprøvning af en e-mail eller et e-mailelement ved brug af "
+msgstr "'Test' tillader afprøvning af en e-mail eller et e-mailelement ved brug af "
 "et eksternt program eller skript. Programmet returnerer enten 0 eller 1.\n"
 "\n"
 "Følgende symboler kan bliver brugt:"
@@ -16627,83 +16457,91 @@ msgstr ""
 msgid "Current condition rules"
 msgstr "Aktuelle betingelsesregler"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Posthoveder"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "Vis posthoved-rude ovenfor e-mailvindue"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr "Vis (X-)Face i e-mailvinduet"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "Gem (X-)Face i adressebog hvis muligt"
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr "Vis Face i e-mailvinduet"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr "Gem Face i adressebog hvis muligt"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "Vis posthoveder i e-mailvinduet"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "HTML e-mails"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "Gengiver HTML e-mails som tekst"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Gengiver rene HTML e-mails med udvidelsesmodul hvis muligt"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Vælg HTML-delen af flerleddede/alternative e-mails"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Linieafstand"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "pixel"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Rul"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Halv side"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Glat rulning "
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Trin"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Vis beskrivelse af vedhæftning (hellere end navne)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Citat"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Sammenfold citeret tekst med dobbeltklik"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Opfat disse tegn som anførselstegn"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Tekstvalg"
 
@@ -16718,8 +16556,7 @@ msgid ""
 "For further information see the %sClaws Mail website%s.\n"
 "\n"
 "Do you want to exit now?"
-msgstr ""
-"Din Claws Mail konfiguration er fra en nyere version end den version, som du "
+msgstr "Din Claws Mail konfiguration er fra en nyere version end den version, som du "
 "bruger i øjeblikket.\n"
 "\n"
 "Dette kan ikke anbefales.\n"
@@ -16861,8 +16698,7 @@ msgctxt "Tooltip"
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
-msgstr ""
-"Vælg farve til målmappen. Målmapper bruges, når funktionen 'Udfør straks, "
+msgstr "Vælg farve til målmappen. Målmapper bruges, når funktionen 'Udfør straks, "
 "når e-mails flyttes eller slettes' er deaktiveret"
 
 #: src/prefs_msg_colors.c:362
@@ -16982,8 +16818,7 @@ msgstr "Vælg prædefinerede:"
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
-msgstr ""
-"Man kan også ændre hver menugenvej ved at trykke\n"
+msgstr "Man kan også ændre hver menugenvej ved at trykke\n"
 "enhver tast og fokusere musepilen på elementet."
 
 #: src/prefs_other.c:497
@@ -17023,8 +16858,7 @@ msgid ""
 "If checked, you can change the keyboard shortcuts of most of the menu items "
 "by focusing on the menu item and pressing a key combination.\n"
 "Uncheck this option if you want to lock all existing keyboard shortcuts."
-msgstr ""
-"Ved afkrydsning kan man ændre tastaturgenveje  for de fleste menupunkter ved "
+msgstr "Ved afkrydsning kan man ændre tastaturgenveje  for de fleste menupunkter ved "
 "at fokusere på menupunktet og trykke på en tastekombination.\n"
 "Fjern afkrydsningen, hvis alle eksisterende genveje skal fastlåses."
 
@@ -17040,8 +16874,7 @@ msgstr "Metadata håndtering"
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
-msgstr ""
-"Sikker tilstand beder OS om at skrive metadata på disk direkte:\n"
+msgstr "Sikker tilstand beder OS om at skrive metadata på disk direkte:\n"
 "det forhindrer datatab efter nedbrud, men kan koste nogen tid."
 
 #: src/prefs_other.c:546
@@ -17064,8 +16897,7 @@ msgstr "Oversæt posthoveders navne"
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
-msgstr ""
-"Visning af standard-posthoveder (som f.eks. 'From:', 'Emne:') oversættes til "
+msgstr "Visning af standard-posthoveder (som f.eks. 'From:', 'Emne:') oversættes til "
 "dit sprog."
 
 #: src/prefs_other.c:592
@@ -17074,8 +16906,7 @@ msgstr "Spørg før tømning af papirkurven"
 
 #: src/prefs_other.c:594
 msgid "Ask about account specific filtering rules when filtering manually"
-msgstr ""
-"Spørg efter kontospecifikke filtreringsregler, når der filtreres manuelt"
+msgstr "Spørg efter kontospecifikke filtreringsregler, når der filtreres manuelt"
 
 #: src/prefs_other.c:599
 msgid "Use secure file deletion if possible"
@@ -17085,16 +16916,14 @@ msgstr "Brug sikker sletning af fil hvis muligt"
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
-msgstr ""
-"Brug sikker sletning af fil hvis muligt\n"
+msgstr "Brug sikker sletning af fil hvis muligt\n"
 "(programmet 'shred' er ikke tilgængelig)"
 
 #: src/prefs_other.c:608
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
-msgstr ""
-"Brug 'shred' programmet til at overskrive filer med tilfældig data før de "
+msgstr "Brug 'shred' programmet til at overskrive filer med tilfældig data før de "
 "slettes. Det gør sletning langsommere. Læs advarslerne i 'shred's man-sider."
 
 #: src/prefs_other.c:612
@@ -17113,8 +16942,7 @@ msgstr "Brug et masterløsen"
 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."
-msgstr ""
-"Hvis det afkrydses, bliver den gemte adgangskode til kontoen beskyttet af et "
+msgstr "Hvis det afkrydses, bliver den gemte adgangskode til kontoen beskyttet af et "
 "masterløsen. Hvis der ikke er oprettet et masterløsen, bliver man bedt om at "
 "gøre det."
 
@@ -17231,8 +17059,7 @@ msgstr "Udgående tegnkodning"
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
-msgstr ""
-"Hvis 'Automatisk' vælges, bliver den optimale tegnkodning anvendt for den "
+msgstr "Hvis 'Automatisk' vælges, bliver den optimale tegnkodning anvendt for den "
 "gældende lokalitet"
 
 #: src/prefs_send.c:267
@@ -17363,12 +17190,11 @@ msgstr "Transfer encoding"
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
-msgstr ""
-"Angiv brug af Content-Transfer-Encoding, når brødteksten indeholder ikke-"
+msgstr "Angiv brug af Content-Transfer-Encoding, når brødteksten indeholder ikke-"
 "ASCII tegn"
 
-#: 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:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "Sender"
 
@@ -17621,8 +17447,7 @@ msgstr "Udfør straks, når e-mails flyttes eller slettes"
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
-msgstr ""
-"Når flytning ikke er valgt, udsættes kopiering og sletning af e-mails indtil "
+msgstr "Når flytning ikke er valgt, udsættes kopiering og sletning af e-mails indtil "
 "'Værktøjer/Kør' vælges"
 
 #: src/prefs_summaries.c:599
@@ -17685,8 +17510,7 @@ msgstr "Konfiguration af e-maillistens kolonner"
 msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
-msgstr ""
-"Vælg kolonner for visning af e-maillisten. Rækkefølgen kan ændres\n"
+msgstr "Vælg kolonner for visning af e-maillisten. Rækkefølgen kan ændres\n"
 "med Op/Ned piletasterne eller ved at trække elementerne med musen."
 
 #: src/prefs_summary_open.c:109
@@ -17745,8 +17569,7 @@ msgstr "Dette navn er i brug som menupunkt"
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
-msgstr ""
-"Overskriv posthovedet 'Fra:' i kontoen. Dette ændrer ikke kontoen, der "
+msgstr "Overskriv posthovedet 'Fra:' i kontoen. Dette ændrer ikke kontoen, der "
 "skrives fra."
 
 #: src/prefs_template.c:309
@@ -17873,8 +17696,7 @@ msgstr "Skal dette tema virkelig fjernes?"
 msgid ""
 "File %s failed\n"
 "while removing theme."
-msgstr ""
-"Fejl i fil %s\n"
+msgstr "Fejl i fil %s\n"
 "mens et tema blev fjernet."
 
 #: src/prefs_themes.c:521
@@ -17898,8 +17720,7 @@ msgstr "Installér tema '%s'"
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
-msgstr ""
-"Denne mappe synes ikke at være en temamappe.\n"
+msgstr "Denne mappe synes ikke at være en temamappe.\n"
 "Skal den alligevel installeres?"
 
 #: src/prefs_themes.c:572
@@ -17916,8 +17737,7 @@ msgid ""
 "already installed in this location.\n"
 "\n"
 "Do you want to replace it?"
-msgstr ""
-"Et tema med samme navn er\n"
+msgstr "Et tema med samme navn er\n"
 "allerede installeret på dette sted.\n"
 "\n"
 "Skal det erstattes?"
@@ -17945,8 +17765,7 @@ msgstr "Installation af tema mislykkedes"
 msgid ""
 "File %s failed\n"
 "while installing theme."
-msgstr ""
-"Fejl i filen %s\n"
+msgstr "Fejl i filen %s\n"
 "mens tema blev installeret."
 
 #: src/prefs_themes.c:803
@@ -18020,8 +17839,7 @@ msgstr "Pixels per tomme (PPI)"
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
-msgstr ""
-"Den valgte handling er allerede indstillet.\n"
+msgstr "Den valgte handling er allerede indstillet.\n"
 "Vælg en anden handling fra listen"
 
 #: src/prefs_toolbar.c:187
@@ -18165,7 +17983,7 @@ msgstr "Ingen modtagernøgle defineret."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fejl ved afkodning af BASE64]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr "Beskeddel kunne ikke dekodes."
 
@@ -18190,16 +18008,14 @@ msgstr "En fejl opstod under en SMTP-session."
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
-msgstr ""
-"Ingen specifik konto blev fundet til afsendelse, og en fejl opstod under en "
+msgstr "Ingen specifik konto blev fundet til afsendelse, og en fejl opstod under en "
 "SMTP-session."
 
 #: src/procmsg.c:1676
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
-msgstr ""
-"Kunne ikke bestemme afsenderinformationen. Måske hidrører posten slet ikke "
+msgstr "Kunne ikke bestemme afsenderinformationen. Måske hidrører posten slet ikke "
 "fra Claws Mail."
 
 #: src/procmsg.c:1699
@@ -18352,8 +18168,7 @@ msgid ""
 "insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
-msgstr ""
-"Indsæt <span style=\"oblique\">expr</span> hvis x er angivet, hvor x er en "
+msgstr "Indsæt <span style=\"oblique\">expr</span> hvis x er angivet, hvor x er en "
 "af\n"
 "symbolerne [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "(eller deres lange ækvivalenter)"
@@ -18364,8 +18179,7 @@ msgid ""
 "of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
-msgstr ""
-"Indsæt <span style=\"oblique\">expr</span> hvis x ikke er angivet, hvor x er "
+msgstr "Indsæt <span style=\"oblique\">expr</span> hvis x ikke er angivet, hvor x er "
 "en af\n"
 "symbolerne [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "(eller deres lange ækvivalenter)"
@@ -18375,8 +18189,7 @@ msgid ""
 "insert file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
 "to insert"
-msgstr ""
-"indsæt fil:\n"
+msgstr "indsæt fil:\n"
 "<span style=\"oblique\">sub_expr</span> evalueres som stien til filen, der "
 "skal indsættes"
 
@@ -18386,8 +18199,7 @@ msgid ""
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
 "get\n"
 "the output from"
-msgstr ""
-"indsæt program output:\n"
+msgstr "indsæt program output:\n"
 "<span style=\"oblique\">sub_expr</span> evalueres som den kommando, der\n"
 "skal frembringe outputtet"
 
@@ -18396,8 +18208,7 @@ msgid ""
 "insert user input:\n"
 "<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
 "user-entered text"
-msgstr ""
-"indsæt bruger input:\n"
+msgstr "indsæt bruger input:\n"
 "<span style=\"oblique\">sub_expr</span> er en variabel, som erstattes af\n"
 "den af brugeren indtastede tekst"
 
@@ -18406,8 +18217,7 @@ msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
 "to attach"
-msgstr ""
-"Vedhæft fil:\n"
+msgstr "Vedhæft fil:\n"
 "<span style=\"oblique\">sub_expr</span> evalueres som stien til filen, der "
 "skal vedhæftes"
 
@@ -18417,8 +18227,7 @@ msgid ""
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
 "get\n"
 "the filename from"
-msgstr ""
-"indsæt fil:\n"
+msgstr "indsæt fil:\n"
 "<span style=\"oblique\">sub_expr</span> evalueres som den kommando,\n"
 "der skal frembringe filnavnet"
 
@@ -18430,16 +18239,14 @@ msgstr "<span weight=\"bold\">definition af termer:</span>"
 msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
-msgstr ""
-"tekst som kan indeholde et eller flere af symbolerne eller\n"
+msgstr "tekst som kan indeholde et eller flere af symbolerne eller\n"
 "kommandoerne ovenfor"
 
 #: src/quote_fmt.c:100
 msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
-msgstr ""
-"tekst som kan indeholde et eller flere af symbolerne ovenfor\n"
+msgstr "tekst som kan indeholde et eller flere af symbolerne ovenfor\n"
 "(men IKKE kommandoer)"
 
 #: src/quote_fmt.c:101
@@ -18448,8 +18255,7 @@ msgid ""
 "address of the header, it outputs the full name\n"
 "of the contact if that address matches exactly\n"
 "one contact in the address book"
-msgstr ""
-"færdiggørelse fra adressebogen virker kun med den første\n"
+msgstr "færdiggørelse fra adressebogen virker kun med den første\n"
 "adresse i posthovedet. Der leveres det fulde navn\n"
 "af kontakten, hvis adressen fuldstændig matcher\n"
 "en kontakt i adressebogen"
@@ -18470,8 +18276,7 @@ msgstr "Brug skabeloner ved nye e-mails"
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
-msgstr ""
-"Overskriv 'Fra' posthovedet. Dette ændrer ikke kontoen, der skrives fra."
+msgstr "Overskriv 'Fra' posthovedet. Dette ændrer ikke kontoen, der skrives fra."
 
 #: src/quote_fmt.c:297
 msgid "Use template when replying to messages"
@@ -18479,8 +18284,7 @@ msgstr "Brug skabeloner ved besvarelse af e-mails"
 
 #: src/quote_fmt.c:320
 msgid "Override From header. This doesn't change the account used to reply."
-msgstr ""
-"Overskriv 'Fra' posthovedet. Dette ændrer ikke kontoen, der svares fra."
+msgstr "Overskriv 'Fra' posthovedet. Dette ændrer ikke kontoen, der svares fra."
 
 #: src/quote_fmt.c:331 src/quote_fmt.c:459
 msgid "Quotation mark"
@@ -18492,15 +18296,13 @@ msgstr "Brug skabeloner ved videresendelse af e-mails"
 
 #: src/quote_fmt.c:448
 msgid "Override From header. This doesn't change the account used to forward."
-msgstr ""
-"Overskriv 'Fra' posthovedet. Dette ændrer ikke kontoen, der videresendes fra."
+msgstr "Overskriv 'Fra' posthovedet. Dette ændrer ikke kontoen, der videresendes fra."
 
 #: src/quote_fmt.c:557
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
-msgstr ""
-"\"Fra\" feltet i skabelonen \"Ny e-mail\" indeholder en ugyldig e-"
+msgstr "\"Fra\" feltet i skabelonen \"Ny e-mail\" indeholder en ugyldig e-"
 "mailadresse."
 
 #: src/quote_fmt.c:560
@@ -18524,94 +18326,93 @@ msgstr "Indtast tekst til erstatning for '%s'"
 msgid "Enter variable"
 msgstr "Indtast variabel"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Sender e-mail ved brug af kommando: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Kunne ikke udføre kommando: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Der opstod fejl under udførelse af kommando: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "Forbinder"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "POP finder sted før SMTP..."
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "POP før SMTP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Konto '%s': Forbinder til SMTP server: %s:%d..."
 
-#: src/send_message.c:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "Vellykket afsendelse af post."
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "Sender HELO..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "Sender e-mail..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "Sender EHLO..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "Sender MAIL FROM..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "Sender RCPT TO..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "Sender DATA..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "Afslutter..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sender e-mail (%d / %d byte)"
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "Sender e-mail"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "Der opstod fejl under afsendelse af e-mail."
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
-msgstr ""
-"Der opstod fejl under afsendelse af e-mail:\n"
+msgstr "Der opstod fejl under afsendelse af e-mail:\n"
 "%s"
 
 #: src/setup.c:75
@@ -18624,8 +18425,7 @@ msgid ""
 "You can use existing mailbox in MH format\n"
 "if you have the one.\n"
 "If you're not sure, just select OK."
-msgstr ""
-"Først skal placeringen af postkasse indsættes.\n"
+msgstr "Først skal placeringen af postkasse indsættes.\n"
 "Man kan bruge eksisterende postkasse i MH-format,\n"
 "hvis en sådan findes.\n"
 "Ved usikkerhed vælg bare OK."
@@ -18789,8 +18589,7 @@ msgstr "Ikke flere e-mails med etiket"
 
 #: src/summaryview.c:2185
 msgid "No labeled message found. Search from the end?"
-msgstr ""
-"Der blev ikke fundet e-mails med etiket. Skal der søges fra slutningen?"
+msgstr "Der blev ikke fundet e-mails med etiket. Skal der søges fra slutningen?"
 
 #: src/summaryview.c:2194 src/summaryview.c:2227
 msgid "No labeled messages."
@@ -18798,8 +18597,7 @@ msgstr "Ingen e-mails med etiket."
 
 #: src/summaryview.c:2214
 msgid "No labeled message found. Search from the beginning?"
-msgstr ""
-"Der blev ikke fundet e-mails med etiket. Skal der søges fra begyndelsen?"
+msgstr "Der blev ikke fundet e-mails med etiket. Skal der søges fra begyndelsen?"
 
 #: src/summaryview.c:2537
 msgid "Attracting messages by subject..."
@@ -18906,176 +18704,174 @@ msgstr "Fra: %s, på %s"
 msgid "To: %s, on %s"
 msgstr "Til: %s, på %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr "Du er ikke forfatter til artiklen."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4574
 #, 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] "Skal den valgte e-mail virkelig slettes?"
 msgstr[1] "Skal de %d valgte e-mails virkelig slettes?"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Slet e-mail"
 msgstr[1] "Slet e-mails"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr "Målet er den aktuelle mappe."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4796
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Vælg mappe til at gemme den valgte e-mail"
 msgstr[1] "Vælg mappe til at gemme de valgte e-mails"
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr "Målet for kopien er den aktuelle mappe."
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4881
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Vælg mappe til at kopiere den valgte e-mail til"
 msgstr[1] "Vælg mappe til at kopiere de valgte e-mails til"
 
-#: src/summaryview.c:5036
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr "Tilføj eller overskriv"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr "Tilføj eller overskriv eksisterende fil?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr "_Tilføj"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kunne ikke gemme filen '%s'."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5090
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Du er ved at skrive %d e-mails, en for en. Vil du fortsætte?"
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr "Bygger tråde..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr "Spring disse regler over"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5799
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Anvend disse regler uanset af hvilke konti, de tilhører"
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5802
 msgid "Apply these rules if they apply to the current account"
 msgstr "Anvend disse regler, hvis de vedrører den aktuelle konto"
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr "Filtrering"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
-msgstr ""
-"Der er nogle filtreringsregler, der tilhører en konto.\n"
+msgstr "Der er nogle filtreringsregler, der tilhører en konto.\n"
 "Vælg hvad der skal ske med disse regler:"
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr "Behandler konfigurationen"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6095
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "Vil du virkelig nulstille farveetiketten på alle valgte e-mails?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6097
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr "Vil du virkelig anvende denne farveetikette på alle valgte e-mails?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Reset color label"
 msgstr "Nulstil farveetiket"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Set color label"
 msgstr "Sæt farveetiket"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr "Ignorér tråd"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr "Overvåg tråd"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Besvaret, men også videresendt - klik for at se svaret"
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr "Besvaret - klik for at se svaret"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr "Skal flyttes"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr "Skal kopieres"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr "Signeret, har vedhæftninger"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr "Krypteret, har vedhæftninger"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr "Krypteret"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr "Har vedhæftninger"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
-msgstr ""
-"Fejl i regulært udtryk (regexp):\n"
+msgstr "Fejl i regulært udtryk (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8402
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Gå tilbage til mappelisten (Der er ulæste e-mails)"
 
-#: src/summaryview.c:8403
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr "Gå tilbage til mappelisten"
 
@@ -19116,8 +18912,7 @@ msgid ""
 "  This is probably due to a network error.\n"
 "\n"
 "  Use "
-msgstr ""
-"\n"
+msgstr "\n"
 "  Denne e-mail kan ikke vises.\n"
 "  Det skyldes nok en netværksfejl.\n"
 "\n"
@@ -19189,8 +18984,7 @@ msgid ""
 "The command to view attachment as text failed:\n"
 "    %s\n"
 "Exit code %d\n"
-msgstr ""
-"Der opstod fejl i kommandoen for at se vedhæftning som tekst:\n"
+msgstr "Der opstod fejl i kommandoen for at se vedhæftning som tekst:\n"
 "    %s\n"
 "Afslutningskode %d\n"
 
@@ -19665,8 +19459,7 @@ msgid ""
 "If you wish to donate to the Claws Mail project you can do\n"
 "so at <%s>.\n"
 "\n"
-msgstr ""
-"\n"
+msgstr "\n"
 "Velkommen til Claws Mail\n"
 "------------------------\n"
 "\n"
@@ -19753,15 +19546,13 @@ msgstr "Postkasse-navn:"
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
-msgstr ""
-"Man kan også angive en absolut sti, f.eks: \"/home/john/Dokumenter/E-mail\""
+msgstr "Man kan også angive en absolut sti, f.eks: \"/home/john/Dokumenter/E-mail\""
 
 #: src/wizard.c:1111
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
-msgstr ""
-"Man kan angive portnummeret ved at tilføje det bagpå: \"e-mail.eksempel."
+msgstr "Man kan angive portnummeret ved at tilføje det bagpå: \"e-mail.eksempel."
 "dk:25\""
 
 #: src/wizard.c:1114
@@ -19812,8 +19603,7 @@ msgstr "POP3"
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
-msgstr ""
-"Man kan angive portnummeret ved at tilføje det bag på: \"e-mail.eksempel."
+msgstr "Man kan angive portnummeret ved at tilføje det bag på: \"e-mail.eksempel."
 "dk:110\""
 
 #: src/wizard.c:1587
@@ -19832,8 +19622,7 @@ msgstr "Vis kun abonnerede mapper"
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
-msgstr ""
-"Advarsel: denne version af Claws Mail\n"
+msgstr "Advarsel: denne version af Claws Mail\n"
 "er dannet uden støtte for IMAP."
 
 #: src/wizard.c:1789
@@ -19851,8 +19640,7 @@ msgid ""
 "We will begin by defining some basic information about you and your most "
 "common mail options so that you can start to use Claws Mail in less than "
 "five minutes."
-msgstr ""
-"Velkommen til Claus Mail Opsætnings-Assistent\n"
+msgstr "Velkommen til Claus Mail Opsætnings-Assistent\n"
 "\n"
 "Vi begynder med at definere nogle grundlæggende oplysninger om dig og dine "
 "mest almindelige postmuligheder, sådan at du kan starte med at bruge Claws "
@@ -19886,6 +19674,59 @@ msgstr "Konfigurationen er afsluttet"
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
-msgstr ""
-"Claws Mail er nu klart til brug.\n"
+msgstr "Claws Mail er nu klart til brug.\n"
 "Klik Gem for at begynde."
+
+#~ msgid "_Yes"
+#~ msgstr "_Ja"
+
+#~ msgid "_New"
+#~ msgstr "_Ny"
+
+#~ msgid "_Properties"
+#~ msgstr "_Egenskaber"
+
+#~ msgid "Find and _Replace"
+#~ msgstr "Find og _Erstat"
+
+#~ msgid "_Bottom"
+#~ msgstr "_Bund"
+
+#~ msgid "_Down"
+#~ msgstr "_Ned"
+
+#~ msgid "_Next"
+#~ msgstr "_Næste"
+
+#~ msgid "_Previous"
+#~ msgstr "_Forrige"
+
+#~ msgid "_Top"
+#~ msgstr "_Top"
+
+#~ msgid "_Up"
+#~ msgstr "_Op"
+
+#~ msgid "_Add"
+#~ msgstr "_Tilføj"
+
+#~ msgid "_Stop"
+#~ msgstr "_Stop"
+
+#~ msgid "_Execute"
+#~ msgstr "_Kør"
+
+#~ msgid "_Refresh"
+#~ msgstr "_Genopfrisk"
+
+#~ msgid "_Apply"
+#~ msgstr "_Anvend"
+
+#~ msgid "_Quit"
+#~ msgstr "_Afslut"
+
+#~ msgid "_Rename"
+#~ msgstr "_Omdøb"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Brug sikker godkendelse (APOP)"
diff --git a/po/nl.po b/po/nl.po
index 983d30294..6abc598d0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,5 +1,5 @@
 # Dutch translation of Claws Mail.
-# Copyright © 2001 - 2020 The Claws Mail team.
+# Copyright © 2001 - 2021 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-2020 by Marcel Pol <marcel at timelord.nl>
+# Claws maintenance 2008-2021 by Marcel Pol <marcel at timelord.nl>
 #
 # TODO:
 # Snelkoppelingen nalopen.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.17.2\n"
+"Project-Id-Version: Claws Mail 3.17.9\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2020-02-11 15:14+0000\n"
-"PO-Revision-Date: 2020-02-18 16:30+0100\n"
+"POT-Creation-Date: 2021-07-03 09:16+0100\n"
+"PO-Revision-Date: 2021-07-09 10:39+0200\n"
 "Last-Translator: Marcel Pol <marcel at timelord.nl>\n"
 "Language-Team: translators at lists.claws-mail.org\n"
 "Language: nl\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -67,48 +67,48 @@ msgstr "Accounts met mappen op de server kunnen niet worden gekopieerd."
 msgid "Copy of %s"
 msgstr "Kopie van %s"
 
-#: src/account.c:1119
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Wil je werkelijk het account '%s' verwijderen?"
 
-#: src/account.c:1121
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr "(Geen titel)"
 
-#: src/account.c:1122
+#: src/account.c:1129
 msgid "Delete account"
 msgstr "Verwijder account"
 
-#: src/account.c:1596
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "O"
 
-#: src/account.c:1602
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 
-#: src/account.c:1609 src/addrduplicates.c:472 src/addressadd.c:223
-#: src/addressbook.c:128 src/compose.c:7473 src/editaddress.c:1474
+#: src/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
 #: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: 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
 msgid "Name"
 msgstr "Naam"
 
-#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:1625 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -159,7 +159,8 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
+#: 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/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -228,7 +229,7 @@ msgstr "Kan adresboek niet naar zichzelf kopiëren."
 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:689 src/addressbook.c:5018
+#: src/addr_compl.c:699 src/addressbook.c:5009
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Groep"
@@ -301,8 +302,8 @@ msgstr ""
 "Wil je werkelijk alle eigenschapnamen vervangen door\n"
 "de standaard set?"
 
-#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
-#: src/addressbook.c:484 src/edittags.c:286
+#: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:462
+#: src/addressbook.c:479 src/edittags.c:286
 #: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
 #: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "_Delete"
@@ -373,11 +374,11 @@ msgstr "Adres"
 msgid "Address book path"
 msgstr "Pad naar adresboek"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1445 src/addressbook.c:1498
+#: src/addrduplicates.c:791 src/addressbook.c:1436 src/addressbook.c:1489
 msgid "Delete address(es)"
 msgstr "Verwijder adres(sen)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1499
+#: src/addrduplicates.c:792 src/addressbook.c:1490
 msgid "Really delete the address(es)?"
 msgstr "Wil je de adressen echt verwijderen?"
 
@@ -385,7 +386,7 @@ msgstr "Wil je de adressen echt verwijderen?"
 msgid "Delete address"
 msgstr "Verwijder adres"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1446
+#: src/addrduplicates.c:842 src/addressbook.c:1437
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Deze adresgegevens zijn alleen-lezen en kunnen niet worden verwijderd."
 
@@ -406,7 +407,7 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressadd.c:599 src/addressbook.c:3268 src/addressbook.c:3319
+#: src/addressadd.c:599 src/addressbook.c:3259 src/addressbook.c:3310
 msgid "Add address(es)"
 msgstr "Voeg adres(sen) toe"
 
@@ -414,7 +415,7 @@ msgstr "Voeg adres(sen) toe"
 msgid "Can't add the specified address"
 msgstr "Kan het opgegeven adres niet toevoegen"
 
-#: src/addressbook.c:129 src/addressbook.c:5006 src/editaddress.c:1247
+#: 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
 msgid "Email Address"
@@ -424,136 +425,126 @@ msgstr "E-mailadres"
 msgid "_Book"
 msgstr "_Boek"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
+#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
+#: src/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
-#: src/messageview.c:216
-msgid "_Help"
-msgstr "_Help"
-
-#: src/addressbook.c:411 src/addressbook.c:469
+#: src/addressbook.c:410 src/addressbook.c:464
 msgid "New _Book"
 msgstr "Nieuw _Boek"
 
-#: src/addressbook.c:412 src/addressbook.c:470
+#: src/addressbook.c:411 src/addressbook.c:465
 msgid "New _Folder"
 msgstr "Nieuwe _Map"
 
-#: src/addressbook.c:413
+#: src/addressbook.c:412
 msgid "New _vCard"
 msgstr "Nieuwe _vCard"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:416
 msgid "New _JPilot"
 msgstr "Nieuwe _JPilot"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:419
 msgid "New LDAP _Server"
 msgstr "Nieuwe LDAP-_Server"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:423
 msgid "_Edit book"
 msgstr "_Bewerk boek"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:424
 msgid "_Delete book"
 msgstr "_Verwijder boek"
 
-#: src/addressbook.c:427 src/compose.c:624
+#: src/addressbook.c:426 src/compose.c:632
 #: 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:428 src/compose.c:628 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
+#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
 msgid "_Select all"
 msgstr "_Alles selecteren"
 
-#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
+#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
 msgid "C_ut"
 msgstr "K_nippen"
 
-#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
+#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
+#: src/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
-#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: src/addressbook.c:440 src/addressbook.c:486
+#: src/addressbook.c:439 src/addressbook.c:481
 msgid "New _Address"
 msgstr "Nieuw _Adres"
 
-#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
+#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
 msgid "New _Group"
 msgstr "Nieuwe _Groep"
 
-#: src/addressbook.c:443 src/addressbook.c:493
+#: src/addressbook.c:442 src/addressbook.c:488
 msgid "_Mail To"
 msgstr "_Verzenden Aan"
 
-#: src/addressbook.c:444 src/addressbook.c:497
+#: src/addressbook.c:443 src/addressbook.c:492
 msgid "_Merge"
 msgstr "_Samenvoegen"
 
-#: src/addressbook.c:448
+#: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr "_LDIF-bestand importeren..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Import M_utt file..."
 msgstr "_Mutt-bestand importeren..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Import _Pine file..."
 msgstr "_Pine-bestand importeren..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:451
 msgid "Export _HTML..."
 msgstr "_HTML-bestand exporteren..."
 
-#: src/addressbook.c:453
+#: src/addressbook.c:452
 msgid "Export LDI_F..."
 msgstr "LDI_F-bestand exporteren..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:454
 msgid "Find duplicates..."
 msgstr "Vind dubbele adressen..."
 
-#: src/addressbook.c:456
+#: src/addressbook.c:455
 msgid "Edit custom attributes..."
 msgstr "Bewerk aangepaste eigenschappen..."
 
-#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
-#: src/messageview.c:340
-msgid "_About"
-msgstr "_Over"
-
-#: src/addressbook.c:495
+#: src/addressbook.c:490
 msgid "_Browse Entry"
 msgstr "_Bekijk item"
 
-#: src/addressbook.c:509 src/crash.c:457 src/crash.c:476 src/importldif.c:114
+#: 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
@@ -561,120 +552,120 @@ msgstr "_Bekijk item"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
 msgid "Success"
 msgstr "Gelukt"
 
-#: src/addressbook.c:517 src/importldif.c:122
+#: src/addressbook.c:512 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Fout argument"
 
-#: src/addressbook.c:518 src/importldif.c:123
+#: src/addressbook.c:513 src/importldif.c:123
 msgid "File not specified"
 msgstr "Bestand niet opgegeven"
 
-#: src/addressbook.c:519 src/importldif.c:124
+#: src/addressbook.c:514 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Fout bij openen bestand"
 
-#: src/addressbook.c:520 src/importldif.c:125
+#: src/addressbook.c:515 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Fout bij lezen bestand"
 
-#: src/addressbook.c:521 src/importldif.c:126
+#: src/addressbook.c:516 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Einde van bestand tegengekomen"
 
-#: src/addressbook.c:522 src/importldif.c:127
+#: src/addressbook.c:517 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Fout bij reserveren van geheugen"
 
-#: src/addressbook.c:523 src/importldif.c:128
+#: src/addressbook.c:518 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Fout bestandsformat"
 
-#: src/addressbook.c:524 src/importldif.c:129
+#: src/addressbook.c:519 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Fout bij schrijven naar bestand"
 
-#: src/addressbook.c:525 src/importldif.c:130
+#: src/addressbook.c:520 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Fout openen map"
 
-#: src/addressbook.c:526 src/importldif.c:131
+#: src/addressbook.c:521 src/importldif.c:131
 msgid "No path specified"
 msgstr "Geen pad opgegeven"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error connecting to LDAP server"
 msgstr "Fout bij verbinding maken met POP3-server"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "Error initializing LDAP"
 msgstr "Fout bij opstarten LDAP"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "Error binding to LDAP server"
 msgstr "Fout bij binden aan LDAP-server"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error searching LDAP database"
 msgstr "Fout bij zoeken in LDAP-gegevensbank"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Timeout performing LDAP operation"
 msgstr "LDAP-operatie niet gelukt binnen de tijdslimiet"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Error in LDAP search criteria"
 msgstr "Fout in LDAP-zoekcriteria"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "No LDAP entries found for search criteria"
 msgstr "Geen LDAP-ingangen gevonden voor zoekcriteria"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "LDAP search terminated on request"
 msgstr "LDAP-zoekopdracht op verzoek afgebroken"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:539
 msgid "Error starting STARTTLS connection"
 msgstr "Fout bij starten STARTTLS-verbinding"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:540
 msgid "Distinguished Name (dn) is missing"
 msgstr "Distinguished Name (dn) mist"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:541
 msgid "Missing required information"
 msgstr "Benodigde informatie mist"
 
-#: src/addressbook.c:547
+#: src/addressbook.c:542
 msgid "Another contact exists with that key"
 msgstr "Een ander contact bestaat met die sleutel"
 
-#: src/addressbook.c:548
+#: src/addressbook.c:543
 msgid "Strong(er) authentication required"
 msgstr "Sterkere authenticatie vereist"
 
-#: src/addressbook.c:916
+#: src/addressbook.c:911
 msgid "Sources"
 msgstr "Bronnen"
 
-#: src/addressbook.c:920 src/prefs_matcher.c:643 src/prefs_other.c:493
+#: src/addressbook.c:915 src/prefs_matcher.c:643 src/prefs_other.c:493
 #: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:1118 src/editldap.c:794
+#: src/addressbook.c:1109 src/editldap.c:794
 msgid "Search"
 msgstr "Zoek"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1481
 msgid "Delete group"
 msgstr "Verwijder groep"
 
-#: src/addressbook.c:1491
+#: src/addressbook.c:1482
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -682,26 +673,26 @@ msgstr ""
 "Wil je deze groep(en) echt verwijderen?\n"
 "De adressen die het bevat zullen niet verloren gaan."
 
-#: src/addressbook.c:2218
+#: src/addressbook.c:2209
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Kan niet plakken. Bedoeld adresboek is alleen-lezen."
 
-#: src/addressbook.c:2228
+#: src/addressbook.c:2219
 msgid "Cannot paste into an address group."
 msgstr "Kan niet plakken in een adresgroep."
 
-#: src/addressbook.c:2965
+#: src/addressbook.c:2956
 #, 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:2968 src/addressbook.c:2994 src/addressbook.c:3001
+#: 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
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:2968
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -710,20 +701,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:2980 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: 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
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2972
 msgid "Delete _folder only"
 msgstr "Verwijder alleen _map"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2972
 msgid "Delete folder and _addresses"
 msgstr "Verwijder map en _adressen"
 
-#: src/addressbook.c:2992
+#: src/addressbook.c:2983
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -732,7 +723,7 @@ msgstr ""
 "Wil je '%s' verwijderen?\n"
 "De adressen die het bevat zullen niet verloren gaan."
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:2990
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -741,28 +732,28 @@ msgstr ""
 "Wil je '%s' verwijderen?\n"
 "De adressen die het bevat zullen verloren gaan."
 
-#: src/addressbook.c:3113
+#: src/addressbook.c:3104
 #, c-format
 msgid "Search '%s'"
 msgstr "Zoek '%s'"
 
-#: src/addressbook.c:3251 src/addressbook.c:3300
+#: src/addressbook.c:3242 src/addressbook.c:3291
 msgid "New Contacts"
 msgstr "Nieuwe contacten"
 
-#: src/addressbook.c:4137
+#: src/addressbook.c:4128
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker, kon indexbestand niet bewaren."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4132
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker, kon adresboekbestanden niet bewaren."
 
-#: src/addressbook.c:4151
+#: src/addressbook.c:4142
 msgid "Old address book converted successfully."
 msgstr "Oud adresboek is geconverteerd."
 
-#: src/addressbook.c:4156
+#: src/addressbook.c:4147
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -770,7 +761,7 @@ msgstr ""
 "Oud adresboek geconverteerd,\n"
 "nieuw indexbestand kon niet worden opgeslagen."
 
-#: src/addressbook.c:4169
+#: src/addressbook.c:4160
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -778,7 +769,7 @@ msgstr ""
 "Kon adresboek niet converteren, \n"
 "maar heb lege adresboekbestanden aangemaakt."
 
-#: src/addressbook.c:4175
+#: src/addressbook.c:4166
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -786,7 +777,7 @@ msgstr ""
 "Kon adresboek niet converteren,\n"
 "nieuw indexbestand kon niet worden aangemaakt."
 
-#: src/addressbook.c:4180
+#: src/addressbook.c:4171
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -794,52 +785,52 @@ msgstr ""
 "Kon adresboek niet converteren\n"
 "en kon nieuwe adresboekbestanden niet aanmaken."
 
-#: src/addressbook.c:4187 src/addressbook.c:4193
+#: src/addressbook.c:4178 src/addressbook.c:4184
 msgid "Addressbook conversion error"
 msgstr "Conversiefout adresboek"
 
-#: src/addressbook.c:4308
+#: src/addressbook.c:4299
 msgid "Addressbook Error"
 msgstr "Adresboekfout"
 
-#: src/addressbook.c:4309
+#: src/addressbook.c:4300
 msgid "Could not read address index"
 msgstr "Kon adresindexbestand niet lezen"
 
-#: src/addressbook.c:4640
+#: src/addressbook.c:4631
 msgid "Busy searching..."
 msgstr "Bezig met zoeken..."
 
-#: src/addressbook.c:4970 src/prefs_send.c:220
+#: src/addressbook.c:4961 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4982
+#: src/addressbook.c:4973
 msgid "Address Books"
 msgstr "Adresboeken"
 
-#: src/addressbook.c:4994
+#: src/addressbook.c:4985
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:5030 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3149 src/prefs_folder_column.c:77
+#: 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
 msgid "Folder"
 msgstr "Map"
 
-#: src/addressbook.c:5042
+#: src/addressbook.c:5033
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5054 src/addressbook.c:5066
+#: src/addressbook.c:5045 src/addressbook.c:5057
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5078
+#: src/addressbook.c:5069
 msgid "LDAP servers"
 msgstr "LDAP-servers"
 
-#: src/addressbook.c:5090
+#: src/addressbook.c:5081
 msgid "LDAP Query"
 msgstr "LDAP-verzoek"
 
@@ -946,18 +937,18 @@ 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:9795
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:157 src/compose.c:5856 src/compose.c:6401
-#: src/compose.c:12258 src/file_checker.c:84 src/file_checker.c:108
+#: src/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:5091
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5793 src/inc.c:726
+#: 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
 msgid "Error"
 msgstr "Fout"
@@ -1077,36 +1068,36 @@ msgstr "Je versie van Claws Mail is te oud voor de '%s'-plugin."
 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:1233
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "SSL/TLS-handdruk mislukt\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "SMTP AUTH methode niet beschikbaar\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Geselecteerde SMTP AUTH methode niet beschikbaar\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "verkeerd SMTP-antwoord\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "er is een fout opgetreden tijdens de SMTP-sessie\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "er is een fout opgetreden tijdens de authenticatie\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, 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:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "kan de STARTTLS-sessie niet tot stand brengen\n"
 
@@ -1243,576 +1234,585 @@ msgstr "%d,%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4028
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "zondag"
 
-#: src/common/utils.c:4029
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "maandag"
 
-#: src/common/utils.c:4030
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "dinsdag"
 
-#: src/common/utils.c:4031
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: src/common/utils.c:4032
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "donderdag"
 
-#: src/common/utils.c:4033
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "vrijdag"
 
-#: src/common/utils.c:4034
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "zaterdag"
 
-#: src/common/utils.c:4036
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januari"
 
-#: src/common/utils.c:4037
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: src/common/utils.c:4038
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "maart"
 
-#: src/common/utils.c:4039
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "april"
 
-#: src/common/utils.c:4040
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "mei"
 
-#: src/common/utils.c:4041
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "juni"
 
-#: src/common/utils.c:4042
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "juli"
 
-#: src/common/utils.c:4043
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "augustus"
 
-#: src/common/utils.c:4044
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "september"
 
-#: src/common/utils.c:4045
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "oktober"
 
-#: src/common/utils.c:4046
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "november"
 
-#: src/common/utils.c:4047
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "december"
 
-#: src/common/utils.c:4049
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "zo"
 
-#: src/common/utils.c:4050
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "ma"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "di"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "wo"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "do"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "vr"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "za"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "jan"
 
-#: src/common/utils.c:4058
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "feb"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "mar"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "apr"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "mei"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "jun"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "aug"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "sep"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "okt"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "nov"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "dec"
 
-#: src/common/utils.c:4079
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "a.m."
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "p.m."
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "a.m."
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "p.m."
 
-#: src/compose.c:596
+#: src/compose.c:198
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+"Je hebt ervoor gekozen dit bericht te ondertekenen en/of te versleutelen, "
+"maar je hebt geen privacy-systeem geselecteerd.\n"
+"\n"
+"Ondertekenen en versleutelen is uitgeschakeld voor dit bericht."
+
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Toevoegen..."
 
-#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: src/compose.c:599 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
-#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "Be_richt"
 
-#: src/compose.c:609
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "_Spelling"
 
-#: src/compose.c:611 src/compose.c:678
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Opties"
 
-#: src/compose.c:615
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
+msgid "_Help"
+msgstr "_Help"
+
+#: src/compose.c:623
 msgid "S_end"
 msgstr "_Verzenden"
 
-#: src/compose.c:616
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "_Wachtrij"
 
-#: src/compose.c:619
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "Bestand _bijvoegen"
 
-#: src/compose.c:620
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "Bestand _invoegen"
 
-#: src/compose.c:621
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Ondertekening _invoegen"
 
-#: src/compose.c:622
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "Ondertekening _vervangen"
 
-#: src/compose.c:626
+#: src/compose.c:634
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Op_nieuw"
 
-#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "K_nippen"
 
-#: src/compose.c:639
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "_Plakken speciaal"
 
-#: src/compose.c:640
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Als _citaten"
 
-#: src/compose.c:641
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "Afge_broken"
 
-#: src/compose.c:642
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "Niet afgeb_roken"
 
-#: src/compose.c:644 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Alles selecteren"
 
-#: src/compose.c:646
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "_Geavanceerd"
 
-#: src/compose.c:647
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Ga een teken terug"
 
-#: src/compose.c:648
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Ga een teken verder"
 
-#: src/compose.c:649
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Ga een woord terug"
 
-#: src/compose.c:650
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Ga een woord verder"
 
-#: src/compose.c:651
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Ga naar begin van regel"
 
-#: src/compose.c:652
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Ga naar eind van regel"
 
-#: src/compose.c:653
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Ga een regel terug"
 
-#: src/compose.c:654
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Ga een regel verder"
 
-#: src/compose.c:655
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Verwijder vorige teken"
 
-#: src/compose.c:656
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Verwijder volgende teken"
 
-#: src/compose.c:657
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Verwijder vorig woord"
 
-#: src/compose.c:658
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Verwijder volgend woord"
 
-#: src/compose.c:659
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Verwijder deze regel"
 
-#: src/compose.c:660
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Verwijder tot eind van regel"
 
-#: src/compose.c:663 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Vinden"
 
-#: src/compose.c:666
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "Regels afbreken in _huidige paragraaf"
 
-#: src/compose.c:667
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Regelterugloop voor alle regels"
 
-#: src/compose.c:669
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Aanpassen met e_xterne editor"
 
-#: src/compose.c:672
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "_Controleer alles of selectie"
 
-#: src/compose.c:673
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "Toon alle _onjuist gespelde woorden"
 
-#: src/compose.c:674
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "Controleer _vorig onjuist gespeld woord"
 
-#: src/compose.c:675
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "Ga naar _volgend onjuist gespeld woord"
 
-#: src/compose.c:682
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "_Beantwoord afzender"
 
-#: src/compose.c:684
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "Privacy-_systeem"
 
-#: src/compose.c:688
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "_Prioriteit"
 
-#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "Tekenset_codering"
 
-#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "West-Europees"
 
-#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Cyrillisch"
 
-#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japans"
 
-#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Chinees"
 
-#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Koreaans"
 
-#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Adresboek"
 
-#: src/compose.c:708
+#: src/compose.c:716
 msgid "_Template"
 msgstr "_Sjabloon"
 
-#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
-#: src/compose.c:719
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
+msgid "_About"
+msgstr "_Over"
+
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Aut_omatisch afbreken"
 
-#: src/compose.c:720
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Automatisch _inspringen"
 
-#: src/compose.c:721
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "_Ondertekenen"
 
-#: src/compose.c:722
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "_Versleutelen"
 
-#: src/compose.c:723
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "_Ontvangstbevestiging"
 
-#: src/compose.c:724
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "Ver_wijder verwijzingen"
 
-#: src/compose.c:725
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "_Lineaal weergeven"
 
-#: src/compose.c:730 src/compose.c:740
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
 #: src/summaryview.c:433
 msgid "_All"
 msgstr "_Allen"
 
-#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_Sender"
 msgstr "_Afzender"
 
-#: src/compose.c:733
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "_Mailing-lijst"
 
-#: src/compose.c:738
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "_Hoogste"
 
-#: src/compose.c:739
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "H_oog"
 
-#: src/compose.c:741
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "Laa_g"
 
-#: src/compose.c:742
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "_Laagste"
 
-#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraal-Europees (ISO-8859-_2)"
 
-#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grieks (ISO-8859-_7)"
 
-#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turks (ISO-8859-_9)"
 
-#: src/compose.c:1015 src/compose.c:1697
-msgid ""
-"You have opted to sign and/or encrypt this message but have not selected a "
-"privacy system.\n"
-"\n"
-"Signing and encrypting have been disabled for this message."
-msgstr ""
-"Je hebt ervoor gekozen dit bericht te ondertekenen en/of te versleutelen, "
-"maar je hebt geen privacy-systeem geselecteerd.\n"
-"\n"
-"Ondertekenen en versleutelen is uitgeschakeld voor dit bericht."
-
-#: src/compose.c:1051
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr "Opmaakfout in Van-header van nieuw bericht."
 
-#: src/compose.c:1144
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr "Opmaakfout in onderwerp van nieuw bericht."
 
-#: src/compose.c:1176 src/quote_fmt.c:563
+#: src/compose.c:1181 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
-msgstr "Opmaakfout in berichttekst van \"Nieuw bericht\" op regel %d."
+msgstr ""
+"Opmaakfout in berichtinhoud van \"Nieuw bericht\"-sjabloon op regel %d."
 
-#: src/compose.c:1445
+#: src/compose.c:1450
 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:1630 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1820,12 +1820,12 @@ msgstr ""
 "Het \"Van\" veld van het \"Antwoord\" sjabloon bevat een ongeldig e-"
 "mailadres."
 
-#: src/compose.c:1679 src/quote_fmt.c:583
+#: src/compose.c:1684 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
-msgstr "Opmaakfout in berichttekst van het \"Antwoord\" sjabloon op regel %d."
+msgstr "Opmaakfout in berichtinhoud van het \"Antwoord\"-sjabloon op regel %d."
 
-#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1833,56 +1833,56 @@ msgstr ""
 "Het \"Van\" veld van het \"Doorsturen\" sjabloon bevat een ongeldig e-"
 "mailadres."
 
-#: src/compose.c:1883 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
-msgstr "De tekst van het \"Doorsturen\" sjabloon heeft een fout op regel %d."
+msgstr "De inhoud van het \"Doorsturen\"-sjabloon heeft een fout op regel %d."
 
-#: src/compose.c:2059
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
 msgstr "Doorsturen: meerdere e-mails"
 
 # TPTD
-#: src/compose.c:2566
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
-msgstr "De tekst van het \"Herverwijzen\" sjabloon heeft en fout op regel %d."
+msgstr "De inhoud van het \"Herverwijzen\"-sjabloon heeft en fout op regel %d."
 
-#: src/compose.c:2633 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2636 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2639 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
-#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Nieuwsgroepen:"
 
-#: src/compose.c:2645 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup-To:"
 
-#: src/compose.c:2648 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "In antwoord aan:"
 
-#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Aan:"
 
-#: src/compose.c:2842
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Kan bestand niet bijvoegen (omzetten van de tekenset is mislukt)."
 
-#: src/compose.c:2848
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1897,75 +1897,75 @@ msgstr[1] ""
 "De volgende bestanden zijn bijgevoegd: \n"
 "%s"
 
-#: src/compose.c:3128
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "De \"Citatie-markering\" van het sjabloon is ongeldig."
 
-#: src/compose.c:3657
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kon grootte van bestand '%s' niet opvragen."
 
-#: src/compose.c:3675
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr ""
-"Je staat op het punt een bestand van %s in de berichttekst in te voegen. Wil "
-"je doorgaan?"
+"Je staat op het punt een bestand van %s in de berichtinhoud in te voegen. "
+"Wil je doorgaan?"
 
-#: src/compose.c:3678
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr "Wil je doorgaan?"
 
-#: src/compose.c:3679 src/compose.c:10844 src/compose.c:11738
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: src/compose.c:3804
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg."
 
-#: src/compose.c:3805
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr "Leeg bestand"
 
-#: src/compose.c:3806
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr "Toch bijvoegen"
 
-#: src/compose.c:3815
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet lezen."
 
-#: src/compose.c:3842
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:4862 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[geen onderwerp] - Bericht opstellen%s"
 
-#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Bericht opstellen"
 
-#: src/compose.c:4891 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1973,59 +1973,59 @@ msgstr ""
 "Geen account opgegeven voor het verzenden van berichten.\n"
 "Selecteer eerst een account."
 
-#: src/compose.c:5108 src/compose.c:5145
+#: src/compose.c:5126 src/compose.c:5163
 #, 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:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
-#: src/prefs_account.c:3758 src/toolbar.c:487 src/toolbar.c:519
+#: 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
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
-#: src/compose.c:5794 src/folderview.c:2546 src/messageview.c:859
+#: src/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
 msgid "_Send"
 msgstr "_Verzenden"
 
-#: src/compose.c:5166
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr "Geen ontvanger opgegeven."
 
-#: src/compose.c:5181
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Het onderwerp is leeg. %s"
 
-#: src/compose.c:5182 src/compose.c:5225
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Toch verzenden?"
 
-#: src/compose.c:5183 src/compose.c:5226
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Toch in de wachtrij zetten?"
 
-#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr "_Wachtrij"
 
-#: src/compose.c:5224
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Verzenden aan %d ontvangers. %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5271
 msgid "Could not queue message."
 msgstr "Kon bericht niet in de wachtrij zetten."
 
-#: src/compose.c:5256
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2036,7 +2036,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5260
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2047,7 +2047,7 @@ msgstr ""
 "\n"
 "Ondertekenen mislukt: %s"
 
-#: src/compose.c:5265
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2058,7 +2058,7 @@ msgstr ""
 "\n"
 "Versleuteling mislukt: %s"
 
-#: src/compose.c:5270
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2068,7 +2068,7 @@ msgstr ""
 "\n"
 "Omzetten van de tekenset mislukt."
 
-#: src/compose.c:5274
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2078,7 +2078,7 @@ msgstr ""
 "\n"
 "Kon de sleutel van de ontvanger, nodig voor versleutelen, niet vinden."
 
-#: src/compose.c:5337 src/compose.c:5397
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2087,7 +2087,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5393
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
@@ -2097,7 +2097,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5790
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2108,7 +2108,7 @@ msgstr ""
 "naar de opgegeven tekenset '%s'.\n"
 "Verzenden met tekenset %s?"
 
-#: src/compose.c:5852
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2121,98 +2121,98 @@ msgstr ""
 "worden.\n"
 "Toch verzenden?"
 
-#: src/compose.c:6087
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr "Versleutel-waarschuwing"
 
-#: src/compose.c:6088
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr "Ga _door met bewerken"
 
-#: src/compose.c:6137
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr "Geen account beschikbaar voor het verzenden."
 
-#: src/compose.c:6146
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Geselecteerd account is geen NNTP: Plaatsen is niet mogelijk."
 
-#: src/compose.c:6400
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bijlage %s bestaat niet meer. Negeren?"
 
-#: src/compose.c:6402 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Verzenden annuleren"
 
-#: src/compose.c:6402
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr "Negeer bijlage"
 
-#: src/compose.c:6458
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr "Origineel %s gedeelte"
 
-#: src/compose.c:7058
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr "Toevoegen aan adres_boek"
 
-#: src/compose.c:7225
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr "Verwijder inhoud"
 
-#: src/compose.c:7229 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 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:7461
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr "MIME-type"
 
-#: src/compose.c:7467 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: 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
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:7529
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr "Bericht bewaren in "
 
-#: src/compose.c:7560 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:434
+#: src/plugins/spamassassin/spamassassin_gtk.c:437
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: src/compose.c:7576
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr "Selecteer map om bericht in op te slaan"
 
-#: src/compose.c:8033
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Hea_der"
 
-#: src/compose.c:8038
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Bijlages"
 
-#: src/compose.c:8052
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "Anderen"
 
-#: src/compose.c:8067
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "_Onderwerp:"
 
-#: src/compose.c:8291
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2221,19 +2221,19 @@ msgstr ""
 "Spellingcontrole kon niet gestart worden.\n"
 "%s"
 
-#: src/compose.c:8438
+#: src/compose.c:8456
 msgid "_From:"
 msgstr "_Van:"
 
-#: src/compose.c:8455
+#: src/compose.c:8473
 msgid "Account to use for this email"
 msgstr "Te gebruiken account voor dit bericht"
 
-#: src/compose.c:8457
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr "Een afzender-adres is verplicht"
 
-#: src/compose.c:8639
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2242,74 +2242,99 @@ 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:8750 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "G_een"
 
-#: src/compose.c:8851 src/prefs_template.c:752
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
-msgstr "Opmaakfout in berichttekst-sjabloon op regel %d."
+msgstr "Opmaakfout in berichtinhoud-sjabloon op regel %d."
 
-#: src/compose.c:8948
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Opmaakfout in '%s'-sjabloon."
 
-#: src/compose.c:9372
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME-type."
 
-#: src/compose.c:9387
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:9461
+#: src/compose.c:9479
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:9479
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: src/compose.c:9512
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:9532
+#: src/compose.c:9550
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:9533
+#: src/compose.c:9551
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:9792
+#: src/compose.c:9646
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"Kon de berichtinhoud niet naar bestand schrijven:\n"
+"%s"
+
+#: src/compose.c:9704
+#, c-format
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Kon de volgende opdracht niet uitvoeren:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9743
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr "Externe editor is gestopt met een fout:%s"
+
+#: src/compose.c:9817
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
 "De externe editor is nog steeds actief.\n"
 "Zal ik het programma afbreken?\n"
-"procesgroep id: %d"
+"proces-id: %d"
 
-#: src/compose.c:10265 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 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:10458
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr "Kon klad niet opslaan."
 
-#: src/compose.c:10462
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr "Kon klad niet opslaan"
 
-#: src/compose.c:10463
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2317,24 +2342,24 @@ msgstr ""
 "Kon klad niet opslaan.\n"
 "Wil je deze e-mail annuleren of weggooien?"
 
-#: src/compose.c:10465
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr "_Annuleren"
 
-#: src/compose.c:10465
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr "E-mail _weggooien"
 
-#: src/compose.c:10654 src/compose.c:10668
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:10682
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Bestand '%s' kon niet gelezen worden."
 
-#: src/compose.c:10684
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2343,50 +2368,50 @@ msgstr ""
 "Bestand '%s' bevat ongeldige characters\n"
 "voor de huidige codering, invoeging kan onjuist zijn."
 
-#: src/compose.c:10763
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr "Bericht weggooien"
 
-#: src/compose.c:10764
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr "Bericht is gewijzigd, veranderingen laten vervallen?"
 
-#: src/compose.c:10765 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Weggooien"
 
-#: src/compose.c:10765 src/compose.c:10770
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr "Opslaan als _klad"
 
-#: src/compose.c:10768 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: src/compose.c:10769
+#: src/compose.c:10734
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bericht is gewijzigd. Veranderingen opslaan?"
 
-#: src/compose.c:10770
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr "_Niet opslaan"
 
-#: src/compose.c:10841
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Wil je sjabloon '%s' toepassen?"
 
-#: src/compose.c:10843
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:10844 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
 #: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:11731
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2395,26 +2420,26 @@ msgid_plural ""
 "Do you want to insert the contents of the %d files into the message body, or "
 "attach them to the email?"
 msgstr[0] ""
-"Wil je de inhoud van het bestand invoegen in de tekst van het bericht of "
+"Wil je de inhoud van het bestand invoegen in de inhoud van het bericht of "
 "bijvoegen wanneer het verstuurd wordt?"
 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:11737
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr "In- of bijvoegen?"
 
-#: src/compose.c:11738
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr "_Bijvoegen"
 
-#: src/compose.c:11956
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Opmaakfout in citaat op regel %d."
 
-#: src/compose.c:12252
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2440,11 +2465,11 @@ msgid ""
 "Please file a bug report and include the information below."
 msgstr ""
 "%s.\n"
-"Rapporteer een bug-verslag, vermeld onderstaande informatie in je bericht."
+"Rapporteer een fout, vermeld onderstaande informatie in je bericht."
 
 #: src/crash.c:208
 msgid "Debug log"
-msgstr "Debuglog"
+msgstr "Foutopsporingslogboek"
 
 #: src/crash.c:252 src/toolbar.c:539
 msgid "Close"
@@ -2456,7 +2481,7 @@ msgstr "Opslaan..."
 
 #: src/crash.c:262
 msgid "Create bug report"
-msgstr "Maak een bug-verslag"
+msgstr "Maak een foutrapport"
 
 #: src/crash.c:312
 msgid "Save crash information"
@@ -2633,7 +2658,7 @@ 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:2158
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Bestand"
@@ -2682,12 +2707,12 @@ 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:572 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:557 src/foldersel.c:573 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr "Geef de naam op van de nieuwe map:"
@@ -2716,13 +2741,13 @@ 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:2910
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 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:2917
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Poort"
@@ -2783,7 +2808,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2952,8 +2977,8 @@ msgstr ""
 "Het te gebruiken wachtwoord bij het maken van een verbinding als de \"Bind DN"
 "\" gebruiker."
 
-#: 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/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
 msgid "Show password"
 msgstr "Wachtwoord weergeven"
@@ -2977,11 +3002,11 @@ msgstr ""
 "Het maximaal aantal ingangen dat moet worden teruggegeven in een "
 "zoekresultaat."
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr "Algemeen"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "Uitgebreid"
 
@@ -3121,8 +3146,8 @@ 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:304 src/prefs_account.c:1040
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
+#: 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
 msgid "None"
 msgstr "Geen"
 
@@ -3362,7 +3387,7 @@ msgstr "Exporteren Adresboek naar LDIF-bestand"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr "Exporteer naar mbox-bestand"
 
@@ -3427,17 +3452,17 @@ msgstr "De naam is te lang."
 msgid "Not specified."
 msgstr "Niet aangegeven."
 
-#: 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 "Het bestand %s mist. Wil je het backup-bestand gebruiken van %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 "Kon %s niet kopiëren naar %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 "
@@ -3547,51 +3572,51 @@ msgstr "actie kon niet toegepast worden\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "geen verdere verwerking na actie [ %s ]\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "verwerking van regel '%s' [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "verwerken van regel <onbekend> [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "regel uitgezet '%s' [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "regel uitgezet <onbekend> [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "niet gedefiniëerd"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "bij ontvangen"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "handmatig"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "verwerken van map"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "voorverwerken"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "naverwerken"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3608,11 +3633,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3647,48 +3672,52 @@ msgstr "Klad"
 msgid "Processing (%s)...\n"
 msgstr "Bezig met verwerken (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Bezig met kopiëren van %s naar %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Bezig met verplaatsen van %s naar %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Cache voor %s wordt bijgewerkt..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "Berichten verwerken..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniseren %s voor offline gebruik... \n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 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:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "Een mapnaam kan niet eindigen met een spatie."
 
-#: src/foldersel.c:250
+#: src/foldersel.c:251
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:574 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: 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
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:582 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:576 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
@@ -3697,7 +3726,7 @@ msgstr "NieuweMap"
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map voorkomen."
 
-#: src/foldersel.c:597 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: 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
@@ -3705,7 +3734,7 @@ msgstr "'%c' mag niet in de naam van een map voorkomen."
 msgid "The folder '%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:604 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:608 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
@@ -3754,13 +3783,13 @@ msgstr "Weergegeven kolommen instellen"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr "Nieuw"
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Ongelezen"
@@ -3779,7 +3808,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr "Markeer alles als gelezen"
 
@@ -3791,11 +3820,11 @@ msgstr ""
 "Wil je werkelijk alle berichten in deze map en zijn submappen als gelezen "
 "markeren?"
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:871 src/summaryview.c:4292
 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:4334
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr "Markeer alles als ongelezen"
 
@@ -3807,16 +3836,16 @@ msgstr ""
 "Wil je werkelijk alle berichten in deze map en zijn submappen als ongelezen "
 "markeren?"
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:877 src/summaryview.c:4338
 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:4643
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Map wordt ingelezen %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4647 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Map wordt ingelezen %s..."
@@ -3873,7 +3902,7 @@ msgstr "Alle berichten in de prullenbak weggooien?"
 msgid "_Empty trash"
 msgstr "_Prullenbak legen"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Offline waarschuwing"
 
@@ -3894,7 +3923,7 @@ 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:2812 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3960,7 +3989,7 @@ msgstr "Verplaatsen mislukt."
 msgid "Processing configuration for folder %s"
 msgstr "Instellingen voor map '%s' wordt verwerkt"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Doelmap kan alleen gebruikt worden om submappen op te slaan."
 
@@ -4010,7 +4039,7 @@ msgstr "onbekend"
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan groeplijst niet ophalen."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr "Klaar."
 
@@ -4045,11 +4074,11 @@ msgstr ""
 
 #: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Auteursrecht (C) 1999-2020\n"
+"Auteursrecht (C) 1999-2021\n"
 "Het Claws Mail Team\n"
 "en Hiroyuki Yamamoto"
 
@@ -4203,44 +4232,44 @@ 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:2636
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr "Sessie-statistieken\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2646 src/main.c:2649
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr "Gestart: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2655
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr "Inkomend verkeer\n"
 
-#: src/gtk/about.c:741 src/main.c:2658
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Ontvangen berichten: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2664
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr "Uitgaand verkeer\n"
 
-#: src/gtk/about.c:751 src/main.c:2667
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nieuwe/doorverwezen berichten: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2671
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Beantwoorde berichten: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2675
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Doorgestuurde berichten: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2679
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Totaal uitgaande berichten: %d\n"
@@ -4452,20 +4481,20 @@ msgstr ""
 "De spellingcontrole kon de alternatieve woordenlijst niet veranderen.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1862
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "Mislukt: geen service ingang gevonden."
 
-#: src/gtk/gtkutils.c:1865
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "Mislukt: netwerkfout."
 
-#: src/gtk/gtkutils.c:1868
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Mislukt: onbekende fout (%d)."
 
-#: src/gtk/gtkutils.c:1938
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "Instellen..."
 
@@ -4709,7 +4738,7 @@ msgstr "Applicatie:"
 msgid "Content-Type"
 msgstr "Inhoud-Type"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr "Inhoud-Type:"
 
@@ -4737,7 +4766,7 @@ msgstr "Voorrang"
 msgid "Precedence:"
 msgstr "Voorrang:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -4955,7 +4984,7 @@ msgstr "IMAP-map die alleen submappen bevat"
 
 #: src/gtk/icon_legend.c:93
 msgid "IMAP mailbox showing only subscribed folders"
-msgstr "IMAP-mailbox toont alleen ge-abonneerde mappen"
+msgstr "IMAP-mailbox toont alleen geabonneerde mappen"
 
 #: src/gtk/icon_legend.c:127
 msgid "Icon Legend"
@@ -5061,7 +5090,8 @@ msgstr ""
 #: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
-#: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/libravatar/libravatar_prefs.c:563
+#: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
@@ -5074,7 +5104,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/spamassassin/spamassassin_gtk.c:673
 #: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "Plugins"
@@ -5117,11 +5147,11 @@ msgid "_Hide"
 msgstr "_Verberg"
 
 #: 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: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
 msgid "Account"
 msgstr "Account"
 
@@ -5147,7 +5177,7 @@ msgstr "berichten die jonger zijn dan # uur"
 
 #: src/gtk/quicksearch.c:477
 msgid "messages which contain S in the message body"
-msgstr "berichten waarvan de berichttekst S bevat"
+msgstr "berichten waarvan de berichtinhoud S bevat"
 
 #: src/gtk/quicksearch.c:478
 msgid "messages which contain S in the whole message"
@@ -5347,51 +5377,51 @@ msgstr ""
 "voldoen alvorens ze zichtbaar worden in de berichtenlijst.\n"
 "De volgende speciale tekens kunnen worden gebruikt:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Er ging iets mis tijdens het zoeken. Controleer de logs."
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Van/Aan/Cc/Onderwerp/Vlag"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Recursief"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "Plakkend"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "Aanvullen"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "Draai bij het selecteren"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "Wis de huidige zoekopdracht"
 
-#: 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 "Bewerk zoekcriterie"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr "Informatie over uitgebreide speciale tekens"
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr "_Informatie"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr "_Wijzigen"
 
-#: 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:349
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Leeg _Log"
@@ -5567,211 +5597,211 @@ msgstr "(Geen afzender)"
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr "Fout:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr "Bestandsgrootte:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr "Laad afbeelding"
 
-#: src/imap.c:577
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr "IMAP-verbinding verbroken\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: 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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP-fout op %s:"
 
-#: src/imap.c:622
+#: src/imap.c:628
 msgid "authenticated"
 msgstr "geauthenticeerd"
 
-#: src/imap.c:625
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "niet geauthenticeerd"
 
-#: src/imap.c:628
+#: src/imap.c:634
 msgid "bad state"
 msgstr "bad state (er is iets mis)"
 
-#: src/imap.c:631
+#: src/imap.c:637
 msgid "stream error"
 msgstr "stream leesfout"
 
-#: src/imap.c:634
+#: src/imap.c:640
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "verwerkingsfout (waarschijnlijk niet-RFC overeenkomende server)"
 
-#: src/imap.c:638
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "verbinding geweigerd"
 
-#: src/imap.c:641
+#: src/imap.c:647
 msgid "memory error"
 msgstr "geheugen-fout"
 
-#: src/imap.c:644
+#: src/imap.c:650
 msgid "fatal error"
 msgstr "fatale fout"
 
-#: src/imap.c:647
+#: src/imap.c:653
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "protocolfout (waarschijnlijk niet-RFC overeenkomend)"
 
-#: src/imap.c:651
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr "verbinding geweigerd"
 
-#: src/imap.c:654
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr "APPEND-fout"
 
-#: src/imap.c:657
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr "NOOP-fout"
 
-#: src/imap.c:660
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr "LOGOUT-fout"
 
-#: src/imap.c:663
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr "CAPABILITY-fout"
 
-#: src/imap.c:666
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr "CHECK-fout"
 
-#: src/imap.c:669
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr "CLOSE-fout"
 
-#: src/imap.c:672
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr "EXPUNGE-fout"
 
-#: src/imap.c:675
+#: src/imap.c:681
 msgid "COPY error"
 msgstr "UID COPY-fout"
 
-#: src/imap.c:678
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr "UID COPY-fout"
 
-#: src/imap.c:681
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr "CREATE-fout"
 
-#: src/imap.c:684
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr "DELETE-fout"
 
-#: src/imap.c:687
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr "EXAMINE-fout"
 
-#: src/imap.c:690
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr "FETCH-fout"
 
-#: src/imap.c:693
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr "UID FETCH-fout"
 
-#: src/imap.c:696
+#: src/imap.c:702
 msgid "LIST error"
 msgstr "LIST-fout"
 
-#: src/imap.c:699
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr "LOGIN-fout"
 
-#: src/imap.c:702
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr "LSUB-fout"
 
-#: src/imap.c:705
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr "RENAME-fout"
 
-#: src/imap.c:708
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr "SEARCH-fout"
 
-#: src/imap.c:711
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr "UID SEARCH-fout"
 
-#: src/imap.c:714
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr "SELECT-fout"
 
-#: src/imap.c:717
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr "STATUS-fout"
 
-#: src/imap.c:720
+#: src/imap.c:726
 msgid "STORE error"
 msgstr "STORE-fout"
 
-#: src/imap.c:723
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr "UID STORE-fout"
 
-#: src/imap.c:726
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr "SUBSCRIBE-fout"
 
-#: src/imap.c:729
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr "UNSUBSCRIBE-fout"
 
-#: src/imap.c:732
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr "STARTTLS-fout"
 
-#: src/imap.c:735
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr "INVAL-fout"
 
-#: src/imap.c:738
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr "EXTENSION-fout"
 
-#: src/imap.c:741
+#: src/imap.c:747
 msgid "SASL error"
 msgstr "SASL-fout"
 
-#: src/imap.c:745
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr "SSL/TLS-fout"
 
-#: src/imap.c:749
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Onbekende fout [%d]"
 
-#: src/imap.c:955
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5781,9 +5811,9 @@ msgstr ""
 "\n"
 "\n"
 "CRAM-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
-"ondersteuning en de CRFAM-MD5 SASL plugin geïnstalleerd is."
+"ondersteuning en de CRFAM-MD5 SASL-plugin geïnstalleerd is."
 
-#: src/imap.c:961
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5793,9 +5823,9 @@ msgstr ""
 "\n"
 "\n"
 "DIGEST-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
-"ondersteuning en de DIGEST-MD5 SASL plugin geïnstalleerd is."
+"ondersteuning en de DIGEST-MD5 SASL-plugin geïnstalleerd is."
 
-#: src/imap.c:967
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5805,9 +5835,9 @@ msgstr ""
 "\n"
 "\n"
 "CRAM-SHA-1 logins werken alleen als libetpan gecompileerd is met SASL-"
-"ondersteuning en de CRFAM SASL plugin geïnstalleerd is."
+"ondersteuning en de CRFAM SASL-plugin geïnstalleerd is."
 
-#: src/imap.c:973
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5817,9 +5847,9 @@ msgstr ""
 "\n"
 "\n"
 "PLAIN logins werken alleen als libetpan gecompileerd is met SASL-"
-"ondersteuning en de PLAIN SASL plugin geïnstalleerd is."
+"ondersteuning en de PLAIN SASL-plugin geïnstalleerd is."
 
-#: src/imap.c:979
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5829,39 +5859,39 @@ msgstr ""
 "\n"
 "\n"
 "LOGIN logins werken alleen als libetpan gecompileerd is met SASL-"
-"ondersteuning en de LOGIN SASL plugin geïnstalleerd is."
+"ondersteuning en de LOGIN SASL-plugin geïnstalleerd is."
 
-#: src/imap.c:986
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbinding maken met %s mislukt: login geweigerd.%s"
 
-#: src/imap.c:990
+#: src/imap.c:1003
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbinding maken met %s mislukt: login geweigerd.%s\n"
 
-#: src/imap.c:1008
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbinding maken met %s mislukt"
 
-#: src/imap.c:1015 src/imap.c:1018
+#: src/imap.c:1028 src/imap.c:1031
 #, 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:1048 src/imap.c:3693 src/imap.c:4352 src/imap.c:4446
-#: src/imap.c:4624 src/imap.c:5435
+#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 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:1158 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Onveilige verbinding"
 
-#: src/imap.c:1159 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5875,108 +5905,108 @@ msgstr ""
 "Wil je de verbinding met deze server toch maken? De communicatie is dan niet "
 "beveiligd."
 
-#: src/imap.c:1165 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "Verbinding _hervatten"
 
-#: src/imap.c:1174
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Account '%s': Verbinden met IMAP-server: %s:%d..."
 
-#: src/imap.c:1239
+#: src/imap.c:1252
 #, 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:1242
+#: src/imap.c:1255
 #, 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:1274 src/imap.c:4114
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "Kan STARTTLS-sessie niet tot stand brengen.\n"
 
-#: src/imap.c:1343
+#: src/imap.c:1359
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kon niet inloggen op IMAP-server %s.\n"
 
-#: src/imap.c:1346
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kon niet inloggen op IMAP-server %s."
 
-#: src/imap.c:1774
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "Berichten worden toegevoegd..."
 
-#: src/imap.c:1979 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Berichten worden gekopieerd..."
 
-#: src/imap.c:2504
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr "Zoeken mislukt vanwege netwerkfout."
 
-#: src/imap.c:2586
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "kan \"verwijderd\" vlaggen niet instellen\n"
 
-#: src/imap.c:2593 src/imap.c:5065
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: src/imap.c:2944
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Zoeken naar niet-geabonneerde mappen in %s..."
 
-#: src/imap.c:2947
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Zoeken naar submappen van %s..."
 
-#: src/imap.c:3235
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "LIST mislukt: kan postvak niet aanmaken\n"
 
-#: src/imap.c:3248
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "kan postvak niet aanmaken\n"
 
-#: src/imap.c:3379
+#: src/imap.c:3422
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan postvak niet hernoemen: %s naar %s\n"
 
-#: src/imap.c:3492
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "kan postvak niet verwijderen\n"
 
-#: src/imap.c:3771
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "LIST mislukt\n"
 
-#: src/imap.c:3856
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr "Berichten afvlaggen..."
 
-#: src/imap.c:3959
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: src/imap.c:4111
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server vereist STARTTLS om in te loggen.\n"
 
-#: src/imap.c:4121
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan 'capabilities' niet verversen.\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5985,20 +6015,20 @@ msgstr ""
 "Verbinden met %s mislukt: de server vereist STARTTLS, maar Claws Mail is "
 "gecompileerd zonder STARTTLS-ondersteuning.\n"
 
-#: src/imap.c:4134
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr "Inloggen op servers staat uit.\n"
 
-#: src/imap.c:4357
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "Berichten worden opgehaald..."
 
-#: src/imap.c:5058
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan \"verwijderd\" vlaggen: %d niet instellen\n"
 
-#: src/imap.c:6093
+#: src/imap.c:6136
 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"
@@ -6069,7 +6099,7 @@ msgstr "_Ververs mappenboom"
 
 #: src/imap_gtk.c:87
 msgid "Show only subscribed _folders"
-msgstr "Alleen ge-abonneerde mappen _weergeven"
+msgstr "Alleen geabonneerde mappen _weergeven"
 
 #: src/imap_gtk.c:194
 msgid ""
@@ -6081,10 +6111,6 @@ msgstr ""
 "(wanneer deze submappen en geen e-mail moet bevatten,\n"
 " voeg een `/' toe aan het eind van de naam)"
 
-#: 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/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
@@ -6205,7 +6231,7 @@ msgstr "_Abonneren"
 msgid "_Unsubscribe"
 msgstr "_Afmelden"
 
-#: src/import.c:113 src/import.c:208
+#: src/import.c:113 src/import.c:209
 msgid "Import mbox file"
 msgstr "Importeer mbox-bestand"
 
@@ -6217,11 +6243,11 @@ msgstr "Geef het mbox-bestand en de doelmap op."
 msgid "Destination folder:"
 msgstr "Doelmap:"
 
-#: src/import.c:203
+#: src/import.c:204
 msgid "Source mbox filename can't be left empty."
 msgstr "Het bron-mboxbestand mag niet leeg blijven."
 
-#: src/import.c:208
+#: src/import.c:209
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6229,15 +6255,19 @@ msgstr ""
 "Doelmap is niet opgegeven.\n"
 "Mbox-bestand naar de inbox-map importeren?"
 
-#: src/import.c:230
+#: src/import.c:231
 msgid "Can't find the destination folder."
 msgstr "Kan de doelmap niet vinden."
 
-#: src/import.c:263
+#: src/import.c:236
+msgid "Importing mbox file..."
+msgstr "Importeren van mbox-bestand..."
+
+#: src/import.c:258
 msgid "Select importing file"
 msgstr "Selecteer het te importeren bestand"
 
-#: src/import.c:281
+#: src/import.c:276
 msgid "Select folder to import to"
 msgstr "Selecteer map om naar te importeren"
 
@@ -6393,142 +6423,142 @@ msgstr "Selecteer Pine-bestand"
 msgid "Import Pine file into Address Book"
 msgstr "Importeren Pine-bestand in adresboek"
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 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:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "%s mislukt\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, 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:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Authenticatie mislukt"
 
-#: 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: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
 msgid "Locked"
 msgstr "Op slot"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:394
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr "Tijdslimiet"
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, 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:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Account '%s': Verbinden met POP3-server: %s:%d..."
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Kan geen verbinding maken met POP3-server: %s:%d"
 
-#: src/inc.c:927
+#: src/inc.c:932
 #, 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:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Authenticatie..."
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Berichten ophalen van %s (%s)..."
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, 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:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Verbinding maken met %s:%d mislukt."
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail."
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6537,37 +6567,37 @@ msgstr ""
 "Fout bij het verwerken van e-mail:\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "De schijf is vol."
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "Socket-fout."
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-fout bij verbinding met %s:%d."
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "Verbinding gesloten door de server."
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Verbinding met %s:%d gesloten door de server."
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "Postvak zit op slot."
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6576,11 +6606,11 @@ msgstr ""
 "Postvak zit op slot:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "Authenticatie mislukt."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6589,7 +6619,7 @@ msgstr ""
 "Authenticatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6597,46 +6627,46 @@ msgstr ""
 "Sessie verlopen. Mogelijk kun je herstellen door de tijdslimiet te verhogen "
 "in Voorkeuren/Diversen/Overige."
 
-#: src/inc.c:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Verbinding met %s:%d niet binnen tijdslimiet tot stand gekomen."
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr "Het inbedden is afgelast\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1766
+#: 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
 msgid "seconds"
 msgstr "seconden"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuut"
 msgstr[1] "minuten"
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "uur"
 msgstr[1] "uur"
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, 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:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sJe bent momenteel niet online. Toch doorgaan?"
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "_Eenmalig"
 
@@ -6682,7 +6712,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: src/main.c:375
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6691,7 +6721,7 @@ msgstr ""
 "Er is een configuratiebestand %s gevonden.\n"
 "Wil je dit configuratiebestand overzetten?"
 
-#: src/main.c:377
+#: src/main.c:382
 #, c-format
 msgid ""
 "\n"
@@ -6704,11 +6734,11 @@ msgstr ""
 "Je Sylpheed filterregels kunnen omgezet worden door\n"
 "een script beschikbaar op %s."
 
-#: src/main.c:389
+#: src/main.c:394
 msgid "Keep old configuration"
 msgstr "Oude configuratie behouden"
 
-#: src/main.c:392
+#: src/main.c:397
 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 "
@@ -6718,31 +6748,31 @@ msgstr ""
 "maar kan even duren als je veel IMAP- of Nieuwsgegevens gecached hebt, en "
 "zal wat extra schijfruimte gebruiken."
 
-#: src/main.c:400
+#: src/main.c:405
 msgid "Migration of configuration"
 msgstr "Configuratiebestand overzetten"
 
-#: src/main.c:411
+#: src/main.c:416
 msgid "Copying configuration... This may take a while..."
 msgstr "Configuratiebestand wordt gekopiëerd... Dit kan even duren..."
 
-#: src/main.c:420
+#: src/main.c:425
 msgid "Migration failed!"
 msgstr "Overzetten mislukt."
 
-#: src/main.c:429
+#: src/main.c:434
 msgid "Migrating configuration..."
 msgstr "Configuratiebestand overzetten..."
 
-#: src/main.c:1141
+#: src/main.c:1146
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread niet ondersteund door glib.\n"
 
-#: src/main.c:1161 src/main.c:1165 src/main.c:1169
+#: src/main.c:1166 src/main.c:1170 src/main.c:1174
 msgid "(or older)"
 msgstr "(of ouder)"
 
-#: src/main.c:1510
+#: src/main.c:1515
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6761,7 +6791,7 @@ msgstr[1] ""
 "instellingen voor meer informatie:\n"
 "%s"
 
-#: src/main.c:1552
+#: src/main.c:1557
 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 "
@@ -6772,7 +6802,7 @@ msgstr ""
 "Gebruik \"Ververs mappenboom\" in het contextmenu van deze map om dit "
 "proberen te repareren."
 
-#: src/main.c:1558
+#: src/main.c:1563
 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 "
@@ -6782,36 +6812,76 @@ msgstr ""
 "laden. Het postvak komt waarschijnlijk van een oude en externe plugin. "
 "Herinstalleer alstublieft deze plugin en probeer het nogmaals."
 
-#: src/main.c:1799
+#: src/main.c:1804
 msgid "Missing filename\n"
 msgstr "Bestandsnaam mist\n"
 
-#: src/main.c:1806
+#: src/main.c:1811
 msgid "Cannot open filename for reading\n"
 msgstr "Kan bestandsnaam niet openen om te lezen\n"
 
-#: src/main.c:1817
+#: src/main.c:1822
 msgid "Malformed header\n"
 msgstr "Vervormde header\n"
 
-#: src/main.c:1824
+#: src/main.c:1829
 msgid "Duplicated 'To:' header\n"
 msgstr "Gedupliceerde 'Aan:' header\n"
 
-#: src/main.c:1835
+#: src/main.c:1840
 msgid "Missing required 'To:' header\n"
 msgstr "Benodigde header 'Aan:' mist\n"
 
-#: src/main.c:1980
+#: src/main.c:1866
+#, 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
+#, c-format
+msgid "Missing file argument for option %s"
+msgstr "Benodigd bestand-argument ontbreekt voor optie %s"
+
+#: src/main.c:1915
+#, 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
+#, c-format
+msgid "Missing uri argument for option %s"
+msgstr "Benodigd uri-argument ontbreekt voor optie %s"
+
+#: src/main.c:1951
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "Missing request argument for option %s"
+msgstr "Benodigd aanvraag-argument ontbreekt voor optie %s"
+
+#: src/main.c:2042
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:1982
+#: src/main.c:2044
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:1983
+#: src/main.c:2045
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6831,11 +6901,11 @@ msgstr ""
 "                         lege regel, daarna de e-mail-inhoud tot het einde "
 "van het bestand."
 
-#: src/main.c:1988
+#: src/main.c:2050
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe uri      abonneer indien mogelijk op gegeven URI"
 
-#: src/main.c:1989
+#: src/main.c:2051
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6845,7 +6915,7 @@ msgstr ""
 "                         open venster \"Bericht opstellen\" met gegeven "
 "bestanden bijgevoegd"
 
-#: src/main.c:1992
+#: src/main.c:2054
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6855,23 +6925,23 @@ msgstr ""
 "                         open venster \"Bericht opstellen\" met gegeven "
 "bestanden ingevoegd"
 
-#: src/main.c:1995
+#: src/main.c:2057
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:1996
+#: src/main.c:2058
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          haal nieuwe berichten op van alle accounts"
 
-#: src/main.c:1997
+#: src/main.c:2059
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     annuleer het ophalen van berichten"
 
-#: src/main.c:1998
+#: src/main.c:2060
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       annuleer het verzenden van berichten"
 
-#: src/main.c:1999
+#: src/main.c:2061
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6889,77 +6959,77 @@ msgstr ""
 "                         aanvraag: zoekstring\n"
 "                         recursief: false als arg. start met 0, n, N, f or F"
 
-#: src/main.c:2006
+#: src/main.c:2068
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verzend alle berichten in de wachtrij"
 
-#: src/main.c:2007
+#: src/main.c:2069
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [map]...      geef totaal aantal berichten weer"
 
-#: src/main.c:2008
+#: src/main.c:2070
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [map]... geef status van mappen weer"
 
-#: src/main.c:2010
+#: src/main.c:2072
 msgid "  --statistics           show session statistics"
-msgstr "  --statistics           toon statistieken van de sessie"
+msgstr "  --statistics           geef statistieken van de sessie weer"
 
-#: src/main.c:2011
+#: src/main.c:2073
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     sessie-statistieken terugzetten"
 
-#: src/main.c:2012
+#: src/main.c:2074
 msgid ""
-"  --select folder[/msg]  jumps to the specified folder/message\n"
-"                         folder is a folder id like 'folder/sub_folder'"
+"  --select folder[/msg]  jump to the specified folder/message\n"
+"                         folder is a folder id like 'folder/sub_folder', a "
+"file:// uri or an absolute path"
 msgstr ""
-"  --select map[/bericht] ga naar opgegeven map/bericht\n"
-"                         map is een map-ID zoals 'map/submap'"
+"  --select folder[/msg]  jump to the specified folder/message\n"
+"                         folder is a folder id like 'folder/sub_folder', a "
+"file:// uri or an absolute path"
 
-#: src/main.c:2014
+#: src/main.c:2076
 msgid "  --online               switch to online mode"
 msgstr "  --online               schakel over naar online-modus"
 
-#: src/main.c:2015
+#: src/main.c:2077
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              schakel over naar offline-modus"
 
-#: src/main.c:2016
+#: src/main.c:2078
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sluit Claws Mail af"
 
-#: src/main.c:2017
-msgid "  --debug                debug mode"
-msgstr "  --debug                debug modus"
+#: src/main.c:2079
+msgid "  --debug -d             debug mode"
+msgstr "  --debug -d             foutopsporingsmodus"
 
-#: src/main.c:2018
+#: src/main.c:2080
 msgid "  --toggle-debug         toggle debug mode"
-msgstr "  --toggle-debug         debug modus aan of uit zetten"
+msgstr "  --toggle-debug         foutopsporingsmodus aan of uit zetten"
 
-#: src/main.c:2019
-msgid "  --help -h              display this help and exit"
+#: src/main.c:2081
+msgid "  --help -h              display this help"
 msgstr "  --help -h              geef deze hulp weer"
 
-#: src/main.c:2020
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           geef versie-informatie en sluit af"
+#: src/main.c:2082
+msgid "  --version -v           output version information"
+msgstr "  --version -v           geef versie-informatie"
 
-#: src/main.c:2021
+#: src/main.c:2083
 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      geef versie-informatie en ingebouwde mogelijkheden "
-"en sluit af"
+"  --version-full -V      geef versie-informatie en ingebouwde mogelijkheden"
 
-#: src/main.c:2022
+#: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           print configuratiemap"
 
-#: src/main.c:2023
+#: src/main.c:2085
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -6967,40 +7037,56 @@ msgstr ""
 "  --alternate-config-dir directory\n"
 "                         gebruik opgegeven configuratiemap"
 
-#: src/main.c:2025
+#: src/main.c:2087
 msgid ""
-"  --geometry -geometry WxH+X+Y\n"
+"  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 msgstr ""
-"  --geometry -geometry WxH+X+Y\n"
-"                         stel geometrie in voor hoofdscherm"
+"  --geometry -geometry [WxH][+X+Y]\n"
+"                         set geometry for main window"
 
-#: src/main.c:2078
-msgid "Unknown option. Try -h or --help for usage.\n"
-msgstr "Onbekende optie. Probeer -h of --help voor het gebruik.\n"
+#: src/main.c:2104
+#, c-format
+msgid "Missing directory argument for option %s"
+msgstr "Benodigd map-argument ontbreekt voor optie %s"
+
+#: src/main.c:2112
+#, c-format
+msgid "Missing geometry argument for option %s"
+msgstr "Benodigd geometrie-argument ontbreekt voor optie %s"
+
+#: src/main.c:2123
+#, 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
+#, c-format
+msgid "Unknown option %s"
+msgstr "Onbekende optie %s"
 
-#: src/main.c:2096
+#: src/main.c:2175
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Verwerken (%s)..."
 
-#: src/main.c:2099
+#: src/main.c:2178
 msgid "top level folder"
 msgstr "map op hoogste niveaux"
 
-#: src/main.c:2181
+#: src/main.c:2260
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:2182
+#: src/main.c:2261
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:2940
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: netwerk is beschikbaar.\n"
 
-#: src/main.c:2946
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: netwerk is niet beschikbaar.\n"
 
@@ -7532,7 +7618,7 @@ msgstr "Netwerk_log"
 
 #: src/mainwindow.c:791
 msgid "Debug _Log"
-msgstr "Fouten_logboek"
+msgstr "Foutopsporings_logboek"
 
 #: src/mainwindow.c:794
 msgid "_Forget all session passwords"
@@ -7762,7 +7848,7 @@ msgstr "Aflopend"
 msgid "_Auto detect"
 msgstr "_Automatisch detecteren"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr "Tags toepassen..."
 
@@ -7788,7 +7874,7 @@ msgstr "Netwerklog"
 
 #: src/mainwindow.c:2024
 msgid "Filtering/Processing debug log"
-msgstr "Filteren/Verwerken debuglog"
+msgstr "Filteren/Verwerken foutopsporingslogboek"
 
 #: src/mainwindow.c:2043 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
@@ -7932,7 +8018,7 @@ msgstr "Geen dubbel bericht gevonden in %d mappen.\n"
 msgid "Select folder to go to"
 msgstr "Selecteer map om heen te gaan"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr "Verwerkingsregels toepassen voor mapregels"
 
@@ -7940,7 +8026,7 @@ msgstr "Verwerkingsregels toepassen voor mapregels"
 msgid "Processing rules to apply after folder rules"
 msgstr "Verwerkingsregels toepassen na mapregels"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr "Filters instellen"
 
@@ -8154,7 +8240,7 @@ msgstr "Geef alle %s weer."
 
 #: src/messageview.c:1870
 msgid "Only the first megabyte of text is shown."
-msgstr "Alleen de eersste megabyte tekst is weergegeven."
+msgstr "Alleen de eerste megabyte tekst is weergegeven."
 
 #: src/messageview.c:1901
 msgid ""
@@ -8249,7 +8335,7 @@ msgstr "_Annuleren"
 
 #: src/messageview.c:2068 src/messageview.c:2079
 msgid "_Send Notification"
-msgstr "_Stuur bevestiging"
+msgstr "_Stuur melding"
 
 #: src/messageview.c:2075
 msgid ""
@@ -8290,8 +8376,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:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr "Er is een fout opgetreden tijdens het leren.\n"
 
@@ -8405,7 +8491,7 @@ 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:440
+#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan het deel van een meerdelig bericht niet opslaan: %s"
@@ -8467,8 +8553,8 @@ msgstr "Selecteer doelmap"
 msgid "'%s' is not a directory."
 msgstr "'%s' is geen map."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr "Opslaan als"
 
@@ -8526,7 +8612,7 @@ msgstr "Type:"
 msgid "Size:"
 msgstr "Grootte:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: 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
 msgid "Description:"
@@ -8639,6 +8725,77 @@ msgstr "Afmelden van nieuwsgroep"
 msgid "Rename newsgroup folder"
 msgstr "Hernoem nieuwsgroep map"
 
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr "OAuth2 ontbrekende autorisatie-code\n"
+
+#: src/oauth2.c:244 src/oauth2.c:359
+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:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr "OAuth2-toegangswoord verkregen\n"
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr "OAuth2-toegangswoord niet verkregen\n"
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr "OAuth2-verversingswoord verkregen\n"
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "OAuth2-verversingswoord niet verkregen\n"
+
+#: src/oauth2.c:452
+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:528
+msgid "OAuth2 access token still fresh\n"
+msgstr "OAuth2-toegangswoord nog steeds geldig\n"
+
+#: src/oauth2.c:534
+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:552
+msgid "OAuth2 access token updated\n"
+msgstr "OAuth2-toegangswoord bijgewerkt\n"
+
+#: src/oauth2.c:583
+#, c-format
+msgid "OAuth2 original: %s\n"
+msgstr "OAuth2 origineel: %s\n"
+
+#: src/oauth2.c:584
+#, c-format
+msgid "OAuth2 encoded: %s\n"
+msgstr "OAuth2 versleuteld: %s\n"
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr ""
+"OAuth2 gedecodeerd: %s\n"
+"\n"
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr "Invoeren hoofdwachtwoord"
@@ -8681,7 +8838,7 @@ msgstr "Bevestig wachtwoord:"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:53
 msgid "Acpi Notifier"
-msgstr "Acpi Verwittiger"
+msgstr "Acpi-meldingen"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
@@ -8819,7 +8976,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/spamassassin/spamassassin_gtk.c:463
+#: src/plugins/spamassassin/spamassassin_gtk.c:466
 #: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
 #: src/prefs_matcher.c:690
 msgid "Select..."
@@ -9485,9 +9642,9 @@ msgstr "Bogofilter"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:118
-#: src/plugins/spamassassin/spamassassin_gtk.c:459
-#: src/plugins/spamassassin/spamassassin_gtk.c:508
-#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:686
+#: src/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
@@ -9586,25 +9743,25 @@ msgstr "Spam leren"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: 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/spamassassin/spamassassin_gtk.c:374
+#: 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/spamassassin/spamassassin_gtk.c:383
+#: 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:386 src/prefs_account.c:1616
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr "KB"
 
@@ -9622,7 +9779,7 @@ msgstr "Markeer alleen als spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:432
+#: src/plugins/spamassassin/spamassassin_gtk.c:435
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9631,7 +9788,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:438
+#: 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"
 
@@ -9663,13 +9820,13 @@ msgstr "Alleen voor berichten in MH-mappen"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:453
+#: 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/spamassassin/spamassassin_gtk.c:457
+#: src/plugins/spamassassin/spamassassin_gtk.c:460
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9679,7 +9836,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:467
+#: 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"
 
@@ -9706,7 +9863,7 @@ msgstr "Pad naar bogofilter-programma"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:445
+#: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Mark spam as read"
 msgstr "Markeer spam als gelezen"
 
@@ -9716,7 +9873,7 @@ msgstr "Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter.c:273
 msgid "Bsfilter: fetching body..."
-msgstr "Bsfilter: ophalen bericht..."
+msgstr "Bsfilter: ophalen berichtinhoud..."
 
 #: src/plugins/bsfilter/bsfilter.c:282
 msgid "Bsfilter: filtering message..."
@@ -9776,7 +9933,7 @@ msgstr ""
 "Opties kunnen gevonden worden in /Instellingen/Voorkeuren/Plugins/Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:424
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid "Save spam in"
 msgstr "Spam opslaan in"
 
@@ -10059,7 +10216,7 @@ msgstr ": Niet in staat te openen"
 #: src/plugins/clamd/libclamd/clamd-plugin.c:479
 #: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket write error"
-msgstr "Socket schrijffout"
+msgstr "Socket-schrijffout"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:486
 #, c-format
@@ -10068,7 +10225,7 @@ msgstr "%s: Fout bij lezen"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:500
 msgid "Socket read error"
-msgstr "Socket leesfout"
+msgstr "Socket-leesfout"
 
 #: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
 msgid "Demo"
@@ -10125,13 +10282,13 @@ msgstr "Toon ingesloten objecten met behulp van plugins"
 
 #: src/plugins/fancy/fancy_prefs.c:170
 msgid "Open in Viewer (remote content is enabled)"
-msgstr "Open in browser (inhoud laden van de server is ingeschakeld)"
+msgstr "Open in weergever (inhoud van de server wordt geladen)"
 
 #: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "Doe niets (inhoud van de server wordt niet geladen)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Proxy"
@@ -10145,6 +10302,7 @@ msgid "Use proxy"
 msgstr "Proxy gebruiken"
 
 #: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Bronnen van de server"
 
@@ -10163,12 +10321,13 @@ msgstr ""
 "worden aangezet voor inhoud die is bijgevoegd in de e-mail."
 
 #: src/plugins/fancy/fancy_prefs.c:245
+#: src/plugins/litehtml_viewer/lh_prefs.c:121
 msgid "Enable loading of remote content"
 msgstr "Inhoud van de server laden"
 
 #: src/plugins/fancy/fancy_prefs.c:277
 msgid "When clicking on a link, by default"
-msgstr "Bij klikken op een link, standaard"
+msgstr "Bij klikken op een koppeling, standaard"
 
 #: src/plugins/fancy/fancy_prefs.c:285
 msgid "Open in External Browser"
@@ -10181,7 +10340,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:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
+#: src/prefs_account.c:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Bekijk"
@@ -10190,89 +10349,89 @@ msgstr "Bekijk"
 msgid "Select stylesheet"
 msgstr "Stijlblad selecteren"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr "Inhoud van de server laden is uitgezet."
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr "Laad afbeeldingen"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr "Deblokkeer externe inhoud"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr "Zet Javascript Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr "Zet Plugins Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr "Java activeren"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
-msgstr "Open links met externe browser"
+msgstr "Open koppelingen met externe browser"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Een fout gebeurde: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, 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:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr "Zoeken op het Web"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
-msgstr "Open in Browser"
+msgstr "Open in weergever"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr "Open in Browser"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr "Open Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
-msgstr "Kopieer Koppeling"
+msgstr "Kopieer koppeling"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
-msgstr "Haal Koppeling Op"
+msgstr "Haal koppeling op"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr "Sla Afbeelding Op Als"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr "Kopieer Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr "Importeer feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Weergever"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10369,7 +10528,7 @@ msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:130
 msgid "GData plugin: Authorization required"
-msgstr "GData-plugin: Authorisatie vereist"
+msgstr "GData-plugin: Autorisatie vereist"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:132
 msgid ""
@@ -10381,13 +10540,13 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
-"Je moet Claws Mail toestemming geven om je Google contactlijst te gebruiken "
-"voor de GData-plugin.\n"
+"Je moet Claws Mail toestemming geven om je Google contactenlijst te "
+"gebruiken voor de GData-plugin.\n"
 "\n"
-"Bezoek Google's authorisatiepagina door op de knop hieronder te klikken. Na "
-"het bevestigen van de authorisatie zal je een authorisatiecode ontvangen. "
+"Bezoek Google's autorisatiepagina door op de knop hieronder te klikken. Na "
+"het bevestigen van de autorisatie zal je een autorisatie-code ontvangen. "
 "Voer die code in het veld hieronder in om Claws Mail toegang te geven om je "
-"Google contactlijst te gebruiken."
+"Google contactenlijst te gebruiken."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:147
 msgid "Step 1:"
@@ -10395,7 +10554,7 @@ msgstr "Stap 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Click here to open the Google authorization page in a browser"
-msgstr "Klik hier om de authorisatiepagina van Google te openen in een browser"
+msgstr "Klik hier om de autorisatie-pagina van Google te openen in een browser"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:157
 msgid "Step 2:"
@@ -10446,26 +10605,26 @@ msgstr "GData-plugin: Starten asynchronisch groepen ophalen\n"
 #: src/plugins/gdata/cm_gdata_contacts.c:447
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr "GData-plugin: Authorisatiefout: %s\n"
+msgstr "GData-plugin: Autorisatie-fout: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:454
 msgid "GData plugin: Authorization successful\n"
-msgstr "GData-plugin: Authorisatie gelukt\n"
+msgstr "GData-plugin: Autorisatie gelukt\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:474
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "GData-plugin: Starten interactieve authorisatie\n"
+msgstr "GData-plugin: Starten interactieve autorisatie\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:481
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "GData-plugin: Authorisatiecode ontvangen, authorisatie aanvragen\n"
+msgstr "GData-plugin: Autorisatie-code ontvangen, autorisatie aanvragen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:488
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
-"GData-plugin: Geen authorisatiecode ontvangen, authorisatie-aanvraag is "
+"GData-plugin: Geen autorisatie-code ontvangen, autorisatie-aanvraag is "
 "geannuleerd\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:494
@@ -10473,17 +10632,16 @@ msgid ""
 "GData plugin: Interactive authorization still running, no additional session "
 "started\n"
 msgstr ""
-"GData-plugin: Interactieve authorisatie loopt nog, geen extra sessie "
-"gestart\n"
+"GData-plugin: Interactieve autorisatie loopt nog, geen extra sessie gestart\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:511
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "GData-plugin: Authorisatie-vernieuwingsfout: %s\n"
+msgstr "GData-plugin: Autorisatie-vernieuwingsfout: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:535
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData-plugin: Authorisatie-vernieuwing gelukt\n"
+msgstr "GData-plugin: Autorisatie-vernieuwing gelukt\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:595
 #, c-format
@@ -10495,10 +10653,10 @@ msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:603
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "GData-plugin: Starten van vernieuwing authorisatie\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:1921
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
 msgid "Authentication"
 msgstr "Authenticatie"
 
@@ -10552,30 +10710,30 @@ msgstr ""
 msgid "GData integration"
 msgstr "GData integratie"
 
-#: src/plugins/libravatar/libravatar.c:332
-#: src/plugins/libravatar/libravatar.c:397
-#: src/plugins/libravatar/libravatar.c:457
-#: src/plugins/libravatar/libravatar_prefs.c:546
+#: src/plugins/libravatar/libravatar.c:334
+#: src/plugins/libravatar/libravatar.c:399
+#: src/plugins/libravatar/libravatar.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:564
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: src/plugins/libravatar/libravatar.c:339
+#: src/plugins/libravatar/libravatar.c:341
 msgid "Failed to register avatar header update hook"
 msgstr "Registreren van 'avatar header update'-hook is mislukt"
 
-#: src/plugins/libravatar/libravatar.c:348
+#: src/plugins/libravatar/libravatar.c:350
 msgid "Failed to register avatar image render hook"
 msgstr "Registreren van 'avatar image render'-hook is mislukt"
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:356
 msgid "Failed to create avatar image cache directory"
 msgstr "Avatar afbeeldingscache aanmaken mislukt"
 
-#: src/plugins/libravatar/libravatar.c:364
+#: src/plugins/libravatar/libravatar.c:366
 msgid "Failed to load missing items cache"
 msgstr "Missende items cache laden mislukt"
 
-#: src/plugins/libravatar/libravatar.c:407
+#: src/plugins/libravatar/libravatar.c:409
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10605,33 +10763,33 @@ msgstr ""
 "\n"
 "Feedback naar <ricardo at mones.org> is welkom.\n"
 
-#: src/plugins/libravatar/libravatar_prefs.c:137
+#: src/plugins/libravatar/libravatar_prefs.c:146
 msgid "Error reading cache stats"
 msgstr "Fout bij lezen cache-statistieken"
 
-#: src/plugins/libravatar/libravatar_prefs.c:141
+#: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr "Gebruikt %s in %d bestanden, %d mappen, %d overige en %d fouten"
 
-#: src/plugins/libravatar/libravatar_prefs.c:150
+#: src/plugins/libravatar/libravatar_prefs.c:159
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
 msgstr "Gebruikt %s in %d bestanden, %d mappen en %d overige"
 
-#: src/plugins/libravatar/libravatar_prefs.c:164
+#: src/plugins/libravatar/libravatar_prefs.c:173
 msgid "Clear icon cache"
 msgstr "Pictogramcache wissen"
 
-#: src/plugins/libravatar/libravatar_prefs.c:165
+#: src/plugins/libravatar/libravatar_prefs.c:174
 msgid "Are you sure you want to remove all cached avatar icons?"
 msgstr "Wil je de cache van avatarpictogrammen werkelijk verwijderen?"
 
-#: src/plugins/libravatar/libravatar_prefs.c:178
+#: src/plugins/libravatar/libravatar_prefs.c:187
 msgid "Not enough memory for operation"
 msgstr "Niet genoeg geheugen om uitt e voeren"
 
-#: src/plugins/libravatar/libravatar_prefs.c:183
+#: src/plugins/libravatar/libravatar_prefs.c:192
 #, c-format
 msgid ""
 "Icon cache successfully cleared:\n"
@@ -10642,11 +10800,11 @@ msgstr ""
 "• %u missende delen verwijderd.\n"
 "• %u bestanden verwijderd."
 
-#: src/plugins/libravatar/libravatar_prefs.c:188
+#: src/plugins/libravatar/libravatar_prefs.c:197
 msgid "Icon cache successfully cleared!"
 msgstr "Pictogramcache gewist."
 
-#: src/plugins/libravatar/libravatar_prefs.c:191
+#: src/plugins/libravatar/libravatar_prefs.c:200
 #, c-format
 msgid ""
 "Errors clearing icon cache:\n"
@@ -10661,84 +10819,100 @@ msgstr ""
 "• %u bestanden konden niet gelezen worden.\n"
 "• %u bestanden konden niet worden verwijderd."
 
-#: src/plugins/libravatar/libravatar_prefs.c:198
+#: src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Error clearing icon cache."
 msgstr "Fout bij wissen van de pictogramcache."
 
-#: src/plugins/libravatar/libravatar_prefs.c:213
+#: src/plugins/libravatar/libravatar_prefs.c:222
 msgid "_Use cached icons"
 msgstr "_Gebruik gecachte pictogrammen"
 
-#: src/plugins/libravatar/libravatar_prefs.c:214
+#: src/plugins/libravatar/libravatar_prefs.c:223
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 "Bewaar pictogrammen op harde schijf voor hergebruik i.p.v. een nieuwe "
 "netwerkaanvraag te maken"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
+#: src/plugins/libravatar/libravatar_prefs.c:238
 msgid "Cache refresh interval"
 msgstr "Cache verversingsinterval"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
-#: 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/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
 msgid "hours"
 msgstr "uur"
 
-#: src/plugins/libravatar/libravatar_prefs.c:305
+#: src/plugins/libravatar/libravatar_prefs.c:316
 msgid "Mystery man"
 msgstr "Mystery man"
 
-#: src/plugins/libravatar/libravatar_prefs.c:306
+#: src/plugins/libravatar/libravatar_prefs.c:317
 msgid "Identicon"
 msgstr "Identificatie-pictogram"
 
-#: src/plugins/libravatar/libravatar_prefs.c:307
+#: src/plugins/libravatar/libravatar_prefs.c:318
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: src/plugins/libravatar/libravatar_prefs.c:308
+#: src/plugins/libravatar/libravatar_prefs.c:319
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: src/plugins/libravatar/libravatar_prefs.c:309
+#: src/plugins/libravatar/libravatar_prefs.c:320
 msgid "Retro"
 msgstr "Retro"
 
-#: src/plugins/libravatar/libravatar_prefs.c:310
+#: src/plugins/libravatar/libravatar_prefs.c:321
+msgid "Robohash"
+msgstr "Robohash"
+
+#: src/plugins/libravatar/libravatar_prefs.c:322
+msgid "Pagan"
+msgstr "Pagan"
+
+#: src/plugins/libravatar/libravatar_prefs.c:323
 msgid "Custom URL"
 msgstr "Aangepaste URL"
 
-#: src/plugins/libravatar/libravatar_prefs.c:313
+#: src/plugins/libravatar/libravatar_prefs.c:326
 msgid "A blank image"
 msgstr "Een standaard afbeelding"
 
-#: src/plugins/libravatar/libravatar_prefs.c:314
+#: src/plugins/libravatar/libravatar_prefs.c:327
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "Het niet-opdringerige grijze silhouet met laag contrast"
 
-#: src/plugins/libravatar/libravatar_prefs.c:315
+#: src/plugins/libravatar/libravatar_prefs.c:328
 msgid "A generated geometric pattern"
 msgstr "Een aangemaakt geometrisch patroon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:316
+#: src/plugins/libravatar/libravatar_prefs.c:329
 msgid "A generated full-body monster"
 msgstr "Een aangemaakte full-body afdruk"
 
-#: src/plugins/libravatar/libravatar_prefs.c:317
+#: src/plugins/libravatar/libravatar_prefs.c:330
 msgid "A generated almost unique face"
 msgstr "Een aangemaakte bijna unieke gezichtsafbeelding"
 
-#: src/plugins/libravatar/libravatar_prefs.c:318
+#: src/plugins/libravatar/libravatar_prefs.c:331
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "Een aangemaakte 8-bit arcade-stijl pixelafbeelding"
 
-#: src/plugins/libravatar/libravatar_prefs.c:319
+#: src/plugins/libravatar/libravatar_prefs.c:332
+msgid "A generated robotic character"
+msgstr "Een aangemaakt robot-karakter"
+
+#: src/plugins/libravatar/libravatar_prefs.c:333
+msgid "A generated retro adventure game character"
+msgstr "Een aangemaakt karakter uit retro-games"
+
+#: src/plugins/libravatar/libravatar_prefs.c:334
 msgid "Redirect to a user provided URL"
 msgstr "Herverwijs naar een door de gebruiker opgegeven URL"
 
-#: src/plugins/libravatar/libravatar_prefs.c:333
+#: src/plugins/libravatar/libravatar_prefs.c:348
 msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
@@ -10747,11 +10921,11 @@ msgstr ""
 "gebruikerspictogram beschikbaar is. Laat leeg voor het standaard oranje "
 "libravatar pictogram."
 
-#: src/plugins/libravatar/libravatar_prefs.c:382
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "_Sta herverwijzen naar andere sites toe"
 
-#: src/plugins/libravatar/libravatar_prefs.c:383
+#: src/plugins/libravatar/libravatar_prefs.c:399
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -10759,44 +10933,82 @@ msgstr ""
 "Volg herverwijs-antwoorden die ontvangen zijn van de libravatar-server naar "
 "andere diensten als gravatar.com"
 
-#: src/plugins/libravatar/libravatar_prefs.c:392
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "_Gebruik aangesloten servers"
 
-#: src/plugins/libravatar/libravatar_prefs.c:393
+#: src/plugins/libravatar/libravatar_prefs.c:409
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
 "Probeer de avatar te verkrijgen van de libravatar-server van het domein van "
 "de afzender"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
-msgstr "Aanvraag verlooptijd"
+msgstr "Aanvraag tijdslimiet"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "seconde(n)"
 
-#: src/plugins/libravatar/libravatar_prefs.c:411
+#: 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."
 msgstr ""
-"Zet op 0 om globale socket-I/O timeout te gebruiken. Maximum waarde moet ook "
-"minder zijn dan de globale socket-I/O timeout."
+"Zet op 0 om globale socket-I/O tijdslimiet te gebruiken. Maximum waarde moet "
+"ook minder zijn dan de globale socket-I/O tijdslimiet."
 
-#: src/plugins/libravatar/libravatar_prefs.c:455
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Pictogramcache"
 
-#: src/plugins/libravatar/libravatar_prefs.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "Standaard modus voor missend pictogram"
 
-#: src/plugins/libravatar/libravatar_prefs.c:463
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Netwerk"
 
+#: src/plugins/litehtml_viewer/lh_prefs.c:116
+msgid ""
+"Loading remote resources can lead to some privacy issues.\n"
+"When remote content loading is disabled, nothing will be requested\n"
+"from the network."
+msgstr ""
+"Inhoud van de server laden kan leiden tot privacy-problemen.\n"
+"Wanneer inhoud laden van de server uitstaat, wordt er niets\n"
+"opgevraagd van het netwerk."
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:133
+msgid "Size of image cache in megabytes"
+msgstr "Grootte van afbeeldings-cache in megabytes"
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:148
+msgid "Default font"
+msgstr "Standaard lettertype"
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+msgid "Open Link"
+msgstr "Open koppeling"
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+msgid "Copy Link Location"
+msgstr "Kopieer koppelingslocatie"
+
+#: src/plugins/litehtml_viewer/plugin.c:50
+msgid "LiteHTML viewer"
+msgstr "LiteHTML-weergever"
+
+#: src/plugins/litehtml_viewer/plugin.c:55
+msgid ""
+"Viewer plugin for HTML emails, using the litehtml library (http://www."
+"litehtml.com/)."
+msgstr ""
+"Weergave-plugin voor HTML-emails, dzee gebruikt de litehtml-bibliotheek "
+"(http://www.litehtml.com/)."
+
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder"
 msgstr "mailmbox map"
@@ -10886,7 +11098,7 @@ msgstr "Auth-methode niet beschikbaar"
 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:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
 msgid "_Filter"
 msgstr "_Filter"
 
@@ -10943,7 +11155,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 "Laden..."
 
@@ -11014,7 +11226,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:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr "Serverinformatie"
 
@@ -11066,28 +11278,28 @@ 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:1388
-#: src/prefs_account.c:1967
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 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: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/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
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: 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:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr "Authenticatie-methode"
 
-#: 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/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
 msgid "Automatic"
 msgstr "Automatisch"
@@ -11154,8 +11366,8 @@ msgstr "selecteer recursief"
 msgid "No new messages"
 msgstr "Geen nieuwe berichten"
 
-#: src/plugins/notification/notification_plugin.c:216
-#: src/plugins/notification/notification_plugin.c:420
+#: src/plugins/notification/notification_plugin.c:220
+#: src/plugins/notification/notification_plugin.c:424
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -11165,55 +11377,48 @@ msgstr "Geen nieuwe berichten"
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 msgid "Notification"
-msgstr "Notificatie"
+msgstr "Melding"
 
-#: src/plugins/notification/notification_plugin.c:221
+#: src/plugins/notification/notification_plugin.c:225
 msgid "The Notification plugin needs threading support."
-msgstr "De Notificatie-plugin heeft threading-ondersteuning nodig."
+msgstr "De Melding-plugin heeft threading-ondersteuning nodig."
 
-#: src/plugins/notification/notification_plugin.c:228
+#: src/plugins/notification/notification_plugin.c:232
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
-"Registreren van de 'folder item update'-hook in de Notificatie-plugin is "
-"mislukt"
+"Registreren van de 'folder item update'-hook in de Melding-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:236
+#: src/plugins/notification/notification_plugin.c:240
 msgid "Failed to register folder update hook in the Notification plugin"
-msgstr ""
-"Registreren van 'folder update'-hook in de Notificatie-plugin is mislukt"
+msgstr "Registreren van 'folder update'-hook in de Melding-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:246
+#: src/plugins/notification/notification_plugin.c:250
 msgid "Failed to register msginfo update hook in the Notification plugin"
-msgstr ""
-"Registreren van 'msginfo update'-hook in de Notificatie-plugin is mislukt"
+msgstr "Registreren van 'msginfo update'-hook in de Melding-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:256
+#: src/plugins/notification/notification_plugin.c:260
 msgid "Failed to register offline switch hook in the Notification plugin"
-msgstr ""
-"Registreren van 'offline switch'-hook in de Notificatie-plugin is mislukt"
+msgstr "Registreren van 'offline switch'-hook in de Melding-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:267
+#: src/plugins/notification/notification_plugin.c:271
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
-"Registreren van 'main window close'-hook in de Notificatie-plugin is mislukt"
+"Registreren van 'main window close'-hook in de Melding-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:280
+#: src/plugins/notification/notification_plugin.c:284
 msgid "Failed to register got iconified hook in the Notification plugin"
-msgstr ""
-"Registreren van 'got iconified'-hook in de Notificatie-plugin is mislukt"
+msgstr "Registreren van 'got iconified'-hook in de Melding-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:293
+#: src/plugins/notification/notification_plugin.c:297
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
-"Registreren van 'account list changed'-hook in de Notificatie-plugin is "
-"mislukt"
+"Registreren van 'account list changed'-hook in de Melding-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:306
+#: src/plugins/notification/notification_plugin.c:310
 msgid "Failed to register theme change hook in the Notification plugin"
-msgstr ""
-"Registreren van 'theme change'-hook in de Notificatie-plugin is mislukt"
+msgstr "Registreren van 'theme change'-hook in de Melding-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:425
+#: src/plugins/notification/notification_plugin.c:429
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -11222,13 +11427,13 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Deze plugin biedt verschillende manieren om de gebruiker te notifiëren van "
-"nieuwe en ongelezen e-mail.\n"
+"Deze plugin biedt verschillende manieren om de gebruiker een melding te "
+"geven van nieuwe en ongelezen e-mail.\n"
 "De plugin is uitgebreid instelbaar in het plugin-gedeelte van de "
 "instellingen-dialoog.\n"
 "Feedback naar <berndth at gmx.de> is welkom."
 
-#: src/plugins/notification/notification_plugin.c:450
+#: src/plugins/notification/notification_plugin.c:454
 msgid "Various tools"
 msgstr "Verschillend gereedschap"
 
@@ -11376,15 +11581,15 @@ msgstr "Deze instellingen overschrijven map-specifieke selecties."
 
 #: src/plugins/notification/notification_prefs.c:659
 msgid "Global notification settings"
-msgstr "Globale notificatie-instellingen"
+msgstr "Globale melding-instellingen"
 
 #: src/plugins/notification/notification_prefs.c:668
 msgid "Set window manager urgency hint when new messages exist"
-msgstr "Stel windowmanager hint in wanneer er nieuwe berichten zijn"
+msgstr "Stel vensterbeheerder hint in wanneer er nieuwe berichten zijn"
 
 #: src/plugins/notification/notification_prefs.c:677
 msgid "Set window manager urgency hint when unread messages exist"
-msgstr "Stel windowmanager hint in wanneer er ongelezen berichten zijn"
+msgstr "Stel vensterbeheerder hint in wanneer er ongelezen berichten zijn"
 
 #: src/plugins/notification/notification_prefs.c:687
 msgid "Use sound theme"
@@ -11392,7 +11597,7 @@ msgstr "Geluids-thema gebruiken"
 
 #: src/plugins/notification/notification_prefs.c:761
 msgid "Show banner"
-msgstr "Laat banner zien"
+msgstr "Geef banner weer"
 
 #: src/plugins/notification/notification_prefs.c:766
 #: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
@@ -11494,7 +11699,7 @@ msgstr "Zet popup aan"
 #: src/plugins/notification/notification_prefs.c:1062
 #: src/plugins/notification/notification_prefs.c:1664
 msgid "Popup timeout"
-msgstr "Popup verlooptijd"
+msgstr "Popup tijdslimiet"
 
 #: src/plugins/notification/notification_prefs.c:1101
 msgid "Make popup sticky"
@@ -11506,7 +11711,7 @@ msgstr "Stel van popupvenster de breedte en positie in"
 
 #: src/plugins/notification/notification_prefs.c:1116
 msgid "(the window manager is free to ignore this)"
-msgstr "(de windowmanager is vrij om dit te negeren)"
+msgstr "(de vensterbeheerder is vrij om dit te negeren)"
 
 #: src/plugins/notification/notification_prefs.c:1164
 #: src/plugins/notification/notification_prefs.c:1676
@@ -11632,7 +11837,7 @@ msgstr "_Werk offline"
 
 #: src/plugins/notification/notification_trayicon.c:134
 msgid "Show Trayicon Notifications"
-msgstr "Laat Systeemvak Notificaties Zien"
+msgstr "Geef meldingen in het systeemvak weer"
 
 #: src/plugins/notification/notification_trayicon.c:277
 #, c-format
@@ -11713,96 +11918,96 @@ msgstr "Format:"
 msgid "Optimized:"
 msgstr "Geoptimaliseerd:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "PDF-eigenschappen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "Invoeren wachtwoord"
 
-#: 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 ""
 "Dit document is beveiligd en vereist een wachtwoord om geopend te worden."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1387
 #, c-format
 msgid "%s Document"
 msgstr "%s Document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
 msgstr "van %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 "PDF-weergave is om een onbekende reden mislukt."
 
-#: 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 "Inhoudsopgave"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "Eerste Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
-msgstr "Vorige Pagina"
+msgstr "Vorige pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "Volgende Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "Laatste Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "Zoom in"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "Zoom uit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "Passend"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "Paginabreed passend"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "Roteer naar links"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "Roteer naar rechts"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "Document afdrukken"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "Document Info"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "Pagina Nummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "Zoom Factor"
 
-#: 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 "
@@ -11815,13 +12020,13 @@ msgstr ""
 "\n"
 "Feedback is welkom: 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 Lezer"
 
-#: 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 "
@@ -11875,19 +12080,30 @@ msgstr "Geef het wachtwoord voor:"
 msgid "Bad passphrase.\n"
 msgstr "Fout wachtwoord. Probeer opnieuw...\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Sleutel importeren"
 
-#: 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 and import it?"
 msgstr ""
 "Deze sleutel zit niet aan je sleutelring. Wil je dat Claws Mail probeert om "
-"hem te importeren van een sleutelserver?"
+"hem te importeren?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "_No"
+msgstr "_Nee"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "van sleutelserver"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr "van sleutelmap van website"
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
@@ -11895,15 +12111,15 @@ msgstr ""
 "\n"
 "  Sleutel-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 "   Deze sleutel zit niet aan je sleutelring.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   Het moet mogelijk zijn hem te importeren "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -11911,17 +12127,17 @@ msgstr ""
 "als je offline werkt,\n"
 "   of "
 
-#: 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 ""
-"met de volgende opdracht: \n"
+"met één van de volgende opdrachten: \n"
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -11929,29 +12145,27 @@ msgstr ""
 "\n"
 "  Bezing met importeren sleutel-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 "   Deze sleutel is geïmporteerd in je sleutelring.\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 "   Deze sleutel kon niet geïmporteerd worden in je sleutelring.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Sleutel-servers zijn soms langzaam.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Je kunt proberen hem handmatig te importeren met de opdracht:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
+msgstr "   Je kunt proberen het handmatig te importeren met de opdracht:"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr "of"
+
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   Deze sleutel zit aan je sleutelring.\n"
 
@@ -12013,8 +12227,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:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minuten"
 
@@ -12400,7 +12614,7 @@ msgstr ""
 "Je nieuwe sleutelpaar is aangemaakt. De vingerafdruk is:\n"
 "%s\n"
 "\n"
-"Wil je de sleutel exporteren naar een sleutel-server?"
+"Wil je de sleutel exporteren naar een sleutelserver?"
 
 #: src/plugins/pgpcore/sgpgme.c:1020
 msgid "Key generated"
@@ -12639,8 +12853,8 @@ msgstr "Geef Python-console weer..."
 msgid "Refresh"
 msgstr "Verversen"
 
-#: 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/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
 msgid "Browse"
 msgstr "Bekijk"
@@ -12964,7 +13178,7 @@ 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:1585 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
+#: src/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dagen"
 
@@ -13115,7 +13329,7 @@ msgstr "Bijwerken reacties voor '%s'..."
 #: src/plugins/rssyl/rssyl_update_feed.c:107
 #: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
-msgstr "401 (Authorisatie vereist)"
+msgstr "401 (Autorisatie vereist)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:110
 msgid "403 (Forbidden)"
@@ -13191,7 +13405,8 @@ msgid ""
 "Please report this, with debug output attached.\n"
 msgstr ""
 "Intern probleem tijdens bijwerken van opslagformat. Dit zou niet mogen "
-"gebeuren. Maak een bugreport aan, met de debug-uitvoer bijgevoegd.\n"
+"gebeuren. Maak een foutrapport aan, met de foutopsporingsuitvoer "
+"bijgevoegd.\n"
 
 #: src/plugins/smime/plugin.c:59
 msgid ""
@@ -13302,7 +13517,7 @@ msgid "Password:"
 msgstr "Wachtwoord:"
 
 #: src/plugins/spamassassin/spamassassin.c:78
-#: src/plugins/spamassassin/spamassassin_gtk.c:671
+#: src/plugins/spamassassin/spamassassin_gtk.c:674
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -13373,68 +13588,68 @@ msgstr ""
 "Opties kunnen worden gevonden in /Instellingen/Voorkeuren/Plugins/"
 "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Localhost"
 msgstr "Locale computer"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:95
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:94
+#: src/plugins/spamassassin/spamassassin_gtk.c:97
 msgid "Unix Socket"
 msgstr "Unix-socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:122
+#: src/plugins/spamassassin/spamassassin_gtk.c:125
 msgid "Select folder to save spam to"
 msgstr "Selecteer map om spam in op te slaan"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:274
+#: src/plugins/spamassassin/spamassassin_gtk.c:277
 msgid "Enable SpamAssassin plugin"
 msgstr "Zet SpamAssassin-plugin aan"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:278
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Transport"
 msgstr "Transport"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:286
+#: src/plugins/spamassassin/spamassassin_gtk.c:289
 msgid "Type of transport"
 msgstr "Type van transport"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:307
+#: src/plugins/spamassassin/spamassassin_gtk.c:310
 msgid "User"
 msgstr "Gebruikersnaam"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:320
+#: src/plugins/spamassassin/spamassassin_gtk.c:323
 msgid "User to use with spamd server"
 msgstr "Gebruikersnaam om te gebruiken met de spamd-server"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:322
+#: src/plugins/spamassassin/spamassassin_gtk.c:325
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:340
+#: src/plugins/spamassassin/spamassassin_gtk.c:343
 msgid "Hostname or IP address of spamd server"
 msgstr "Hostnaam of IP-adres van spamd-server"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:354
 msgid "Port of spamd server"
 msgstr "Poort van spamd-server"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:360
 msgid "Path of Unix socket"
 msgstr "Pad van Unix-socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Use compression"
 msgstr "Compressie gebruiken"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:368
+#: src/plugins/spamassassin/spamassassin_gtk.c:371
 msgid "Enable compression if spamd uses it, otherwise disable it."
 msgstr ""
 "Comprimering inschakelen wanneer spamd het gebruikt, anders uitschakelen."
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:403
+#: src/plugins/spamassassin/spamassassin_gtk.c:406
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13451,7 +13666,7 @@ msgid ""
 "%s\n"
 msgstr ""
 "\n"
-"Claws Mail TNEF verwerker:\n"
+"Claws Mail TNEF-verwerker:\n"
 "\n"
 "%s\n"
 
@@ -13484,10 +13699,10 @@ msgid ""
 "The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
 "Hand <yerase at yerot.com>"
 msgstr ""
-"Deze Claws Mail plugin maakt het mogelijk om application/ms-tnef bijlages te "
+"Deze Claws Mail-plugin maakt het mogelijk om application/ms-tnef bijlages te "
 "lezen.\n"
 "\n"
-"De plugin gebruikt de Ytnef bibliotheek, welke valt onder auteursrecht "
+"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
@@ -13512,7 +13727,7 @@ msgstr "Start"
 
 #: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
 msgid "Show"
-msgstr "Laat zien"
+msgstr "Weergeven"
 
 #: src/plugins/vcalendar/month-view.c:109
 msgid "Monday"
@@ -13667,45 +13882,45 @@ msgstr "Voorlopig accepteren"
 msgid "Decline"
 msgstr "Afwijzen"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr "Je hebt een Todo item."
 
-#: 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:718
 msgid "Details follow:"
 msgstr "Details volgen:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "Je hebt een afspraak aangemaakt."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr "Je bent uitgenodigd voor een afspraak."
 
-#: 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 "Een afspraak waar je voor uitgenodigd was is afgezegd."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr "Je hebt een afspraak doorgestuurd gekregen."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr "(deze gebeurtenis gebeurt opnieuw)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr "(deze gebeurtenis is onderdeel van een terugkerende gebeurtenis)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 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:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13714,35 +13929,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:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr "Fout - kon niet het agenda-MIME-deel verkrijgen."
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr "Fout - geen agenda deel gevonden."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr "Fout - Onbekend agenda component-type."
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
-msgstr "Stuur een notificatie naar de genodigden"
+msgstr "Stuur een melding naar de genodigden"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr "Zeg afspraak af"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 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:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr "Geen account gevonden"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13750,68 +13965,68 @@ msgstr ""
 "Je hebt geen account dat overeenkomt met een genodigde.\n"
 "Wil je toch antwoorden?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr "Toch antwoorden"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr "Antwoord"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr "Pas afspraak aan..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr "Zeg afspraak af..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr "Ga naar website"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr "Je bent al bezet op dit moment."
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Gebeurtenis:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Agenda:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Locatie:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Samenvatting:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr "Start:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr "Einde:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Genodigden:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr "Actie:"
 
@@ -14430,95 +14645,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:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "POP-protocolfout\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "ongeldig UIDL antwoord: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Verwijderen verlopen bericht %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Bericht %d [%s] wordt overgeslagen (%d bytes)\n"
 
-#: src/pop.c:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "postvak zit op slot\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "Sessie verlopen\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "opdracht wordt niet ondersteund\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "er is een fout opgetreden in de POP-sessie\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "TOP-opdracht wordt niet ondersteund\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Lokaal mbox-bestand"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr "Niets (alleen SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr "Naam van dit account"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
 msgstr "Instellen als standaardaccount"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
 msgstr "E-mailadres"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Automatische instellingen"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14526,77 +14741,81 @@ msgstr ""
 "Waarschuwing: deze versie van Claws Mail is\n"
 "gecompileerd zonder ondersteuning voor IMAP en Nieuws."
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr "Deze server vereist authenticatie"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr "Authenticatie bij verbinding maken"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr "Nieuwsserver"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr "Server om van te ontvangen"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr "Lokaal postvak"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr "SMTP-server (zenden)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr "Gebruik mail opdracht i.p.v. SMTP"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr "opdracht voor versturen berichten"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr "Lokaal"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr "Standaard Inbox"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ongefilterde berichten gaan in deze map"
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
-msgstr "Gebruik beveiligde authenticatie (APOP)"
+#: src/prefs_account.c:1634
+msgid "Authenticate before POP connection"
+msgstr "Authenticatie voor POP-verbinding"
+
+#: src/prefs_account.c:1658 src/prefs_account.c:2259
+msgid "Select"
+msgstr "Selecteren"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr "Verwijder reeds ontvangen berichten van de server"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr "Verwijder na"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dagen en 0 uur: verwijder meteen"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr "Limiet op grootte"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14605,95 +14824,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:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr "Maximum aantal artikelen dat zal worden opgehaald"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr "ongelimiteerd als 0 is opgegeven"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr "Platte tekst"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr "IMAP-servermap"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr "(gewoonlijk leeg)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
 msgstr "Geef alleen geabonneerde mappen weer"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1831
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreedte-efficiente methode (vermijdt ophalen van tags)"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1833
 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:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatisch controleren"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr "Globale instellingen gebruiken"
 
 # TPTD: check
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Controleer op nieuwe berichten elke"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filter de berichten bij het ophalen met behulp van plugins"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1908
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ophalen' haalt de e-mail voor dit account op"
 
-#: src/prefs_account.c:1894 src/prefs_customheader.c:210
+#: 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
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
 msgstr "Stuur account-e-mailadres in Bericht-ID"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr "Voeg een header van de gebruikers-agent toe"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-authenticatie (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14701,175 +14920,220 @@ msgstr ""
 "Als je deze velden leeg laat, worden dezelfde\n"
 "gebruikersnaam en wachtwoord gebruikt als bij ontvangen."
 
-#: src/prefs_account.c:2033
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr "Authenticatie met POP voor het verzenden"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr "Tijdslimiet voor POP-authenticatie"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2233
+msgid "Authorization"
+msgstr "Autorisatie"
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr "Selecteer de OAuth2 email-provider"
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr "Client-ID"
+
+#: src/prefs_account.c:2296
+msgid "Client secret"
+msgstr "Client-geheim"
+
+#: src/prefs_account.c:2328
+msgid "Obtain authorization code"
+msgstr "Autorisatie-code verkrijgen"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr "Open externe browser met aanvraag"
+
+#: src/prefs_account.c:2338
+msgid "Copy link"
+msgstr "Kopieer koppeling"
+
+#: src/prefs_account.c:2350
+msgid "Authorization code"
+msgstr "Autorisatie-code"
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr ""
+"Plak de complete URL vanuit de browser of de opgegeven autorisatie-code"
+
+#: src/prefs_account.c:2364
+msgid "Complete authorization"
+msgstr "Autorisatie afronden"
+
+#: src/prefs_account.c:2368
+msgid "Authorize"
+msgstr "Autoriseren"
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr "Ondertekening"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
 msgstr "Voeg automatisch ondertekening in"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr "Scheidingsteken van ondertekening"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr "Opdracht-uitvoer"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
 msgstr "Automatisch volgende adressen instellen"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr "Woordenlijsten voor spellingcontrole"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Standaard woordenlijst"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Standaard alternatieve woordenlijst"
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: 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
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr "Standaard privacy-systeem"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Berichten altijd ondertekenen"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Berichten altijd versleutelen"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2792
 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:2476
+#: src/prefs_account.c:2795
 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:2479
+#: src/prefs_account.c:2798
 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:2481
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr "Sla verzonden versleutelde berichten onversleuteld op"
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: 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:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: 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:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Gebruik STARTTLS voor starten beveiligde sessie"
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account.c:2685
+#: 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:2696
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr "Client-certificaten"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr "Certificaat om te ontvangen"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Client-certificaat-bestand als een PKCS12- of PEM-bestand"
 
-#: src/prefs_account.c:2732
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr "Certificaat om te verzenden"
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Geldige SSL/TLS-certificaten automatisch accepteren"
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr "Gebruik niet-blokkerende SSL/TLS"
 
-#: src/prefs_account.c:2787
+#: 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:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Proxy-server gebruiken"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3207
 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:2890
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
 msgstr "Globale proxy-instellingen gebruiken"
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Gebruik authenticatie"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
 msgstr "Proxy-server gebruiken voor verzenden"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14878,27 +15142,27 @@ msgstr ""
 "naar de ingestelde uitgaande server, en wordt de ingestelde proxy-server "
 "niet gebruikt."
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr "SMTP-poort"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr "POP-poort"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr "IMAP-poort"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr "NNTP-poort"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr "Domeinnaam"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14906,148 +15170,152 @@ msgstr ""
 "De domeinnaam wordt gebruikt in de aangemaakte Bericht-ID, en wanneer er "
 "wordt verbonden met SMTP-servers."
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr "Gebruik opdracht om te communiceren met server"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3451
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markeer dubbel geplaatste berichten als gelezen en kleur:"
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr "Plaats verzonden berichten in"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr "Plaats berichten in wachtrij in"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr "Plaats kladberichten in"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr "Plaats verwijderde berichten in"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr "Je hebt geen accountnaam opgegeven."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
 msgstr "Je hebt geen e-mailadres opgegeven."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr "Je hebt geen SMTP-server opgegeven."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr "Je hebt geen gebruikers-ID opgegeven."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr "Je hebt geen POP-server opgegeven."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr "De standaard Inbox-map bestaat niet."
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr "Je hebt geen IMAP-server opgegeven."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr "Je hebt geen NNTP-server opgegeven."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3626
 msgid "local mailbox filename is not entered."
 msgstr "je hebt geen bestandsnaam voor het lokale postvak opgegeven."
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
 msgstr "je hebt geen mail-opdrachtregel opgegeven."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3642
 msgid "User ID cannot contain a newline character."
 msgstr "Gebruikers-ID kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3647
 msgid "Password cannot contain a newline character."
 msgstr "Wachtwoord kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3678
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP gebruikers-ID kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3683
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP-wachtwoord kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr "geen domein opgegeven."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr "verzonden-map is niet geselecteerd."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr "wachtrij-map is niet geselecteerd."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr "concept-map is niet geselecteerd."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "prullenbak-map is niet geselecteerd."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - accountvoorkeuren"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Mislukt (verkeerd adres)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr "Selecteer bestand met ondertekening"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Selecteer certificaat-bestand"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin niet geladen)"
@@ -15209,7 +15477,7 @@ msgstr "<span weight=\"bold\">Begin met:</span>"
 #: src/prefs_actions.c:975
 msgid "to send message body or selection to command's standard input"
 msgstr ""
-"om de berichttekst of selectie naar de standaard invoer van de opdracht te "
+"om de berichtinhoud of selectie naar de standaard invoer van de opdracht te "
 "sturen"
 
 #: src/prefs_actions.c:976
@@ -15231,7 +15499,7 @@ msgstr "<span weight=\"bold\">Eindig met:</span>"
 #: src/prefs_actions.c:979
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
-"om de berichttekst of selectie te vervangen met de standaard uitvoer van de "
+"om de berichtinhoud of selectie te vervangen met de standaard uitvoer van de "
 "opdracht"
 
 #: src/prefs_actions.c:980
@@ -15327,7 +15595,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:451
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15553,8 +15821,8 @@ 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:138
-#: src/prefs_message.c:351
+#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:180
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Berichtweergave"
 
@@ -16095,27 +16363,44 @@ msgstr "Lettertypen"
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Bijgevoegde afbeeldingen automatisch weergeven"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr "Herschaal bijgevoegde afbeeldingen automatisch"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
 msgstr "Klikken op de afbeelding verandert schalen"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:96
+msgid "Fit image"
+msgstr "Afbeelding passend maken"
+
+#: src/prefs_image_viewer.c:99
+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
+msgid "Height"
+msgstr "Hoogte"
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr "Breedte"
+
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr "Afbeeldingen in het bericht weergeven"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr "Druk afbeeldingen af"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr "Afbeeldingweergever"
 
@@ -16320,11 +16605,11 @@ msgstr "berichtinhoud"
 msgid "whole message"
 msgstr "hele bericht"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr "Gemarkeerd"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr "Verwijderd"
 
@@ -16332,11 +16617,11 @@ msgstr "Verwijderd"
 msgid "Replied"
 msgstr "Beantwoord"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr "Doorgestuurd"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Spam"
@@ -16345,7 +16630,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Heeft bijlage"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr "Ondertekend"
 
@@ -16626,83 +16911,91 @@ msgstr ""
 msgid "Current condition rules"
 msgstr "Huidige voorwaarden"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Headers"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "Geef headerpaneel weer boven berichtweergave"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr "Geef (X-)Face weer in berichtweergave"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "(X-)Face opslaan in adresboek wanneer mogelijk"
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr "Geef Face weer in berichtweergave"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr "Face opslaan in adresboek wanneer mogelijk"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "Geef headers weer in berichtweergave"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "HTML-berichten"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "Geef HTML-berichten weer als tekst"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Geef indien mogelijk HTML-berichten weer met de plugin"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Selecteer het HTML-gedeelte van meerdelige/alternatieve berichten"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Regelafstand"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "pixels"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Schuiven"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Halve pagina"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Vloeiend schuiven"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Stap"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Toon beschrijving van bijlages (i.p.v de namen)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Citaat"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Citaat invouwen bij dubbelklik"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Behandel deze tekens als citaatmarkering"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Tekstopties"
 
@@ -16811,7 +17104,7 @@ msgstr "Selecteer kleur voor koppelingen"
 
 #: src/prefs_msg_colors.c:298
 msgid "URI link"
-msgstr "URI link"
+msgstr "URI koppeling"
 
 #: src/prefs_msg_colors.c:306
 msgctxt "Tooltip"
@@ -17369,10 +17662,10 @@ msgid ""
 "characters"
 msgstr ""
 "Specificeer de Inhoud-Overdracht-Codering (Content-Transfer-Encoding) die "
-"gebruikt moet worden als de tekst van het bericht niet-ASCII tekens bevat"
+"gebruikt moet worden als de inhoud van het bericht niet-ASCII tekens bevat"
 
-#: 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:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "Verzenden"
 
@@ -18176,7 +18469,7 @@ msgstr "Geen sleutel van ontvanger gedefinieerd."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fout bij decoderen BASE64]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr "Kon gedeelte van bericht niet decoderen"
 
@@ -18539,88 +18832,88 @@ msgstr "Geef tekst om '%s' mee te vervangen"
 msgid "Enter variable"
 msgstr "Geef variabele"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Bericht wordt verzonden met behulp van opdracht: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Kon de externe opdracht '%s' niet uitvoeren"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fout bij uitvoeren van opdracht: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "Verbinding wordt gemaakt"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "Bezig met POP voor SMTP..."
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "POP voor SMTP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Account '%s': Verbinden met SMTP-server: %s:%d..."
 
-#: src/send_message.c:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "Bestand verzonden."
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "HELO wordt verstuurd..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "Bezig met authenticatie"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "Bericht wordt verzonden..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "EHLO wordt verstuurd..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM wordt verstuurd..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO wordt verstuurd..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "DATA wordt verstuurd..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "Bezig met sluiten..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Bericht wordt verzonden (%d / %d bytes)"
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "Bericht wordt verzonden"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18683,7 +18976,7 @@ msgstr "Zoek alle zoektermen"
 
 #: src/summary_search.c:436
 msgid "Body:"
-msgstr "Berichttekst:"
+msgstr "Berichtinhoud:"
 
 #: src/summary_search.c:443
 msgid "Condition:"
@@ -18919,91 +19212,91 @@ msgstr "Van: %s, op %s"
 msgid "To: %s, on %s"
 msgstr "Aan: %s, op %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr "Je bent niet de auteur van het artikel."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4574
 #, 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:4574
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Verwijder bericht"
 msgstr[1] "Verwijder bericht"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4796
 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:4844
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4881
 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:5036
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr "Toevoegen of Overschrijven"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr "Aan bestaand bestand toevoegen of overschrijven?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr "_Toevoegen"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr "_Overschrijven"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kan bestand '%s' niet opslaan."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5090
 #, 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:5544
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr "Discussie-draden worden opgebouwd..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr "Sla deze regels over"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5799
 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:5798
+#: src/summaryview.c:5802
 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:5827
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr "Filteren"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19011,73 +19304,73 @@ msgstr ""
 "Er zijn filterregels die bij een account horen.\n"
 "Kies wat te doen met deze regels:"
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr "Verwerken instellen"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6095
 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:6093
+#: src/summaryview.c:6097
 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:6094
+#: src/summaryview.c:6098
 msgid "Reset color label"
 msgstr "Kleurlabel herstellen"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Set color label"
 msgstr "Kleurlabel instellen"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr "Genegeerde draad"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr "Gevolgde draad"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Beantwoord maar ook doorgestuurd - klik om het antwoord te zien"
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr "Beantwoord - klik om het antwoord te zien"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr "Nog te verplaatsen"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr "Nog te kopiëren"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr "Ondertekend, heeft bijlage(s)"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr "Versleuteld, heeft bijlage(s)"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr "Versleuteld"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr "Heeft bijlage(s)"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19086,11 +19379,11 @@ msgstr ""
 "Reguliere expressie (regexp) fout:\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8402
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Ga terug in de mappenlijst (Je heeft ongelezen berichten)"
 
-#: src/summaryview.c:8403
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr "Ga terug naar de mappenlijst"
 
@@ -19842,7 +20135,7 @@ msgstr "IMAP-servermap:"
 
 #: src/wizard.c:1663
 msgid "Show only subscribed folders"
-msgstr "Alleen ge-abonneerde mappen weergeven"
+msgstr "Alleen geabonneerde mappen weergeven"
 
 #: src/wizard.c:1671
 msgid ""
@@ -19905,3 +20198,57 @@ msgid ""
 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 ea7ff2a6e..9247f343f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,11 +1,12 @@
 # Polish translation of Claws Mail.
-# Copyright Š 2003-2014 The Claws Mail team.
+# Copyright (c) 2003-2021 The Claws Mail team.
 # 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>
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.9.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2020-07-12 18:00+0200\n"
-"PO-Revision-Date: 2020-07-12 18:19+0200\n"
-"Last-Translator: Franciszek Janowski <nobange at poczta.onet.pl>\n"
+"POT-Creation-Date: 2021-07-03 09:16+0100\n"
+"PO-Revision-Date: 2021-07-06 09:35+0200\n"
+"Last-Translator: Jakub T. Jankiewicz <jcubic at onet.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -67,48 +68,48 @@ msgstr "Konta zawierające zdalne katalogi nie mogą być skopiowane"
 msgid "Copy of %s"
 msgstr "Kopia %s"
 
-#: src/account.c:1119
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto '%s'?"
 
-#: src/account.c:1121
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr "(Bez tytułu)"
 
-#: src/account.c:1122
+#: src/account.c:1129
 msgid "Delete account"
 msgstr "Usuń konto"
 
-#: src/account.c:1596
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "P"
 
-#: src/account.c:1602
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Pobierz z wszystkich kont' odbierze pocztę z zaznaczonych kont"
 
-#: src/account.c:1609 src/addrduplicates.c:472 src/addressadd.c:223
-#: src/addressbook.c:128 src/compose.c:7488 src/editaddress.c:1474
+#: src/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
 #: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: 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
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr "Protokół"
 
-#: src/account.c:1625 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Serwer"
 
@@ -159,7 +160,8 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5277 src/compose.c:5282 src/ldaputil.c:333
+#: 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/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -231,7 +233,7 @@ msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 "Nie można przenieść katalogu do samego siebie lub do jego pod struktury."
 
-#: src/addr_compl.c:689 src/addressbook.c:5018
+#: src/addr_compl.c:699 src/addressbook.c:5009
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Grupa"
@@ -304,8 +306,8 @@ msgstr ""
 "Czy naprawdę chcesz zastąpić wszystkie nazwy\n"
 "cech wartościami domyślnymi?"
 
-#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
-#: src/addressbook.c:484 src/edittags.c:286
+#: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:462
+#: src/addressbook.c:479 src/edittags.c:286
 #: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
 #: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "_Delete"
@@ -377,11 +379,11 @@ msgstr "Adres"
 msgid "Address book path"
 msgstr "Ścieżka do książki adresowej"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1445 src/addressbook.c:1498
+#: src/addrduplicates.c:791 src/addressbook.c:1436 src/addressbook.c:1489
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1499
+#: src/addrduplicates.c:792 src/addressbook.c:1490
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć adres(y)?"
 
@@ -389,7 +391,7 @@ msgstr "Czy naprawdę chcesz usunąć adres(y)?"
 msgid "Delete address"
 msgstr "Usuń adresy"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1446
+#: src/addrduplicates.c:842 src/addressbook.c:1437
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Te dane adresowe są tylko do odczytu i nie mogą być usuwane."
 
@@ -410,7 +412,7 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog z książką adresową"
 
-#: src/addressadd.c:599 src/addressbook.c:3268 src/addressbook.c:3319
+#: src/addressadd.c:599 src/addressbook.c:3259 src/addressbook.c:3310
 msgid "Add address(es)"
 msgstr "Dodaj adres(y)"
 
@@ -418,7 +420,7 @@ msgstr "Dodaj adres(y)"
 msgid "Can't add the specified address"
 msgstr "Wybrany adres nie może być dodany"
 
-#: src/addressbook.c:129 src/addressbook.c:5006 src/editaddress.c:1247
+#: 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
 msgid "Email Address"
@@ -428,136 +430,126 @@ msgstr "Adres e-mail"
 msgid "_Book"
 msgstr "_Książka"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:614 src/mainwindow.c:523
+#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
+#: src/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: src/addressbook.c:407 src/compose.c:619 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Narzędzia"
 
-#: src/addressbook.c:408 src/compose.c:620 src/mainwindow.c:528
-#: src/messageview.c:216
-msgid "_Help"
-msgstr "Pomo_c"
-
-#: src/addressbook.c:411 src/addressbook.c:469
+#: src/addressbook.c:410 src/addressbook.c:464
 msgid "New _Book"
 msgstr "Nowa _książka"
 
-#: src/addressbook.c:412 src/addressbook.c:470
+#: src/addressbook.c:411 src/addressbook.c:465
 msgid "New _Folder"
 msgstr "Nowy _Folder"
 
-#: src/addressbook.c:413
+#: src/addressbook.c:412
 msgid "New _vCard"
 msgstr "Nowa _wizytówka"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:416
 msgid "New _JPilot"
 msgstr "Nowy _JPilot"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:419
 msgid "New LDAP _Server"
 msgstr "Nowy serwer LDAP"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:423
 msgid "_Edit book"
 msgstr "_Edytuj książkę"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:424
 msgid "_Delete book"
 msgstr "_Usuń książkę"
 
-#: src/addressbook.c:427 src/compose.c:631
+#: src/addressbook.c:426 src/compose.c:632
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "Z_apisz..."
 
-#: src/addressbook.c:428 src/compose.c:635 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "Zamknij"
 
-#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
+#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
 msgid "_Select all"
 msgstr "W_ybierz wszystko"
 
-#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
+#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
 msgid "C_ut"
 msgstr "Wy_tnij"
 
-#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:643 src/mainwindow.c:557 src/messageview.c:228
+#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
+#: src/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopiuj"
 
-#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
-#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Wstaw"
 
-#: src/addressbook.c:440 src/addressbook.c:486
+#: src/addressbook.c:439 src/addressbook.c:481
 msgid "New _Address"
 msgstr "Nowy _adres"
 
-#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
+#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
 msgid "New _Group"
 msgstr "Nowa _grupa"
 
-#: src/addressbook.c:443 src/addressbook.c:493
+#: src/addressbook.c:442 src/addressbook.c:488
 msgid "_Mail To"
 msgstr "_Wyślij wiadomość do"
 
-#: src/addressbook.c:444 src/addressbook.c:497
+#: src/addressbook.c:443 src/addressbook.c:492
 msgid "_Merge"
 msgstr "Połącz"
 
-#: src/addressbook.c:448
+#: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr "Importuj plik _LDIF..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Import M_utt file..."
 msgstr "Importuj plik _Mutta..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Import _Pine file..."
 msgstr "Importuj plik _Pine..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:451
 msgid "Export _HTML..."
 msgstr "Wyeksportuj do _HTML..."
 
-#: src/addressbook.c:453
+#: src/addressbook.c:452
 msgid "Export LDI_F..."
 msgstr "Wyeksportuj do LDI_F..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:454
 msgid "Find duplicates..."
 msgstr "Znajdź duplikaty..."
 
-#: src/addressbook.c:456
+#: src/addressbook.c:455
 msgid "Edit custom attributes..."
 msgstr "Edycja atrybutów użytkownika..."
 
-#: src/addressbook.c:459 src/compose.c:721 src/mainwindow.c:825
-#: src/messageview.c:340
-msgid "_About"
-msgstr "Informacje o"
-
-#: src/addressbook.c:495
+#: src/addressbook.c:490
 msgid "_Browse Entry"
 msgstr "_Przeglądanie wpisu"
 
-#: src/addressbook.c:509 src/crash.c:457 src/crash.c:476 src/importldif.c:114
+#: 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
@@ -565,120 +557,120 @@ msgstr "_Przeglądanie wpisu"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
 msgid "Success"
 msgstr "Sukces"
 
-#: src/addressbook.c:517 src/importldif.c:122
+#: src/addressbook.c:512 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Złe argumenty"
 
-#: src/addressbook.c:518 src/importldif.c:123
+#: src/addressbook.c:513 src/importldif.c:123
 msgid "File not specified"
 msgstr "Nie określono pliku"
 
-#: src/addressbook.c:519 src/importldif.c:124
+#: src/addressbook.c:514 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Błąd podczas otwierania pliku"
 
-#: src/addressbook.c:520 src/importldif.c:125
+#: src/addressbook.c:515 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Błąd podczas czytania pliku"
 
-#: src/addressbook.c:521 src/importldif.c:126
+#: src/addressbook.c:516 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Napotkano koniec pliku"
 
-#: src/addressbook.c:522 src/importldif.c:127
+#: src/addressbook.c:517 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Błąd alokacji pamięci"
 
-#: src/addressbook.c:523 src/importldif.c:128
+#: src/addressbook.c:518 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Format pliku nieprawidłowy"
 
-#: src/addressbook.c:524 src/importldif.c:129
+#: src/addressbook.c:519 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Błąd zapisu pliku"
 
-#: src/addressbook.c:525 src/importldif.c:130
+#: src/addressbook.c:520 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Błąd podczas otwierania katalogu"
 
-#: src/addressbook.c:526 src/importldif.c:131
+#: src/addressbook.c:521 src/importldif.c:131
 msgid "No path specified"
 msgstr "Nie określono ścieżki"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error connecting to LDAP server"
 msgstr "Błąd przy próbie połączenia z serwerem LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "Error initializing LDAP"
 msgstr "Błąd podczas inicjalizacji LDAP"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "Error binding to LDAP server"
 msgstr "Błąd podczas podłączania adresu serwera LDAP"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error searching LDAP database"
 msgstr "Błąd podczas wyszukiwania w bazie LDAP"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Timeout performing LDAP operation"
 msgstr "Przekroczono limit czasu podczas wykonywania operacji LDAP"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Error in LDAP search criteria"
 msgstr "Błąd w kryteriach wyszukiwania LDAP"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "No LDAP entries found for search criteria"
 msgstr "Nie znaleziono wpisów LDAP powiązanych z kryterium wyszukiwania"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "LDAP search terminated on request"
 msgstr "przeszukiwanie LDAP zostało przerwane na żądanie"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:539
 msgid "Error starting STARTTLS connection"
 msgstr "Błąd podczas nawiązywania połączenia STARTTLS"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:540
 msgid "Distinguished Name (dn) is missing"
 msgstr "Brak unikatowej nazwy (dn)"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:541
 msgid "Missing required information"
 msgstr "Brak wymaganych informacji"
 
-#: src/addressbook.c:547
+#: src/addressbook.c:542
 msgid "Another contact exists with that key"
 msgstr "Istnieje już kontakt o takim kluczu"
 
-#: src/addressbook.c:548
+#: src/addressbook.c:543
 msgid "Strong(er) authentication required"
 msgstr "Wymagana jest bezpieczniejsza metoda autoryzacji"
 
-#: src/addressbook.c:916
+#: src/addressbook.c:911
 msgid "Sources"
 msgstr "Źródła"
 
-#: src/addressbook.c:920 src/prefs_matcher.c:643 src/prefs_other.c:493
+#: src/addressbook.c:915 src/prefs_matcher.c:643 src/prefs_other.c:493
 #: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:1118 src/editldap.c:794
+#: src/addressbook.c:1109 src/editldap.c:794
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1481
 msgid "Delete group"
 msgstr "Usuń grupę"
 
-#: src/addressbook.c:1491
+#: src/addressbook.c:1482
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -686,26 +678,26 @@ msgstr ""
 "Czy chcesz usunąć grupę(y)?\n"
 "Wszystkie znajdujące się tam adresy zostaną usunięte."
 
-#: src/addressbook.c:2218
+#: src/addressbook.c:2209
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Nie można wkleić. Docelowa książka adresowa jest tylko do odczytu."
 
-#: src/addressbook.c:2228
+#: src/addressbook.c:2219
 msgid "Cannot paste into an address group."
 msgstr "Nie można wkleić do grupy adresowej."
 
-#: src/addressbook.c:2965
+#: src/addressbook.c:2956
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Czy chcesz usunąć wyniki zapytania i adresy w `%s'?"
 
-#: src/addressbook.c:2968 src/addressbook.c:2994 src/addressbook.c:3001
+#: 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
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:2968
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -714,20 +706,20 @@ msgstr ""
 "Czy chcesz usunąć '%s'? Jeżeli usuniesz tylko katalog, adresy w nim zawarte "
 "zostaną przeniesione do katalogu nadrzędnego."
 
-#: src/addressbook.c:2980 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: 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
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2972
 msgid "Delete _folder only"
 msgstr "Usuń tylko _katalog"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2972
 msgid "Delete folder and _addresses"
 msgstr "Usuń katalog i _adresy"
 
-#: src/addressbook.c:2992
+#: src/addressbook.c:2983
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -736,7 +728,7 @@ msgstr ""
 "Czy chcesz usunąć '%s'?\n"
 "Wszystkie znajdujące się tam adresy zostaną usunięte."
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:2990
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -745,28 +737,28 @@ msgstr ""
 "Czy chcesz usunąć '%s'?\n"
 "Wszystkie znajdujące się tam adresy zostaną usunięte."
 
-#: src/addressbook.c:3113
+#: src/addressbook.c:3104
 #, c-format
 msgid "Search '%s'"
 msgstr "Szukaj '%s'"
 
-#: src/addressbook.c:3251 src/addressbook.c:3300
+#: src/addressbook.c:3242 src/addressbook.c:3291
 msgid "New Contacts"
 msgstr "Nowe kontakty"
 
-#: src/addressbook.c:4137
+#: src/addressbook.c:4128
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksowego."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4132
 msgid "New user, could not save address book files."
 msgstr "Nowy użytkownik, nie można było zapisać plików książki adresowej."
 
-#: src/addressbook.c:4151
+#: src/addressbook.c:4142
 msgid "Old address book converted successfully."
 msgstr "Dawna książka adresowa została pomyślnie skonwertowana."
 
-#: src/addressbook.c:4156
+#: src/addressbook.c:4147
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -774,7 +766,7 @@ msgstr ""
 "Stara książka adresowa skonwertowana,\n"
 "jednak nie powiódł się zapis nowego pliku indeksowego"
 
-#: src/addressbook.c:4169
+#: src/addressbook.c:4160
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -782,7 +774,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "lecz utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:4175
+#: src/addressbook.c:4166
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -790,7 +782,7 @@ msgstr ""
 "Nie można skonwertować książki adresowej,\n"
 "nie można zapisać nowego pliku indeksowego adresu."
 
-#: src/addressbook.c:4180
+#: src/addressbook.c:4171
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -798,52 +790,52 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "oraz nie można było utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:4187 src/addressbook.c:4193
+#: src/addressbook.c:4178 src/addressbook.c:4184
 msgid "Addressbook conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:4308
+#: src/addressbook.c:4299
 msgid "Addressbook Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:4309
+#: src/addressbook.c:4300
 msgid "Could not read address index"
 msgstr "Nie można było otworzyć indeksu adresów"
 
-#: src/addressbook.c:4640
+#: src/addressbook.c:4631
 msgid "Busy searching..."
 msgstr "Zajęty przeszukiwaniem..."
 
-#: src/addressbook.c:4970 src/prefs_send.c:220
+#: src/addressbook.c:4961 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:4982
+#: src/addressbook.c:4973
 msgid "Address Books"
 msgstr "Książki Adresowe"
 
-#: src/addressbook.c:4994
+#: src/addressbook.c:4985
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:5030 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3149 src/prefs_folder_column.c:77
+#: 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
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:5042
+#: src/addressbook.c:5033
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5054 src/addressbook.c:5066
+#: src/addressbook.c:5045 src/addressbook.c:5057
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5078
+#: src/addressbook.c:5069
 msgid "LDAP servers"
 msgstr "Serwery LDAP"
 
-#: src/addressbook.c:5090
+#: src/addressbook.c:5081
 msgid "LDAP Query"
 msgstr "Zapytanie LDAP"
 
@@ -953,18 +945,18 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Aktualizacja nie powiodła się. Zmiany nie zostały zapisane do Katalogu."
 
-#: src/alertpanel.c:144 src/compose.c:9810
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr "Notatka"
 
-#: 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/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:5091
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5808 src/inc.c:726
+#: 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
 msgid "Error"
 msgstr "Błąd"
@@ -1084,36 +1076,36 @@ 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:1233
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "Błąd nawiązywania połączenia SSL/TLS\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "Metoda SMTP AUTH nie jest dostępna\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Wybrana metoda SMTP AUTH nie jest dostępna\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "zła odpowiedź SMTP\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "wystąpił błąd podczas sesji SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "wystąpił błąd podczas uwierzytelniania\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Wiadomość jest zbyt duża (Maksymalny rozmiar to %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "nie można nawiązać sesji STARTTLS\n"
 
@@ -1250,217 +1242,217 @@ msgstr "%d,%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4028
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: src/common/utils.c:4029
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: src/common/utils.c:4030
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: src/common/utils.c:4031
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Środa"
 
-#: src/common/utils.c:4032
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: src/common/utils.c:4033
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Piątek"
 
-#: src/common/utils.c:4034
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4036
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Styczeń"
 
-#: src/common/utils.c:4037
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Luty"
 
-#: src/common/utils.c:4038
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marzec"
 
-#: src/common/utils.c:4039
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Kwiecień"
 
-#: src/common/utils.c:4040
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maj"
 
-#: src/common/utils.c:4041
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Czerwiec"
 
-#: src/common/utils.c:4042
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Lipiec"
 
-#: src/common/utils.c:4043
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Sierpień"
 
-#: src/common/utils.c:4044
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Wrzesień"
 
-#: src/common/utils.c:4045
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Październik"
 
-#: src/common/utils.c:4046
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Listopad"
 
-#: src/common/utils.c:4047
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Grudzień"
 
-#: src/common/utils.c:4049
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Nie"
 
-#: src/common/utils.c:4050
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Pon"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Wt"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Śr"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Czw"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Pią"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sob"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Sty"
 
-#: src/common/utils.c:4058
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Lut"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Kwi"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Maj"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Cze"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Lip"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Sie"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Wrz"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Paź"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Lis"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Gru"
 
-#: src/common/utils.c:4079
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "Rano"
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "Po południu"
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "rano"
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "po południu"
 
-#: src/compose.c:195
+#: src/compose.c:198
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1472,418 +1464,426 @@ msgstr ""
 "\n"
 "Podpisanie oraz szyfrowanie zostało wyłączone dla tej wiadomości"
 
-#: src/compose.c:603
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "Dod_aj..."
 
-#: src/compose.c:604 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: src/compose.c:606 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Właściwości..."
 
-#: src/compose.c:613 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "_Wiadomość"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "Pi_sownia"
 
-#: src/compose.c:618 src/compose.c:685
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Opcje"
 
-#: src/compose.c:622
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
+msgid "_Help"
+msgstr "Pomo_c"
+
+#: src/compose.c:623
 msgid "S_end"
 msgstr "Wyślij"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "Wyślij później"
 
-#: src/compose.c:626
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "Dołącz plik"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "Wstaw plik"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Wstaw podpis"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "Zmień podpis"
 
-#: src/compose.c:633
+#: src/compose.c:634
 msgid "_Print"
 msgstr "Drukuj"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Cofnij"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "P_onów"
 
-#: src/compose.c:642 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Wy_tnij"
 
-#: src/compose.c:646
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "Wklej specjalnie"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Jako _cytat"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "_Zawinięty tekst"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "_bez zawijania"
 
-#: src/compose.c:651 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "W_ybierz wszystko"
 
-#: src/compose.c:653
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "Zaawansowane"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Przesuń o znak w tył"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Przesuń o znak w przód"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Przesuń o słowo w tył"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Przesuń o słowo w przód"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Przesuń do początku linii"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Przesuń do końca linii"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Przesuń do poprzedniej linii"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Przesuń do następnej linii"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Wykasuj znak za kursorem"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Wykasuj znak przed kursorem"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Wykasuj słowo za kursorem"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Wykasuj słowo przed kursorem"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Usuń linię"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Wykasuj do końca linii"
 
-#: src/compose.c:670 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Szukaj"
 
-#: src/compose.c:673
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "Za_wiń obecny akapit"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:676
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/compose.c:679
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "Sprawdź wszystko albo zazna_czone"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "P_odkreśl wszystkie błędnie napisane słowa"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "Szukaj od tyłu błędnie napisanych słów"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "_Przeskocz w przód do kolejnego błędnie napisanego słowa"
 
-#: src/compose.c:689
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "Tryb odpowiadania"
 
-#: src/compose.c:691
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "Ochrona prywatności"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "Pri_orytet"
 
-#: src/compose.c:697 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "_Kodowanie znaków"
 
-#: src/compose.c:702 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Europa Zachodnia"
 
-#: src/compose.c:703 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Bałtyckie"
 
-#: src/compose.c:704 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebrajskie"
 
-#: src/compose.c:705 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arabskie"
 
-#: src/compose.c:706 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: src/compose.c:707 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonia"
 
-#: src/compose.c:708 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Chińskie"
 
-#: src/compose.c:709 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Koreańskie"
 
-#: src/compose.c:710 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Tajskie"
 
-#: src/compose.c:713 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "Książka _adresowa"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "_Template"
 msgstr "Wzorce"
 
-#: src/compose.c:717 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "Akcje"
 
-#: src/compose.c:726
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
+msgid "_About"
+msgstr "Informacje o"
+
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Automatyczne zawijanie"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Automatyczne wcięcia"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "Podpisz"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "_Szyfruj"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "Żądaj potwierdzenia dostarczenia"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "Usuń odniesienia"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "Pokaż li_nijkę"
 
-#: src/compose.c:737 src/compose.c:747
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "Z_wykły"
 
-#: src/compose.c:738 src/mainwindow.c:674 src/messageview.c:305
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
 #: src/summaryview.c:433
 msgid "_All"
 msgstr "W_szystkie"
 
-#: src/compose.c:739 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_Sender"
 msgstr "Nadawca"
 
-#: src/compose.c:740
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "Lista dyskusyjna"
 
-#: src/compose.c:745
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "Najwyższy"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "Wysoki"
 
-#: src/compose.c:748
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "Niski"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "Najniższy"
 
-#: src/compose.c:754 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "Automatycznie"
 
-#: src/compose.c:755 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bitów ASCII (US-ASCII)"
 
-#: src/compose.c:756 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/compose.c:760 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europa Środkowa (ISO-8859-2)"
 
-#: src/compose.c:763 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grecja (ISO-8859-7)"
 
-#: src/compose.c:768 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turcja (ISO-8859-9)"
 
-#: src/compose.c:1055
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr "Błędny format nadawcy wiadomości."
 
-#: src/compose.c:1148
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr "Błędny format tematu wiadomości."
 
-#: src/compose.c:1180 src/quote_fmt.c:563
+#: src/compose.c:1181 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Błąd w treści wiadomości w linii %d."
 
-#: src/compose.c:1449
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Nie można odpowiedzieć. Oryginalny email prawdopodobnie nie istnieje. "
 
-#: src/compose.c:1634 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "Pole \"Od\" wzorca \"Odpowiedz\" zawiera nieprawidłowy adres email."
 
-#: src/compose.c:1683 src/quote_fmt.c:583
+#: src/compose.c:1684 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Błąd formatu wzorca (treść wiadomości).w linii %d."
 
-#: src/compose.c:1824 src/compose.c:2025 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Pole \"Od\" wzorca \"Przekaż\" zawiera nieprawidłowy adres email."
 
-#: src/compose.c:1885 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Błąd formatu wzorca (treść wiadomości).w linii %d."
 
-#: src/compose.c:2068
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
 msgstr "Fw: kilka wiadomości email"
 
-#: src/compose.c:2577
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Błąd w formacie wiadomości przekierowującej w linii %d."
 
-#: src/compose.c:2648 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/compose.c:2651 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
-#: src/compose.c:2654 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpowiedz-Do:"
 
-#: src/compose.c:2657 src/compose.c:5026 src/compose.c:5028
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grupy news:"
 
-#: src/compose.c:2660 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Odpowiedzi-Do(FUT):"
 
-#: src/compose.c:2663 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "W odpowiedzi na:"
 
-#: src/compose.c:2667 src/compose.c:5023 src/compose.c:5031
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Do:"
 
-#: src/compose.c:2857
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nie można dołączyć pliku (konwersja strony kodowej nie powiodła się)."
 
-#: src/compose.c:2863
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1901,16 +1901,16 @@ msgstr[2] ""
 "Następujące pliki zostały dołączone:\n"
 "%s"
 
-#: src/compose.c:3143
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Znacznik cytatu\" wzorca jest nieprawidłowy."
 
-#: src/compose.c:3672
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nie można pobrać rozmiaru pliku '%s'."
 
-#: src/compose.c:3690
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1919,57 +1919,57 @@ msgstr ""
 "Zamierzasz wstawić plik z %s do treści wiadomości. Na pewno chcesz "
 "kontynuować?"
 
-#: src/compose.c:3693
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr "Czy jesteś pewny?"
 
-#: src/compose.c:3694 src/compose.c:10859 src/compose.c:11753
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr "Ws_taw"
 
-#: src/compose.c:3819
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:3820
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr "Pusty plik"
 
-#: src/compose.c:3821
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr "Dołącz mimo wszystko"
 
-#: src/compose.c:3830
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr "nie można otworzyć %s"
 
-#: src/compose.c:3857
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:4867 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Edytowany]"
 
-#: src/compose.c:4874 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Tworzenie wiadomości %s"
 
-#: src/compose.c:4877 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[brak tematu] - Tworzenie wiadomości %s"
 
-#: src/compose.c:4879 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Napisz nową wiadomość"
 
-#: src/compose.c:4906 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1977,60 +1977,59 @@ msgstr ""
 "Nie podano konta, z którego wysyłasz pocztę.\n"
 "Wybierz konto przed wysłaniem."
 
-#: src/compose.c:5123 src/compose.c:5160
+#: src/compose.c:5126 src/compose.c:5163
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "Jedynym odbiorą jest domyślny adres '%s'. Wysłać mimo to?"
 
-#: src/compose.c: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: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
 msgid "Send"
 msgstr "Wyślij"
 
-#: 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/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
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: src/compose.c:5181
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:5196
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Temat wiadomości jest pusty. %s"
 
-#: src/compose.c:5197 src/compose.c:5240
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Czy mimo to chcesz wysłać tą wiadomość ?"
 
-#: src/compose.c:5198 src/compose.c:5241
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Czy mimo to chcesz dodać tę wiadomość do kolejki ?"
 
-#: src/compose.c:5200 src/compose.c:5243 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/compose.c:5201 src/compose.c:5244
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr "Kolejka"
 
-#: src/compose.c:5239
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Wysyłanie do %d odbiorców. %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5271
 msgid "Could not queue message."
-msgstr ""
-"Nie można zakolejkować do wysłania wiadomości."
+msgstr "Nie można zakolejkować do wysłania wiadomości."
 
-#: src/compose.c:5271
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2040,7 +2039,7 @@ msgstr ""
 "Nie można zakolejkować do wysłania wiadomości:\n"
 "%s."
 
-#: src/compose.c:5275
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2051,7 +2050,7 @@ msgstr ""
 "\n"
 "Błąd sygnatury %s"
 
-#: src/compose.c:5280
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2062,7 +2061,7 @@ msgstr ""
 "\n"
 "Błąd szyfrowania: %s"
 
-#: src/compose.c:5285
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2072,7 +2071,7 @@ msgstr ""
 "\n"
 "Konwersja strony kodowej nie powiodła się."
 
-#: src/compose.c:5289
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2082,7 +2081,7 @@ msgstr ""
 "\n"
 "Nie odnaleziono klucza szyfrującego odbiorcy."
 
-#: src/compose.c:5352 src/compose.c:5412
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2090,7 +2089,7 @@ msgstr ""
 "Wiadomość została zakolejkowana, ale nie mogła zostać wysłana\n"
 "Użyj \"Wyślij zakolejkowane wiadomości\" z głównego okna by ponowić."
 
-#: src/compose.c:5408
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
@@ -2101,7 +2100,7 @@ msgstr ""
 "Użyj \"Wyślij zakolejkowane wiadomości\" z głównego okna by spróbować "
 "ponownie."
 
-#: src/compose.c:5805
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2112,7 +2111,7 @@ msgstr ""
 "do do wybranej %s .\n"
 "Wysłać jako %s ?"
 
-#: src/compose.c:5867
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2125,99 +2124,99 @@ msgstr ""
 "\n"
 "Na pewno chcesz ją wysłać ? "
 
-#: src/compose.c:6102
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr "Ostrzeżenie dotyczące szyfrowania"
 
-#: src/compose.c:6103
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr "Kon_tynuuj"
 
-#: src/compose.c:6152
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr "Brak konta do wysyłania poczty!"
 
-#: src/compose.c:6161
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Wybrane konto nie jest kontem NNTP: Wysłanie wiadomości niemożliwe."
 
-#: src/compose.c:6415
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Załącznik %s już nie istnieje. Zignorować?"
 
-#: src/compose.c:6417 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Przerwij wysyłanie"
 
-#: src/compose.c:6417
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr "Ignoruj załącznik"
 
-#: src/compose.c:6473
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr "Oryginalna cześć %s"
 
-#: src/compose.c:7073
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/compose.c:7240
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr "Usuń zawartość wpisu"
 
-#: src/compose.c:7244 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Klawisz <tab> umożliwia automatyczne uzupełnianie nazwami z książki adresowej"
 
-#: src/compose.c:7476
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr "Typ MIME"
 
-#: src/compose.c:7482 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: 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
 msgid "Size"
 msgstr "Wielkość"
 
-#: src/compose.c:7544
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr "Zapisz wiadomość do "
 
-#: src/compose.c:7575 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:434
+#: src/plugins/spamassassin/spamassassin_gtk.c:437
 msgid "_Browse"
 msgstr "_Przeglądaj"
 
-#: src/compose.c:7591
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr "Wybierz katalog do zapisu wiadomości"
 
-#: src/compose.c:8048
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Na_główek"
 
-#: src/compose.c:8053
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "Z_ałączniki"
 
-#: src/compose.c:8067
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "In_ne"
 
-#: src/compose.c:8082
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "Temat:"
 
-#: src/compose.c:8306
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2226,19 +2225,19 @@ msgstr ""
 "Nie udało się uruchomić sprawdzania pisowni.\n"
 "%s"
 
-#: src/compose.c:8453
+#: src/compose.c:8456
 msgid "_From:"
 msgstr "Od:"
 
-#: src/compose.c:8470
+#: src/compose.c:8473
 msgid "Account to use for this email"
 msgstr "Bieżące konto dla tej wiadomości"
 
-#: src/compose.c:8472
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr "Adres nadawcy"
 
-#: src/compose.c:8654
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2247,73 +2246,98 @@ msgstr ""
 "System ochrony prywatności '%s' nie może zostać załadowany. Nie będzie można "
 "ani podpisać ani zaszyfrować tej wiadomości. "
 
-#: src/compose.c:8765 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "Brak"
 
-#: src/compose.c:8866 src/prefs_template.c:752
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Błąd formatu wzorca (treść wiadomości).w linii %d."
 
-#: src/compose.c:8963
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Błąd formatu szablonu '%s'."
 
-#: src/compose.c:9387
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:9402
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:9476
+#: src/compose.c:9479
 msgid "Properties"
 msgstr "Właściwości..."
 
-#: src/compose.c:9494
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/compose.c:9527
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:9547
+#: src/compose.c:9550
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:9548
+#: src/compose.c:9551
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:9807
+#: src/compose.c:9646
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"Nie można zapisać treści do pliku\n"
+"%s"
+
+#: src/compose.c:9704
+#, c-format
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Nie można utworzyć procesu potomnego dla polecenia:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9743
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr "Zewnętrzy edytor zatrzymał się z błędem:%s"
+
+#: src/compose.c:9817
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
 "Zewnętrzny edytor wciąż pracuje.\n"
 "Zakończyć proces siłowo?\n"
-"identyfikator grupy procesów: %d"
+"identyfikator procesu: %d"
 
-#: src/compose.c:10280 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 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:10473
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr "Nie można zapisać kopii roboczej."
 
-#: src/compose.c:10477
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr "Nie można zapisać kopii roboczej"
 
-#: src/compose.c:10478
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2321,24 +2345,24 @@ msgstr ""
 "Nie można zapisać kopii roboczej\n"
 "Co chcesz zrobić z tą wiadomością ?"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr "_Anuluj i wyjdź"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr "Porzuć"
 
-#: src/compose.c:10669 src/compose.c:10683
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:10697
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Nie można odczytać pliku \"%s\"."
 
-#: src/compose.c:10699
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2347,50 +2371,50 @@ msgstr ""
 "Plik \"%s\" zawiera nieprawidłowe znaki\n"
 "dla bieżącego kodowania, wstawianie może być niepoprawne."
 
-#: src/compose.c:10778
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr "Porzuć wiadomość"
 
-#: src/compose.c:10779
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr "Ta wiadomość została zmieniona, porzucić?"
 
-#: src/compose.c:10780 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "Por_zuć"
 
-#: src/compose.c:10780 src/compose.c:10785
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr "Zapisz w katalogu _kopii roboczych"
 
-#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Zapisz zmiany"
 
-#: src/compose.c:10784
+#: src/compose.c:10734
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Ta wiadomość została zmieniona. Czy chcesz zapisać ostatnie zmiany?"
 
-#: src/compose.c:10785
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr "_Nie zapisuj"
 
-#: src/compose.c:10856
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Czy chcesz dołączyć szablon '%s'?"
 
-#: src/compose.c:10858
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr "Dołącz szablon"
 
-#: src/compose.c:10859 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
 #: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "Za_mień"
 
-#: src/compose.c:11746
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2405,20 +2429,20 @@ msgstr[1] ""
 msgstr[2] ""
 "Czy chesz wstawić treść %d plików do wiadomości czy dodać je jako załączniki?"
 
-#: src/compose.c:11752
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr "Wstawić czy załączyć?"
 
-#: src/compose.c:11753
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr "Z_ałącz"
 
-#: src/compose.c:11971
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Błąd formatu cytowania.w linii %d."
 
-#: src/compose.c:12267
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2637,7 +2661,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:2158
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Plik"
@@ -2721,13 +2745,13 @@ msgstr "Dodaj nowy wpis JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Edytuj LDAP - Wybierz podstawowe reguły wyszukiwania"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Nazwa hosta"
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2789,7 +2813,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2957,8 +2981,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:1405 src/prefs_account.c:2003
-#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
+#: 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
 msgid "Show password"
 msgstr "Pokaż hasło:"
@@ -2980,11 +3004,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Maksymalna liczba wyników zwrócona podczas wyszukiwania."
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr "Podstawowe"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "Rozszerzone"
 
@@ -3126,8 +3150,8 @@ msgstr "Wzór stylów"
 #: 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:313 src/prefs_account.c:1040
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
+#: 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
 msgid "None"
 msgstr "Brak"
 
@@ -3368,7 +3392,7 @@ msgstr "Eksportowanie książki adresowej do pliku LDIF"
 msgid "Distinguished Name"
 msgstr "Unikalna nazwa"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr "_Eksportuj do pliku mbox..."
 
@@ -3433,18 +3457,18 @@ msgstr "Nazwa jest za długa"
 msgid "Not specified."
 msgstr "Nie określono"
 
-#: 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 ""
 "Brakuje pliku %s! Czy chcesz użyć pliku pobranego z kopi bezpieczeństwa %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 "Nie można skopiować %s do %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 "
@@ -3552,51 +3576,51 @@ msgstr "akcja nie może zostać uruchomiona\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "brak dalszych procedur po akcji [ %s ]\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "Przetwarzam regułę '%s' [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "uruchamiam regułę <unnamed> [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "wyłączona reguła '%s' [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "wyłączona regułą <unnamed> [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "Niezdefiniowane"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "incorporation"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "ręcznie"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "przetwarzania katalogu"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "przetwarzanie wstępne"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "post-przetwarzanie"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3613,11 +3637,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3652,35 +3676,35 @@ msgstr "Kopie robocze"
 msgid "Processing (%s)...\n"
 msgstr "Przetwarzanie (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopiowanie %s do %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Przenoszenie %s do %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizacja pamięci podręcznej dla %s ..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "Przetwarzanie wiadomości..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizowanie %s do użytku w trybie offline...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Nazwa katalogu nie może się kończyć ani zaczynać kropką."
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "Nazwa katalogu nie może się kończyć ani zaczynać spacją."
 
@@ -3763,13 +3787,13 @@ msgstr "Ustaw Wyświetlane kolumny"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr "Nowe"
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Nieprzeczytane"
@@ -3788,7 +3812,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr "Zaznacz wszystkie jako przeczytane"
 
@@ -3800,13 +3824,13 @@ msgstr ""
 "Czy naprawdę chcesz zaznaczyć wszystkie wiadomości w tym katalogu i "
 "podkatalogach jako przeczytane?"
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:871 src/summaryview.c:4292
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Czy naprawdę chcesz zaznaczyć wszystkie wiadomości w tym katalogu jako "
 "przeczytane?"
 
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr "Zaznacz wszystkie jako nieprzeczytane"
 
@@ -3818,18 +3842,18 @@ msgstr ""
 "Czy naprawdę chcesz zaznaczyć wszystkie wiadomości w tym katalogu i "
 "podkatalogach jako nieprzeczytane?"
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:877 src/summaryview.c:4338
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 "Czy naprawdę chcesz zaznaczyć wszystkie wiadomości w tym katalogu jako "
 "nieprzeczytane?"
 
-#: src/folderview.c:1067 src/imap.c:4646
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Przeszukiwanie katalogu %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4650 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Przeszukiwanie katalogu %s..."
@@ -3888,7 +3912,7 @@ msgstr "Usunąć wszystkie wiadomości z kosza?"
 msgid "_Empty trash"
 msgstr "Opróżnij _kosz"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Ostrzeżenie o trybie offline"
 
@@ -3908,7 +3932,7 @@ msgstr "Wysłać wszystkie oczekujące wiadomości?"
 msgid "Some errors occurred while sending queued messages."
 msgstr "Błędy podczas wysyłania zakolejkowanych wiadomości."
 
-#: src/folderview.c:2557 src/main.c:2812 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3974,7 +3998,7 @@ msgstr "Przeniesienie nie powiodło się"
 msgid "Processing configuration for folder %s"
 msgstr "Przetwarzanie konfiguracji dla katalogu %s"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Katalog docelowy może przechowywać tylko podkatalogi."
 
@@ -4024,7 +4048,7 @@ msgstr "nieznana"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie udało się pobrać listy grup news."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr "Zrobiono."
 
@@ -4061,11 +4085,11 @@ msgstr ""
 
 #: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "Zespół Claws Mail\n"
 "oraz Hiroyuki Yamamoto"
 
@@ -4220,44 +4244,44 @@ msgstr ""
 "Powszechnej Licencji Publicznej GNU (GNU General Public License);jeśli nie, "
 "odwiedź "
 
-#: src/gtk/about.c:718 src/main.c:2636
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr "Statystyki sesji\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2646 src/main.c:2649
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr "Rozpoczęto: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2655
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr "Ruch przychodzący\n"
 
-#: src/gtk/about.c:741 src/main.c:2658
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Odebrane wiadomości: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2664
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr "Ruch wychodzący\n"
 
-#: src/gtk/about.c:751 src/main.c:2667
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nowe/przekierowane wiadomości: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2671
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpowiedzi: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2675
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Przekazane wiadomości: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2679
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Całkowita liczba wysłanych wiadomości: %d\n"
@@ -4468,20 +4492,20 @@ msgstr ""
 "Operacja zmiany słownika nie powiodła się.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1862
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "Niepowodzenie: brak rekordu usługi."
 
-#: src/gtk/gtkutils.c:1865
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "Niepowodzenie: błąd sieci."
 
-#: src/gtk/gtkutils.c:1868
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Niepowodzenie: nieznany błąd (%d)."
 
-#: src/gtk/gtkutils.c:1938
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "Konfiguracja..."
 
@@ -4725,7 +4749,7 @@ msgstr "User-Agent"
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
@@ -4753,7 +4777,7 @@ msgstr "Pierwszeństwo"
 msgid "Precedence:"
 msgstr "Pierwszeństwo:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "Organizacja"
 
@@ -5076,7 +5100,8 @@ msgstr ""
 #: 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:554
+#: src/plugins/libravatar/libravatar_prefs.c:563
+#: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
@@ -5089,7 +5114,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/spamassassin/spamassassin_gtk.c:673
 #: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "Wtyczki"
@@ -5129,14 +5154,14 @@ msgstr "Spis Stron"
 
 #: src/gtk/progressdialog.c:91 src/mainwindow.c:853
 msgid "_Hide"
-msgstr "Ukryj"
+msgstr "_Ukryj"
 
 #: 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: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
 msgid "Account"
 msgstr "Konto"
 
@@ -5365,54 +5390,54 @@ msgstr ""
 "\n"
 "W tym trybie wyszukiwania można używać następujących symboli:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Coś poszło nie tak podczas wyszukiwania. Proszę sprawdź logi."
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Od/Do/Temat/Etykieta"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Rekursywne"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "Przyklejony"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "Podpowiedź"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "Zastosuj tylko do zaznaczonych"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "Wyczyść aktualne zapytanie"
 
-#: 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 "Edytuj kryteria szukania"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr "Informacja o rozszerzonych symbolach"
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr "_Informacje"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr "E_dycja"
 
-#: 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:349
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
-msgstr "Wyczyść"
+msgstr "W_yczyść"
 
 #: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:301
 #, c-format
@@ -5585,215 +5610,215 @@ msgstr "(Brak nadawcy)"
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr "Błąd:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr "Wielkość pliku:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr "Ładuj obraz"
 
-#: src/imap.c:577
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr "Połączenie IMAP zostało zerwane\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: 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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Błąd IMAP dla %s:"
 
-#: src/imap.c:622
+#: src/imap.c:628
 msgid "authenticated"
 msgstr "uwierzytelnienie"
 
-#: src/imap.c:625
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "nie uwierzytelniono"
 
-#: src/imap.c:628
+#: src/imap.c:634
 msgid "bad state"
 msgstr "zły stan"
 
-#: src/imap.c:631
+#: src/imap.c:637
 msgid "stream error"
 msgstr "błąd strumienia"
 
-#: src/imap.c:634
+#: src/imap.c:640
 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:638
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "połączenie odrzucone."
 
-#: src/imap.c:641
+#: src/imap.c:647
 msgid "memory error"
 msgstr "błąd pamięci"
 
-#: src/imap.c:644
+#: src/imap.c:650
 msgid "fatal error"
 msgstr "błąd krytyczny"
 
-#: src/imap.c:647
+#: src/imap.c:653
 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:651
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr "połączenie nie zostało zaakceptowane"
 
-#: src/imap.c:654
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr "błąd przy wykonywaniu APPEND"
 
-#: src/imap.c:657
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr "błąd przy wykonywaniu NOOP"
 
-#: src/imap.c:660
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr "błąd przy wykonywaniu LOGOUT"
 
-#: src/imap.c:663
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr "błąd przy wykonywaniu CAPABILITY"
 
-#: src/imap.c:666
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr "błąd przy wykonywaniu CHECK"
 
-#: src/imap.c:669
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr "błąd przy wykonywaniu CLOSE"
 
-#: src/imap.c:672
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr "błąd przy wykonywaniu EXPUNGE"
 
-#: src/imap.c:675
+#: src/imap.c:681
 msgid "COPY error"
 msgstr "błąd przy wykonywaniu COPY"
 
-#: src/imap.c:678
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr "błąd przy wykonywaniu UID COPY"
 
-#: src/imap.c:681
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr "błąd przy wykonywaniu CREATE"
 
-#: src/imap.c:684
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr "błąd przy wykonywaniu DELETE"
 
-#: src/imap.c:687
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr "błąd przy wykonywaniu EXAMINE"
 
-#: src/imap.c:690
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr "błąd przy wykonywaniu FETCH"
 
-#: src/imap.c:693
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr "błąd przy wykonywaniu UID FETCH"
 
-#: src/imap.c:696
+#: src/imap.c:702
 msgid "LIST error"
 msgstr "błąd przy wykonywaniu LIST"
 
-#: src/imap.c:699
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr "błąd przy wykonywaniu LOGIN"
 
-#: src/imap.c:702
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr "błąd przy wykonywaniu LSUB"
 
-#: src/imap.c:705
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr "błąd przy wykonywaniu RENAME"
 
-#: src/imap.c:708
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr "błąd przy wykonywaniu SEARCH"
 
-#: src/imap.c:711
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr "błąd przy wykonywaniu UID SEARCH"
 
-#: src/imap.c:714
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr "błąd przy wykonywaniu SELECT"
 
-#: src/imap.c:717
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr "błąd przy wykonywaniu STATUS"
 
-#: src/imap.c:720
+#: src/imap.c:726
 msgid "STORE error"
 msgstr "błąd przy wykonywaniu STORE"
 
-#: src/imap.c:723
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr "błąd przy wykonywaniu UID STORE"
 
-#: src/imap.c:726
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr "błąd przy wykonywaniu SUBSCRIBE"
 
-#: src/imap.c:729
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr "błąd przy wykonywaniu UNSUBSCRIBE"
 
-#: src/imap.c:732
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr "błąd przy wykonywaniu STARTTLS"
 
-#: src/imap.c:735
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr "błąd przy wykonywaniu INVAL"
 
-#: src/imap.c:738
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr "błąd przy wykonywaniu EXTENSION"
 
-#: src/imap.c:741
+#: src/imap.c:747
 msgid "SASL error"
 msgstr "błąd przy wykonywaniu SASL"
 
-#: src/imap.c:745
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr "błąd SSL/TLS"
 
-#: src/imap.c:749
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Nieznany błąd [%d]"
 
-#: src/imap.c:955
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5805,7 +5830,7 @@ msgstr ""
 "Logowanie z użyciem CRAM-MD5 działa tylko jeżeli biblioteka libtepan została "
 "skompilowana ze wsparciem SASL i wtyczka CRAM-MD5 SASL jest zainstalowana."
 
-#: src/imap.c:961
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5817,7 +5842,7 @@ msgstr ""
 "Logowanie z użyciem CRAM-MD5 działa tylko jeżeli biblioteka libtepan została "
 "skompilowana z obsługą SASL i wtyczka CRAM-MD5 SASL jest zainstalowana."
 
-#: src/imap.c:967
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5830,7 +5855,7 @@ msgstr ""
 "została skompilowana ze wsparciem SASL i wtyczka SCRAM SASL jest "
 "zainstalowana."
 
-#: src/imap.c:973
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5842,7 +5867,7 @@ msgstr ""
 "Logowanie typu PLAIN działa tylko jeżeli biblioteka libtepan została "
 "skompilowana ze wsparciem SASL i wtyczka PLAIN SASL jest zainstalowana."
 
-#: src/imap.c:979
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5854,36 +5879,36 @@ msgstr ""
 "Logowanie z użyciem LOGIN działa tylko jeżeli biblioteka libtepan została "
 "skompilowana z obsługą SASL i wtyczka LOGIN SASL jest zainstalowana."
 
-#: src/imap.c:986
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Łączenie z %s zakończyło się niepowodzeniem: odmowa logowania.%s"
 
-#: src/imap.c:990
+#: src/imap.c:1003
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Łączenie z %s zakończyło się niepowodzeniem: odmowa logowania.%s\n"
 
-#: src/imap.c:1008
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Połączenie z %s zakończyło się niepowodzeniem"
 
-#: src/imap.c:1015 src/imap.c:1018
+#: src/imap.c:1028 src/imap.c:1031
 #, 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:1048 src/imap.c:3696 src/imap.c:4355 src/imap.c:4449
-#: src/imap.c:4627 src/imap.c:5438
+#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 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:1158 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Połączenie nie jest bezpieczne"
 
-#: src/imap.c:1159 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5897,108 +5922,108 @@ msgstr ""
 "Czy chcesz kontynuować łączenie do tego serwera? Połączenie nie będzie "
 "bezpieczne."
 
-#: src/imap.c:1165 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "Kon_tynuuj łączenie"
 
-#: src/imap.c:1174
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Konto '%s': Łączenie z serwerem IMAP: %s:%d..."
 
-#: src/imap.c:1239
+#: src/imap.c:1252
 #, 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:1242
+#: src/imap.c:1255
 #, 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:1274 src/imap.c:4117
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nie można nawiązać sesji STARTTLS.\n"
 
-#: src/imap.c:1343
+#: src/imap.c:1359
 #, 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:1346
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Łączenie z serwerem IMAP4: %s."
 
-#: src/imap.c:1774
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "Dodawanie wiadomości..."
 
-#: src/imap.c:1979 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopiowanie wiadomości..."
 
-#: src/imap.c:2505
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr "Wyszukanie nie powiodło się z powodu błędu serwera."
 
-#: src/imap.c:2589
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "nie można ustawić flagi skasowany\n"
 
-#: src/imap.c:2596 src/imap.c:5068
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "nie można zlikwidować\n"
 
-#: src/imap.c:2947
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Szukanie niesubskrybowanych katalogów w %s..."
 
-#: src/imap.c:2950
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Szukanie podkatalogów w %s ..."
 
-#: src/imap.c:3238
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
 
-#: src/imap.c:3251
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "nie można utworzyć skrzynki\n"
 
-#: src/imap.c:3382
+#: src/imap.c:3422
 #, 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:3495
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "nie można skasować skrzynki\n"
 
-#: src/imap.c:3774
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "Wykonanie komenda LIST nie powiodło się\n"
 
-#: src/imap.c:3859
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr "Filtrowanie wiadomości..."
 
-#: src/imap.c:3962
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie można wybrać katalogu: %s\n"
 
-#: src/imap.c:4114
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Serwer wymaga STARTTLS do zalogowania się.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr "Nie można odświeżyć właściwości.\n"
 
-#: src/imap.c:4129
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6007,20 +6032,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:4137
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr "Logowanie na serwer jest wyłączone.\n"
 
-#: src/imap.c:4360
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "Odbieranie wiadomości..."
 
-#: src/imap.c:5061
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nie można ustawić flagi skasowany: %d\n"
 
-#: src/imap.c:6096
+#: src/imap.c:6136
 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"
@@ -6418,32 +6443,32 @@ msgstr "Wybierz plik PINE."
 msgid "Import Pine file into Address Book"
 msgstr "Importuj plik PINE do Książki Adresowej"
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail potrzebuje dostępu do sieci aby pobrać wiadomości."
 
-#: src/inc.c:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "Wykonanie komenda %s nie powiodło się\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "Anuluj"
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6451,28 +6476,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:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "Wykonano (brak nowych wiadomości)"
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Błąd połączenia."
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Błąd autoryzacji"
 
-#: 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: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
 msgid "Locked"
 msgstr "Zablokowana"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:394
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr "Limit czasu (sekundy)"
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6480,66 +6505,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:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "Skończono (brak nowych wiadomości)"
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Konto '%s': Podłączanie do serwera POP3: %s:%d..."
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, 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:927
+#: src/inc.c:932
 #, 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:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Autoryzacja..."
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Pobieranie wiadomości z %s (%s)..."
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby wiadomości (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby wiadomości (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby wiadomości (UIDL)"
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie wielkości wiadomości (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6547,16 +6572,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:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Nie udało się nawiązać połączenia z %s:%d."
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6565,37 +6590,37 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Błąd gniazda podczas połączenia z %s:%d."
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zostało przerwane przez zdalny komputer"
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Połączenie z %s:%d zostało przerwane przez serwer."
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "Skrzynka zablokowana."
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6604,11 +6629,11 @@ msgstr ""
 "Skrzynka zablokowana:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "Uwierzytelnienie nie powiodło się."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6617,7 +6642,7 @@ msgstr ""
 "Uwierzytelnienie nie powiodło się:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6625,48 +6650,48 @@ msgstr ""
 "Upłynął limit czasu sesji zakończony. Możesz zwiększyć limit w Ustawienia/"
 "Inne/Różne."
 
-#: src/inc.c:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Upłynął limit czasu oczekiwania na połączenie z %s:%d."
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporacja została anulowana\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1766
+#: 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
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "godzina"
 msgstr[1] "godziny"
 msgstr[2] "godzin"
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sPracujesz w trybie offline. Zignorować na %d %s?"
 
-#: src/inc.c:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%s Pracujesz w trybie offline. Zignorować?"
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "Ty_lko raz"
 
@@ -6712,7 +6737,7 @@ msgstr ""
 "Plik `%s' już istnieje.\n"
 "Nie można utworzyć katalogu."
 
-#: src/main.c:375
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6721,7 +6746,7 @@ msgstr ""
 "Znaleziono konfigurację dla wersji %s.\n"
 "Czy chcesz przenieść tą konfigurację?"
 
-#: src/main.c:377
+#: src/main.c:382
 #, c-format
 msgid ""
 "\n"
@@ -6734,11 +6759,11 @@ msgstr ""
 "Twoje reguły filtrów mogą zostać przekonwertowane \n"
 "za pomocą skryptu dostępnego pod adresem %s."
 
-#: src/main.c:389
+#: src/main.c:394
 msgid "Keep old configuration"
 msgstr "Zachowaj starą konfigurację"
 
-#: src/main.c:392
+#: src/main.c:397
 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 +6773,31 @@ msgstr ""
 "może chwile potrwać jeśli dużo danych IMAP lub News i zajmie trochu "
 "dodatkowego miejsca na twoim dysku."
 
-#: src/main.c:400
+#: src/main.c:405
 msgid "Migration of configuration"
 msgstr "Migracja konfiguracji"
 
-#: src/main.c:411
+#: src/main.c:416
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopiowanie plików konfiguracyjnych..."
 
-#: src/main.c:420
+#: src/main.c:425
 msgid "Migration failed!"
 msgstr "Nie udało się przenieść starej konfiguracji!"
 
-#: src/main.c:429
+#: src/main.c:434
 msgid "Migrating configuration..."
 msgstr "Migracja konfiguracji..."
 
-#: src/main.c:1141
+#: src/main.c:1146
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nie obsługuje g_thread.\n"
 
-#: src/main.c:1161 src/main.c:1165 src/main.c:1169
+#: src/main.c:1166 src/main.c:1170 src/main.c:1174
 msgid "(or older)"
 msgstr "(lub starszy)"
 
-#: src/main.c:1510
+#: src/main.c:1515
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6795,7 +6820,7 @@ msgstr[2] ""
 "uzyskać więcej informacji:\n"
 "%s"
 
-#: src/main.c:1552
+#: src/main.c:1557
 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 "
@@ -6805,7 +6830,7 @@ msgstr ""
 "niekompletna. Prawdopodobnie spowodowane jest to wadliwym kontem IMAP.Użyj "
 "\"Przebuduj drzewo katalogów\" z menu katalogu by spróbować to naprawić."
 
-#: src/main.c:1558
+#: src/main.c:1563
 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 "
@@ -6815,36 +6840,77 @@ msgstr ""
 "Prawdopodobnie jest to spowodowane przestarzałą zewnętrzną wtyczką. Proszę "
 "przeinstalować wtyczkę i spróbować ponownie."
 
-#: src/main.c:1799
+#: src/main.c:1804
 msgid "Missing filename\n"
 msgstr "Brakująca nazwa pliku\n"
 
-#: src/main.c:1806
+#: src/main.c:1811
 msgid "Cannot open filename for reading\n"
 msgstr "Nie można było odczytać pliku\n"
 
-#: src/main.c:1817
+#: src/main.c:1822
 msgid "Malformed header\n"
 msgstr "Uszkodzony nagłówek\n"
 
-#: src/main.c:1824
+#: src/main.c:1829
 msgid "Duplicated 'To:' header\n"
 msgstr "Zduplikowany nagłówek 'Do:'\n"
 
-#: src/main.c:1835
+#: src/main.c:1840
 msgid "Missing required 'To:' header\n"
 msgstr "Brak wymaganego nagłówka 'Do:'\n"
 
-#: src/main.c:1980
+#: src/main.c:1866
+#, c-format
+msgid "%s. Try -h or --help for usage.\n"
+msgstr "%s. Spórbuj opcji -h lub --help aby wyświetlić sposób użycia.\n"
+
+#: src/main.c:1893 src/main.c:1956
+#, c-format
+msgid "Missing file argument for option %s"
+msgstr "Brak argumentu pliku dla opcji %s"
+
+#: src/main.c:1915
+#, c-format
+msgid "Missing or empty uri argument for option %s"
+msgstr "Brakujący lub pusty argument uri dla opcji %s"
+
+#: src/main.c:1918
+#, c-format
+msgid "Missing uri argument for option %s"
+msgstr "Brakujący argument uri dla opcji %s"
+
+#: src/main.c:1951
+#, c-format
+msgid "Missing at least one non-empty file argument for option %s"
+msgstr ""
+"Brakuje co najmniej jednego nie-pustego argumentu z plikiem dla opcji %s"
+
+#: src/main.c:2020
+#, c-format
+msgid "Missing folder, type and request arguments for option %s"
+msgstr "Brajuący katalog, typ i argument zapytania dla opcji %s"
+
+#: src/main.c:2023
+#, c-format
+msgid "Missing type and request arguments for option %s"
+msgstr "BRakujący typ oraz argument zapytania dla opcji %s"
+
+#: src/main.c:2026
+#, c-format
+msgid "Missing request argument for option %s"
+msgstr "Brak argumetnu zapytania dla opcji %s"
+
+#: src/main.c:2042
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/main.c:1982
+#: src/main.c:2044
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      otwiera okno tworzenia wiadomości"
 
-#: src/main.c:1983
+#: src/main.c:2045
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6864,11 +6930,12 @@ msgstr ""
 "                         nie nastąpi pusta linia, dalej treść wiadomości do "
 "końca pliku."
 
-#: src/main.c:1988
+#: src/main.c:2050
 msgid "  --subscribe uri        subscribe to the given URI if possible"
-msgstr "  --subscribe uri        subskrybuje podany adres URI, jeśli to możliwe"
+msgstr ""
+"  --subscribe uri        subskrybuje podany adres URI, jeśli to możliwe"
 
-#: src/main.c:1989
+#: src/main.c:2051
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6878,7 +6945,7 @@ msgstr ""
 "                         otwórz okno kompozycji z załączonym wybranym\n"
 "                         plikiem"
 
-#: src/main.c:1992
+#: src/main.c:2054
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6888,23 +6955,23 @@ msgstr ""
 "                         otwórz okno kompozycji z załączonym wybranym\n"
 "                         plikiem"
 
-#: src/main.c:1995
+#: src/main.c:2057
 msgid "  --receive              receive new messages"
 msgstr "  --receive              odbiera nowe wiadomości"
 
-#: src/main.c:1996
+#: src/main.c:2058
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          odbiera nowe wiadomości dla wszystkich kont"
 
-#: src/main.c:1997
+#: src/main.c:2059
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     anuluje odbieranie wiadomości"
 
-#: src/main.c:1998
+#: src/main.c:2060
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       anuluje wysyłanie wiadomości"
 
-#: src/main.c:1999
+#: src/main.c:2061
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6924,15 +6991,15 @@ msgstr ""
 "                         rekursywnie: wyłączone jeśli arg. rozpoczyna się od "
 "0, n, N, f lub F"
 
-#: src/main.c:2006
+#: src/main.c:2068
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 wysyła zakolejkowane wiadomości"
 
-#: src/main.c:2007
+#: src/main.c:2069
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   pokazuje całkowitą ilość wiadomości"
 
-#: src/main.c:2008
+#: src/main.c:2070
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6940,63 +7007,62 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         pokazuje ilość wszystkich wiadomości"
 
-#: src/main.c:2010
+#: src/main.c:2072
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           pokaż statystyki sesji"
 
-#: src/main.c:2011
+#: src/main.c:2073
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     zresetuj statystyki sesji"
 
-#: src/main.c:2012
+#: src/main.c:2074
 msgid ""
-"  --select folder[/msg]  jumps to the specified folder/message\n"
-"                         folder is a folder id like 'folder/sub_folder'"
+"  --select folder[/msg]  jump to the specified folder/message\n"
+"                         folder is a folder id like 'folder/sub_folder', a "
+"file:// uri or an absolute path"
 msgstr ""
 "  --select katalog[/msg]  Przechodzi do wybranego katalogu/wiadomości\n"
-"                         Katalog należy podać w formie '#mh/Mailbox/inbox'"
+"                         Katalog do indentyfikator w formie '#mh/Mailbox/"
+"inbox'"
 
-#: src/main.c:2014
+#: src/main.c:2076
 msgid "  --online               switch to online mode"
 msgstr "  --online               przełącza w tryb pracy z siecią"
 
-#: src/main.c:2015
+#: src/main.c:2077
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              przełącza w tryb pracy z rozłączoną siecią"
 
-#: src/main.c:2016
+#: src/main.c:2078
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       wyłącza program Claws Mail"
 
-#: src/main.c:2017
-msgid "  --debug                debug mode"
-msgstr "  --debug                tryb debug"
+#: src/main.c:2079
+msgid "  --debug -d             debug mode"
+msgstr "  --debug -d             tryb serwisowy"
 
-#: src/main.c:2018
+#: src/main.c:2080
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         przełącz tryb debugowania"
 
-#: src/main.c:2019
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h              wyświetla tę pomoc i wychodzi"
+#: src/main.c:2081
+msgid "  --help -h              display this help"
+msgstr "  --help -h              wyświetla tę pomoc"
 
-#: src/main.c:2020
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           wyświetla informację o wersji i wychodzi"
+#: src/main.c:2082
+msgid "  --version -v           output version information"
+msgstr "  --version -v           wyświetla informację o wersji"
 
-#: src/main.c:2021
+#: src/main.c:2083
 msgid ""
-"  --version-full -V      output version and built-in features information "
-"and exit"
-msgstr ""
-"  --version-full -V      wyświetla informacje o wbudowanych funkcjach "
-"programu i kończy swoje dzianie"
+"  --version-full -V      output version and built-in features information"
+msgstr "  --version-full -V      wyświetla informacje o wbudowanych funkcjach"
 
-#: src/main.c:2022
+#: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           wyjściowy katalog konfiguracyjny"
 
-#: src/main.c:2023
+#: src/main.c:2085
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7004,40 +7070,56 @@ msgstr ""
 "  --alternate-config-dir [katalog]\n"
 "                         korzysta z podanego katalogu konfiguracyjnego"
 
-#: src/main.c:2025
+#: src/main.c:2087
 msgid ""
-"  --geometry -geometry WxH+X+Y\n"
+"  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 msgstr ""
-"  --geometry -geometry SzerxWys+X+Y\n"
+"  --geometry -geometry [SzerxWys][+X+Y]\n"
 "                         ustaw geometrie okna głównego"
 
-#: src/main.c:2078
-msgid "Unknown option. Try -h or --help for usage.\n"
-msgstr "Nieznana opcja. Użyj -h lub --help, aby wyświetlić sposób użycia.\n"
+#: src/main.c:2104
+#, c-format
+msgid "Missing directory argument for option %s"
+msgstr "Brakujący argument katalogu dla opcji %s"
+
+#: src/main.c:2112
+#, c-format
+msgid "Missing geometry argument for option %s"
+msgstr "Brakujący argument geometrii dla opcji %s"
+
+#: src/main.c:2123
+#, c-format
+msgid "Missing folder argument for option %s"
+msgstr "Brakujący argument katalogu dla opcji %s"
+
+#: src/main.c:2156 src/main.c:2159
+#, c-format
+msgid "Unknown option %s"
+msgstr "Nieznany błąd %s"
 
-#: src/main.c:2096
+#: src/main.c:2175
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Przetwarzanie (%s)..."
 
-#: src/main.c:2099
+#: src/main.c:2178
 msgid "top level folder"
 msgstr "katalog górnego poziomu"
 
-#: src/main.c:2181
+#: src/main.c:2260
 msgid "Queued messages"
 msgstr "Zakolejkowane wiadomości"
 
-#: src/main.c:2182
+#: src/main.c:2261
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewysłane wiadomości zostały zakolejkowane. Wyjść?"
 
-#: src/main.c:2940
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: sieć jest włączona.\n"
 
-#: src/main.c:2946
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieć jest rozłączona.\n"
 
@@ -7799,7 +7881,7 @@ msgstr "Malejąco"
 msgid "_Auto detect"
 msgstr "_Automatyczna detekcja"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr "Przypisz etykiety..."
 
@@ -7976,7 +8058,7 @@ msgstr "Nie znaleziono powielonej wiadomości z %d katalogów.\n"
 msgid "Select folder to go to"
 msgstr "Wybierz katalog, do którego chcesz przejść"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 "Reguły przetwarzania, które będą zastosowane przed przetwarzaniem w folderach"
@@ -7986,7 +8068,7 @@ msgid "Processing rules to apply after folder rules"
 msgstr ""
 "Reguły przetwarzania, które będą zastosowane po przetwarzaniu w folderach"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr "Konfiguracja filtrowania"
 
@@ -8335,8 +8417,8 @@ msgstr ""
 "\n"
 "  Wiadomość została skasowana lub przenisona do innego katalogu"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr "Błąd podczas uczenia.\n"
 
@@ -8450,7 +8532,7 @@ msgid "Go back to email"
 msgstr "Powrót do wiadomości email"
 
 #: 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:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nie można zapisać części wiadomości wieloczęściowej: %s"
@@ -8515,8 +8597,8 @@ msgstr "Wybierz katalog docelowy"
 msgid "'%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr "Zapisz jako"
 
@@ -8573,7 +8655,7 @@ msgstr "Typ:"
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: 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
 msgid "Description:"
@@ -8685,6 +8767,77 @@ msgstr "Usuń subskrypcję grupę news"
 msgid "Rename newsgroup folder"
 msgstr "Zmień nazwę folderu grupy news"
 
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr "OAuth2 brakujacy kod uwierzytelniania\n"
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr "OAuth2 błąd połączenia\n"
+
+#: src/oauth2.c:253 src/oauth2.c:367
+msgid "OAuth2 SSL connection error\n"
+msgstr "OAuth błąd połączenia SSL\n"
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr "Token dostępu Oath2 został pobrany\n"
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr "Token dostępu OAuth2 nie został pobrany\n"
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr "Odświeżający token OAuth2 został pobrany\n"
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "Odświeżający token OAuth2 nie został pobrany\n"
+
+#: src/oauth2.c:452
+msgid "OAuth2 socket write error\n"
+msgstr "Błąd pisania do gniazda OAuth2\n"
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr "Przekroczono czas oczekiwania dla gniazda OAhth2 \n"
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr "Token dostępu OAuth2 jest nadal aktualny\n"
+
+#: src/oauth2.c:534
+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:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr "OAuth2 próba pobrania świeżego tokenu dostępu dla kodu auth\n"
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr "Token dostępu OAuth2 został zaktualizowany\n"
+
+#: src/oauth2.c:583
+#, c-format
+msgid "OAuth2 original: %s\n"
+msgstr "OAuth oryginalna cześć %s\n"
+
+#: src/oauth2.c:584
+#, c-format
+msgid "OAuth2 encoded: %s\n"
+msgstr "OAuth zakodowano: %s\n"
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr ""
+"OAuth2 zdekodowało: %s\n"
+"\n"
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr "Wprowadź główne hasło"
@@ -8865,7 +9018,7 @@ msgstr "Ścieżka książki adresowej gdzie przechowywane są adresy"
 #: 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/spamassassin/spamassassin_gtk.c:463
+#: src/plugins/spamassassin/spamassassin_gtk.c:466
 #: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
 #: src/prefs_matcher.c:690
 msgid "Select..."
@@ -9530,9 +9683,9 @@ msgstr "Bogofilter"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:118
-#: src/plugins/spamassassin/spamassassin_gtk.c:459
-#: src/plugins/spamassassin/spamassassin_gtk.c:508
-#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:686
+#: src/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
@@ -9631,25 +9784,25 @@ msgstr "Rozpoznawanie spamu"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Process messages on receiving"
 msgstr "Przetwarzanie wiadomości podczas odbierania"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:374
+#: src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Maximum size"
 msgstr "Maksymalny rozmiar"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:383
+#: src/plugins/spamassassin/spamassassin_gtk.c:386
 msgid "Messages larger than this will not be checked"
 msgstr "Wiadomości większe niż ta nie zostaną sprawdzone"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1616
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr "KB"
 
@@ -9667,7 +9820,7 @@ msgstr "Tylko zaznacz jako spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:432
+#: src/plugins/spamassassin/spamassassin_gtk.c:435
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9676,7 +9829,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:438
+#: src/plugins/spamassassin/spamassassin_gtk.c:441
 msgid "Click this button to select a folder for storing spam"
 msgstr "Naciśnij tutaj aby zaznaczyć katalog do zapisywania spamu"
 
@@ -9708,13 +9861,13 @@ msgstr "Wykonywane jedynie na wiadomościach w skrzynkach MH"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:453
+#: src/plugins/spamassassin/spamassassin_gtk.c:456
 msgid "Whitelist senders found in address book/folder"
 msgstr "Pomijanie wiadomości od osób z książki adresowej"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:457
+#: src/plugins/spamassassin/spamassassin_gtk.c:460
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9724,7 +9877,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:467
+#: src/plugins/spamassassin/spamassassin_gtk.c:470
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Naciśnij ten przycisk aby wybrać książkę lub katalog w książce adresowej"
@@ -9752,7 +9905,7 @@ msgstr "Ścieżka do programu Bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:445
+#: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Mark spam as read"
 msgstr "Zaznacz wiadomości ze spamem jako przeczytane"
 
@@ -9822,7 +9975,7 @@ msgstr ""
 "Opcje wtyczki znajdują się w /Konfiguracja/Ustawienia/Wtyczki/Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:424
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid "Save spam in"
 msgstr "Zapisywanie spamu w"
 
@@ -10175,7 +10328,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:3924
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Proxy"
@@ -10189,6 +10342,7 @@ msgid "Use proxy"
 msgstr "Używaj proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Zdalne zasoby"
 
@@ -10206,6 +10360,7 @@ msgstr ""
 "Java nadal może być włączone dla załączników w wiadomości."
 
 #: src/plugins/fancy/fancy_prefs.c:245
+#: src/plugins/litehtml_viewer/lh_prefs.c:121
 msgid "Enable loading of remote content"
 msgstr "Włącz ładowanie zdalnej zawartości"
 
@@ -10215,7 +10370,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 Zewnętrznej Przeglądarce"
+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"
@@ -10224,7 +10379,7 @@ msgstr "CSS z tego pliku zostanie załadowany 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:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
+#: src/prefs_account.c:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Prze_glądaj"
@@ -10233,89 +10388,89 @@ msgstr "Prze_glądaj"
 msgid "Select stylesheet"
 msgstr "Wybierz arkusz stylów"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr "Ładowanie zdalnej zawartości jest wyłączona."
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr "Ładuj obrazy"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr "Włącz zdalną zawartość"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr "Włącz Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr "Włącz Wtyczki"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr "Włącz Javę"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
 msgstr "Otwórz odnośniki w zewnętrznej przeglądarce"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Wystąpił błąd: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s jest uszkodzonym lub nie obsługiwanym kanałem"
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr "Przeszukaj sieć"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr "Otwórz w przeglądarce"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr "Otwórz w przeglądarce"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr "Otwórz obrazek"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
 msgstr "Kopiuj odnośnik"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
 msgstr "Odnośnik Pobierania"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr "Zapisz Obrazek Jako"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr "Kopiuj Obrazek"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr "Importuj kanał"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr "Przeglądarka HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10541,7 +10696,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:1921
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
 msgid "Authentication"
 msgstr "Uwierzytelnienie"
 
@@ -10596,31 +10751,31 @@ msgstr ""
 msgid "GData integration"
 msgstr "Integracja z GData"
 
-#: src/plugins/libravatar/libravatar.c:332
-#: src/plugins/libravatar/libravatar.c:397
-#: src/plugins/libravatar/libravatar.c:457
-#: src/plugins/libravatar/libravatar_prefs.c:555
+#: src/plugins/libravatar/libravatar.c:334
+#: src/plugins/libravatar/libravatar.c:399
+#: src/plugins/libravatar/libravatar.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:564
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: src/plugins/libravatar/libravatar.c:339
+#: src/plugins/libravatar/libravatar.c:341
 msgid "Failed to register avatar header update hook"
 msgstr "Nie powiodła się rejestracja funkcji uaktualniania avatarów"
 
-#: src/plugins/libravatar/libravatar.c:348
+#: src/plugins/libravatar/libravatar.c:350
 msgid "Failed to register avatar image render hook"
 msgstr "Nie powiodła się rejestracja funkcji renderującej awatary"
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:356
 msgid "Failed to create avatar image cache directory"
 msgstr ""
 "Nie powiodło się tworzenie katalogu pamięci podręcznej dla obrazów awatarów"
 
-#: src/plugins/libravatar/libravatar.c:364
+#: src/plugins/libravatar/libravatar.c:366
 msgid "Failed to load missing items cache"
 msgstr "Nie powiodło się załadowanie brakujących elementów pamięci podręcznej"
 
-#: src/plugins/libravatar/libravatar.c:407
+#: src/plugins/libravatar/libravatar.c:409
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10725,64 +10880,80 @@ 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: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:323 src/prefs_account.c:1697
+#: src/prefs_account.c:1855 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "godzin"
 
-#: src/plugins/libravatar/libravatar_prefs.c:314
+#: src/plugins/libravatar/libravatar_prefs.c:316
 msgid "Mystery man"
 msgstr "Mystery man"
 
-#: src/plugins/libravatar/libravatar_prefs.c:315
+#: src/plugins/libravatar/libravatar_prefs.c:317
 msgid "Identicon"
 msgstr "Identicon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:316
+#: src/plugins/libravatar/libravatar_prefs.c:318
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: src/plugins/libravatar/libravatar_prefs.c:317
+#: src/plugins/libravatar/libravatar_prefs.c:319
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: src/plugins/libravatar/libravatar_prefs.c:318
+#: src/plugins/libravatar/libravatar_prefs.c:320
 msgid "Retro"
 msgstr "Retro"
 
-#: src/plugins/libravatar/libravatar_prefs.c:319
+#: src/plugins/libravatar/libravatar_prefs.c:321
+msgid "Robohash"
+msgstr "Robohash"
+
+#: src/plugins/libravatar/libravatar_prefs.c:322
+msgid "Pagan"
+msgstr "Pagan"
+
+#: src/plugins/libravatar/libravatar_prefs.c:323
 msgid "Custom URL"
 msgstr "Własny URL"
 
-#: src/plugins/libravatar/libravatar_prefs.c:322
+#: src/plugins/libravatar/libravatar_prefs.c:326
 msgid "A blank image"
 msgstr "Pusty obrazek"
 
-#: src/plugins/libravatar/libravatar_prefs.c:323
+#: src/plugins/libravatar/libravatar_prefs.c:327
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "Dyskretna mało-kontrastowa szara sylwetka"
 
-#: src/plugins/libravatar/libravatar_prefs.c:324
+#: src/plugins/libravatar/libravatar_prefs.c:328
 msgid "A generated geometric pattern"
 msgstr "Wygenerowany geometryczny wzór"
 
-#: src/plugins/libravatar/libravatar_prefs.c:325
+#: src/plugins/libravatar/libravatar_prefs.c:329
 msgid "A generated full-body monster"
 msgstr "Wygenerowane pełne ciało potwora"
 
-#: src/plugins/libravatar/libravatar_prefs.c:326
+#: src/plugins/libravatar/libravatar_prefs.c:330
 msgid "A generated almost unique face"
 msgstr "Wygenerowana prawie unikalna twarz"
 
-#: src/plugins/libravatar/libravatar_prefs.c:327
+#: src/plugins/libravatar/libravatar_prefs.c:331
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "Wygenerowany 8-bitowy spikselizowany obrazek w stylu arcade"
 
-#: src/plugins/libravatar/libravatar_prefs.c:328
+#: src/plugins/libravatar/libravatar_prefs.c:332
+msgid "A generated robotic character"
+msgstr "Wygenerowana postać robota"
+
+#: src/plugins/libravatar/libravatar_prefs.c:333
+msgid "A generated retro adventure game character"
+msgstr "Wygenerowany bohater przygodowej gry retro"
+
+#: src/plugins/libravatar/libravatar_prefs.c:334
 msgid "Redirect to a user provided URL"
 msgstr "Przekieruj do URL'a ustawionego przez użytkownika"
 
-#: src/plugins/libravatar/libravatar_prefs.c:342
+#: src/plugins/libravatar/libravatar_prefs.c:348
 msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
@@ -10791,11 +10962,11 @@ msgstr ""
 "jest niedostępna. Zostaw puste aby użyć domyślej pomarańczowej ikony "
 "libravatar."
 
-#: src/plugins/libravatar/libravatar_prefs.c:391
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "Pozwól na przekierowania do innych stron"
 
-#: src/plugins/libravatar/libravatar_prefs.c:392
+#: src/plugins/libravatar/libravatar_prefs.c:399
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -10803,23 +10974,23 @@ msgstr ""
 "Podążaj za przekierowaniami otrzymanymi od serwera libravatar do innych "
 "serwisów avatarów takich jak gravatar.com"
 
-#: src/plugins/libravatar/libravatar_prefs.c:401
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "Włącz serwery typu f_ederated"
 
-#: src/plugins/libravatar/libravatar_prefs.c:402
+#: src/plugins/libravatar/libravatar_prefs.c:409
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "Spróbuj pobrać avatar z serwera libravatar domeny nadawcy"
 
-#: src/plugins/libravatar/libravatar_prefs.c:419
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr "Upłynął limit czasu"
 
-#: src/plugins/libravatar/libravatar_prefs.c:419
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "sekunda/y"
 
-#: src/plugins/libravatar/libravatar_prefs.c:420
+#: 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."
@@ -10827,18 +10998,56 @@ msgstr ""
 "Ustaw 0 dla globalnego limitu czasu We/Wy gniazda. Maksymalna wartość musi "
 "być także mniejsza od globalnego czasu limitu czasu We/Wy gniazda."
 
-#: src/plugins/libravatar/libravatar_prefs.c:464
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Cache ikon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:468
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "Domyślny tryb brakujących ikon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:472
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Sieć"
 
+#: src/plugins/litehtml_viewer/lh_prefs.c:116
+msgid ""
+"Loading remote resources can lead to some privacy issues.\n"
+"When remote content loading is disabled, nothing will be requested\n"
+"from the network."
+msgstr ""
+"Ładując zdalne zasoby może prowadzić do problemów prywatności.\n"
+"Gdy łądowanie zdalnej zawartość jest wyłączone, nic nie może zostać pobrane\n"
+"z sieci."
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:133
+msgid "Size of image cache in megabytes"
+msgstr "Rozmiar pamięci podręcznej dla obrazków w megabajtach"
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:148
+msgid "Default font"
+msgstr "Domyślna czcionka"
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+msgid "Open Link"
+msgstr "Otwórz odnośnik"
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+msgid "Copy Link Location"
+msgstr "Kopiuj lokalizacje odnośnika"
+
+#: src/plugins/litehtml_viewer/plugin.c:50
+msgid "LiteHTML viewer"
+msgstr "Przeglądarka LiteHTML"
+
+#: src/plugins/litehtml_viewer/plugin.c:55
+msgid ""
+"Viewer plugin for HTML emails, using the litehtml library (http://www."
+"litehtml.com/)."
+msgstr ""
+"Dodatkowa przeglądarka dla wiadomości HTML, używająca biblioteki litehtml "
+"(http://www.litehtml.com/)."
+
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder"
 msgstr "katalog skrzynki pocztowej"
@@ -10928,7 +11137,7 @@ msgstr "Metoda uwierzytelniania niedostępna"
 msgid "sending error on Sieve session: %s\n"
 msgstr "błąd wysyłania podczas sesji Sieve: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
 msgid "_Filter"
 msgstr "_Filtr"
 
@@ -10985,7 +11194,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Filtr Sieve%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 "Wczytywanie..."
 
@@ -11056,7 +11265,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:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr "Informacje o serwerze"
 
@@ -11107,28 +11316,28 @@ msgstr "Określ uwierzytelnienia"
 
 #: 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:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 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: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/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
 msgid "Password"
 msgstr "Hasło"
 
-#: 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:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr "Metoda uwierzytelnienia"
 
-#: 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/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
 msgid "Automatic"
 msgstr "Automatycznie"
@@ -11765,96 +11974,96 @@ msgstr "Format:"
 msgid "Optimized:"
 msgstr "Zoptymalizowany:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "Właściwości PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "Wprowadź hasło"
 
-#: 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 ""
 "Ten dokument jest zablokowany i wymaga podania hasła przed jego otworzeniem."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1387
 #, c-format
 msgid "%s Document"
 msgstr "Dokument %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
 msgstr "z %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 "Czytanie PDF zakończyło się niepowodzeniem z nieznanej przyczyny."
 
-#: 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 "Indeks Dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "Pierwsza Strona"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr "Poprzednia Strona"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "Następna Strona"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "Ostatnia Strona"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "Powiększ"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "Pomniejsz"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "Dopasuj do Strony"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "Dopasuj do Szerokości Strony"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "Obróć w Lewo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "Obróć w Prawo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "Drukuj Dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "Informacje o Dokumencie"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "Numer Strony"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "Współczynnik Powiększenia"
 
-#: 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 "
@@ -11867,13 +12076,13 @@ msgstr ""
 "\n"
 "Jakiekolwiek opinie i sugestie mile widziane: 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 "Przeglądarka PDF"
 
-#: 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,19 +12134,29 @@ msgstr "Proszę podać hasło dla:"
 msgid "Bad passphrase.\n"
 msgstr "Niewłaściwe hasło.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Import klucza"
 
-#: 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 and import it?"
 msgstr ""
-"Ten klucz jest nieznany. Czy chcesz aby Claws Mail spróbował zaimportować go "
-"z serwera kluczy?"
+"Ten klucz jest nieznany. Czy chcesz aby Claws Mail spróbował go zaimportować?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "_No"
+msgstr "_Nie"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "z serwera kluczy"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr "z Internetowego Katalogu Kluczy"
 
-#: 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 "
@@ -11945,15 +12164,15 @@ msgstr ""
 "\n"
 "  ID klucza "
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid "   This key is not in your keyring.\n"
 msgstr "   Ten klucz jest nieznany.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   Powinno być możliwe jego zaimportowanie "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -11961,17 +12180,17 @@ msgstr ""
 "pracując online,\n"
 "   lub "
 
-#: 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 ""
-"z użyciem następującej komendy: \n"
+"z użyciem jakiejkolwiek z następujących komend: \n"
 "\n"
 "    "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -11979,29 +12198,27 @@ msgstr ""
 "\n"
 "  Importowanie klucza o 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 "   Ten klucz został pomyślnie zaimportowany.\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 "   Ten klucz nie został pomyślnie zaimportowany.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Serwery kluczy są czasem powolne.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Możesz spróbować zaimportować go ręcznie poleceniem:\n"
-"\n"
-"    "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
+msgstr "   Możesz spróbować zaimportować go ręcznie poleceniem:"
+
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr "lub"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   Ten klucz jest już zaimportowany.\n"
 
@@ -12063,8 +12280,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:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minut"
 
@@ -12693,8 +12910,8 @@ msgstr "Pokaż konsolę Pythona..."
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: 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/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
 msgid "Browse"
 msgstr "Przeglądaj"
@@ -13013,7 +13230,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: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/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dni"
 
@@ -13348,7 +13565,7 @@ msgid "Password:"
 msgstr "Hasło:"
 
 #: src/plugins/spamassassin/spamassassin.c:78
-#: src/plugins/spamassassin/spamassassin_gtk.c:671
+#: src/plugins/spamassassin/spamassassin_gtk.c:674
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -13419,67 +13636,67 @@ msgstr ""
 "Opcje konfiguracyjne wtyczki znajdują się w /Konfiguracja/Ustawienia/Wtyczki/"
 "SpamAssasin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Localhost"
 msgstr "Localhost"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:95
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:94
+#: src/plugins/spamassassin/spamassassin_gtk.c:97
 msgid "Unix Socket"
 msgstr "Gniazdo Uniksa"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:122
+#: src/plugins/spamassassin/spamassassin_gtk.c:125
 msgid "Select folder to save spam to"
 msgstr "Wybierz katalog do zapisywania spamu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:274
+#: src/plugins/spamassassin/spamassassin_gtk.c:277
 msgid "Enable SpamAssassin plugin"
 msgstr "Włącz wtyczkę SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:278
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Transport"
 msgstr "Transport"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:286
+#: src/plugins/spamassassin/spamassassin_gtk.c:289
 msgid "Type of transport"
 msgstr "Rodzaj transportu"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:307
+#: src/plugins/spamassassin/spamassassin_gtk.c:310
 msgid "User"
 msgstr "Użytkownik"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:320
+#: src/plugins/spamassassin/spamassassin_gtk.c:323
 msgid "User to use with spamd server"
 msgstr "Użytkownik którego użyć z serwerem spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:322
+#: src/plugins/spamassassin/spamassassin_gtk.c:325
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:340
+#: src/plugins/spamassassin/spamassassin_gtk.c:343
 msgid "Hostname or IP address of spamd server"
 msgstr "Nazwa lub adres IP komputera z uruchomionym serwerem spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:354
 msgid "Port of spamd server"
 msgstr "Port na którym jest uruchomiony serwer spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:360
 msgid "Path of Unix socket"
 msgstr "Ścieżka gniazda Uniksa"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Use compression"
 msgstr "Użyj kompresji"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:368
+#: src/plugins/spamassassin/spamassassin_gtk.c:371
 msgid "Enable compression if spamd uses it, otherwise disable it."
 msgstr "Włącz kompresję jeśli spamd jej używa, w przeciwnym wypadku wyłącz."
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:403
+#: src/plugins/spamassassin/spamassassin_gtk.c:406
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13713,45 +13930,45 @@ msgstr "Wstępnie zaakceptuj"
 msgid "Decline"
 msgstr "Odmów"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr "Masz pozycję Todo."
 
-#: 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:718
 msgid "Details follow:"
 msgstr "Szczegóły poniżej:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "Zorganizowałeś spotkanie."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr "Zostałeś zaproszony na spotkanie."
 
-#: 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 "Spotkanie, na które zostałeś zaproszony zostało odwołane."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr "Dostałeś powiadomienie o spotkaniu."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr "(to spotkanie się powtarza)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr "(to spotkanie jest częścią powtarzającego się wydarzenia)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Otrzymałeś odpowiedź na niewiadomą propozycje spotkania"
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13760,35 +13977,35 @@ msgstr ""
 "Otrzymałeś odpowiedź dotyczącą propozycji spotkania.\n"
 "%s przekazał %s zaproszenie, szczegóły poniżej:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr "Błąd: Nie można odczytać części MIME kalendarza"
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr "Błąd - nie znaleziono części kalendarza."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr "Błąd - Nieznany typ komponentu kalendarza"
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
 msgstr "Wyślij powiadomienie do uczestników"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr "Odwołaj spotkanie"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Czy naprawdę chcesz anulować to spotkanie?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr "Nie znaleziono konta"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13796,68 +14013,68 @@ msgstr ""
 "Twoje konto nie znajduje się na liście uczestników.\n"
 "Chcesz mimo wszystko odpowiedzieć?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr "Odpowiedz mimo wszystko"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr "Odpowiedz"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr "Edytuj spotkanie..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr "Odwołaj spotkanie..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr "Uruchom Stronę"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr "Jesteś zajęty w tym czasie."
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Wydarzenie:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Położenie:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Podsumowanie:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr "Początek:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr "Koniec:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Uczestnicy:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr "Akcja:"
 
@@ -14481,95 +14698,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:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "Błąd protokołu POP\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "niewłaściwa odpowiedź UIDL: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Usuwanie przeterminowanych wiadomości %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, 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:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "skrzynka zablokowana\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "upłynął limit czasu sesji\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "komenda nie wspierana\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "wystąpił błąd podczas sesji POP\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "komenda TOP nie jest obsługiwana\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Lokalny plik mbox"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr "Żaden (tylko SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr "Nazwa konta"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
 msgstr "Ustaw jako domyślne konto"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr "Pełna nazwa"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
 msgstr "Adres e-mail"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Auto-Konfiguracja"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14577,77 +14794,81 @@ msgstr ""
 "Ostrzeżenie: ta wersja Claws Mail\n"
 "została zbudowana bez obsługi IMAP oraz News."
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr "Ten serwer wymaga uwierzytelniania"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr "Autoryzacja przy połączeniu"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr "Serwer news"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr "Serwer do odbierania"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr "Lokalny mailbox"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (do wysyłania)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr "Używaj polecenia lokalnego niż serwer SMTP"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr "polecenia do wysyłania poczty"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr "Lokalny"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr "Domyślna skrzynka poczty przychodzącej"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Niefiltrowane wiadomości będą przetrzymywane w tym katalogu"
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
-msgstr "Używanie bezpiecznego mechanizmu autoryzacji (APOP)"
+#: src/prefs_account.c:1634
+msgid "Authenticate before POP connection"
+msgstr "Autoryzuj przed połączeniem POP"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1658 src/prefs_account.c:2259
+msgid "Select"
+msgstr "Wybierz"
+
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr "Po odebraniu skasuj wiadomości z serwera"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr "Usuń po"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr "(ustawienie wartości 0 dni: kasuje zaraz po odebraniu)"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr "Limit ilości pobieranych danych"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14655,94 +14876,94 @@ msgstr ""
 "Wiadomości powyżej tego limitu będą pobrane częściowo. Kiedy je zaznaczysz "
 "będzie możliwe pobranie ich w całości lub skasowanie."
 
-#: src/prefs_account.c:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr "Maksymalna liczba artykułów do pobrania"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr "nieskończona jeśli podano 0"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr "Czysty tekst"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr "(zazwyczaj puste)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
 msgstr "Pokaż tylko zasubskrybowane foldery"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1831
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Tryb oszczędzania łącza (zapobiega pobieraniu zdalnych znaczników)"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1833
 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:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatyczne sprawdzanie"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr "Używaj globalnych ustawień"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Sprawdź czy są nowe wiadomości pocztowe"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr "Filtruj wiadomości podczas odbierania"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr "Użycie filtrów z wtyczek podczas odbierania wiadomości"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1908
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "\"Pobierz wszystkie\" sprawdza czy jest nowa poczta na tym koncie."
 
-#: src/prefs_account.c:1894 src/prefs_customheader.c:210
+#: 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
 msgid "Header"
 msgstr "Nagłówek"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr "Generowanie identyfikatora wiadomości (Message-ID)"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
 msgstr "Wysyłaj adres konta w identyfikatorze wiadomości"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr "Dodaj nagłówek user agent"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr "Dodaj nagłówek zdefiniowany przez użytkownika"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autoryzacja SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14750,172 +14971,216 @@ msgstr ""
 "Jeśli pozostawisz te pola puste, to zostanie użyty ten sam login i hasło co "
 "przy odbieraniu."
 
-#: src/prefs_account.c:2033
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr "Autoryzacja POP przed wysłaniem"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr "Limit czasu dla uwierzytelniania POP"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2233
+msgid "Authorization"
+msgstr "Uwierzytelnienie"
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr "Wybierz dostawcę usług dla wiadomości OAuth2"
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr "Indentyfikator Klienta"
+
+#: src/prefs_account.c:2296
+msgid "Client secret"
+msgstr "Sekret klienta"
+
+#: src/prefs_account.c:2328
+msgid "Obtain authorization code"
+msgstr "Pobierz kod autoryzacyjny"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr "Otwórz domyśną przeglądarkę wraz z zapytaniem"
+
+#: src/prefs_account.c:2338
+msgid "Copy link"
+msgstr "Kopiuj odnośnik"
+
+#: src/prefs_account.c:2350
+msgid "Authorization code"
+msgstr "Kod uwierzytelnienia"
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr "Wklej cały adres URL z przeglądarki lub dostarczonego  tokena auth"
+
+#: src/prefs_account.c:2364
+msgid "Complete authorization"
+msgstr "Dokończ uwierzytelnienie"
+
+#: src/prefs_account.c:2368
+msgid "Authorize"
+msgstr "Uwierzytelnij"
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
 msgstr "Automatyczne wstaw podpis"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr "Oddzielenie podpisu"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr "Wyjście komendy"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
 msgstr "Automatycznie wstaw następujące adresy"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr "Słowniki do sprawdzania pisowni"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Domyślny Słownik"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Domyślny alternatywny słownik"
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Tworzenie wiadomości"
 
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Odpowiedź"
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: 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
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr "Domyślny system ochrony prywatności"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Podpisywanie każdej wiadomości"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Szyfrowanie każdej wiadomości"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2792
 msgid "Always sign messages when replying to a signed message"
 msgstr "Szyfrowanie wiadomości przy odpowiadaniu na zaszyfrowany email"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2795
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Szyfrowanie wiadomości przy odpowiadaniu na zaszyfrowany email."
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2798
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Zaszyfruj wysyłane wiadomości przy użyciu klucza własnego i odbiorcy"
 
-#: src/prefs_account.c:2481
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr "Zapisywanie wysłanych, zaszyfrowanych wiadomości w czystym tekście"
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
 msgid "Don't use SSL/TLS"
 msgstr "Nie używaj SSL/TLS"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: 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 "Używaj SSL/TLS"
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Użyj komendy STARTTLS by nawiązać zaszyfrowaną sesję"
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr "Wysyłaj (SMTP)"
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:3004
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Nie używaj SSL/TLS (ale w razie potrzeby używaj STARTTLS)"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr "Certyfikaty klienta"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr "Certyfikaty do odbierania"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 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:2732
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr "Certyfikat do wysyłania"
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Automatycznie akceptuj poprawne certyfikaty SSL/TLS"
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr "Użycie nie-blokującego SSL/TLS"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3106
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr ""
 "Wyłącz tę opcję jeżeli masz problemy przy nawiązywaniu połączeń SSL/TLS"
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Używaj serwera proxy"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3207
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Użyj domyślnych opcji"
 
-#: src/prefs_account.c:2890
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
 msgstr "Używaj globalnych ustawień serwera proxy"
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Użyj uwierzytelnienia"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
 msgstr "Użyj serwera proxy do wysyłania"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14923,27 +15188,27 @@ msgstr ""
 "Jeśli wyłączone, wiadomości będą wysyłane używając bezpośredniego płączenia "
 "do ustawionego serwera wysyłania, omijająć skonfigurowane serwery proxy"
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr "Port serwera SMTP"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr "Port serwera POP"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr "Port serwera IMAP"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr "Port serwera NNTP"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr "Nazwa domeny"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14951,148 +15216,152 @@ msgstr ""
 "Nazwa domeny zostanie użyta w wygenerowanym identyfikatora wiadomości, jak "
 "również podczas łączenia z serwerami SMTP."
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr "Użyj komendy do komunikacji z serwerem"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3451
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Zaznacz cross-posty jako przeczytane i zakoloruj:"
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr "Zapisz wysłane wiadomości w"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr "Zapisywanie wiadomości do wysłania w"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr "Zapisywanie kopii roboczych wiadomości w"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr "Zapisywanie skasowane wiadomości w"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr "Nie określono nazwy konta."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
 msgstr "Nie określono adresu e-mail."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr "Nie określono serwera SMTP."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr "Nie określono ID użytkownika."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr "Nie określono serwera POP."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr "Brak domyślny katalogu dla poczty przychodzącej."
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr "Nie określono serwera IMAP."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr "Nie określono serwera NNTP."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3626
 msgid "local mailbox filename is not entered."
 msgstr "nazwa lokalnej skrzynki mailbox nie została podana."
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
 msgstr "nie określono komendy do lokalnego wysłania poczty."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3642
 msgid "User ID cannot contain a newline character."
 msgstr "ID Użytkownika nie może zawierać znaku nowej linii."
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3647
 msgid "Password cannot contain a newline character."
 msgstr "Hasło nie może zawierać znaku nowej linii."
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3678
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "ID użytkownika SMTP nie może zawierać znaku nowej linii."
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3683
 msgid "SMTP password cannot contain a newline character."
 msgstr "Hasło SMTP nie może zawierać znaku nowej linii."
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr "nie podano domeny."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr "katalog wysłanych nie wybrany."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr "katalog kolejki nie został wybrany."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr "katalog szkiców nie został wybrany."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "katalog wysypiska nie został wybrany."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr "Odbieranie"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Wzorce"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr "Ustawienia nowego konta"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Ustawienia konta"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Niepowodzenie (błędy adres)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr "Wybierz plik z podpisem"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Wybierz plik certyfikatów"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (wtyczka niezaładowana)"
@@ -15129,7 +15398,7 @@ msgstr "Nadpisz wybraną akcję wpisem z góry"
 #: src/prefs_filtering.c:487 src/prefs_matcher.c:804 src/prefs_template.c:320
 #: src/prefs_toolbar.c:1024
 msgid "D_elete"
-msgstr "Usuń"
+msgstr "_Usuń"
 
 #: src/prefs_actions.c:347
 msgid "Delete the selected action from the list"
@@ -15360,7 +15629,7 @@ 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"
 
-#: src/prefs_common.c:456
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15587,8 +15856,8 @@ msgstr ""
 "Ta opcja włącza wyświetlanie części MIME w widoku wiadomości przy użyciu "
 "skryptu gdy używasz opcji z menu kontekstowego 'Wyświel jako tekst'"
 
-#: 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:180
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Widok wiadomości"
 
@@ -16134,27 +16403,43 @@ msgstr "Czcionki"
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Automatyczne wyświetlanie załączonych obrazów"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr "Automatyczne skalowanie załączonych obrazów"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
 msgstr "Kliknięcie włącza skalowanie"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:96
+msgid "Fit image"
+msgstr "Dopasuj obraz"
+
+#: src/prefs_image_viewer.c:99
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "Prawe kliknięcie włącza dopasowanie wysokość/szerokość"
+
+#: src/prefs_image_viewer.c:102
+msgid "Height"
+msgstr "Wysokość"
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr "Szerokość"
+
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr "Wyświetlanie obrazów wewnątrz wiadomości"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr "Drukuj obrazki"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr "Przeglądarka obrazów"
 
@@ -16360,11 +16645,11 @@ msgstr "treść wiadomości"
 msgid "whole message"
 msgstr "cała wiadomość"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr "Zaznacz"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr "Usunięte"
 
@@ -16372,11 +16657,11 @@ msgstr "Usunięte"
 msgid "Replied"
 msgstr "Odpowiedziane"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr "Przekazane"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Spam"
@@ -16385,7 +16670,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Posiada załącznik"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr "Podpisane"
 
@@ -16489,8 +16774,9 @@ msgstr "Test zewnętrznym programem"
 msgid ""
 "Use selector on the right to pick the header name. Type the name of the "
 "header if not available in the list."
-msgstr "Użyj selektora po prawej aby wybrać nazwę nagłówka. Wpisz nazwę "
-"nagłówka, jeśli nie ma jej na liście."
+msgstr ""
+"Użyj selektora po prawej aby wybrać nazwę nagłówka. Wpisz nazwę nagłówka, "
+"jeśli nie ma jej na liście."
 
 #: src/prefs_matcher.c:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
 #: src/prefs_matcher.c:2583
@@ -16662,83 +16948,91 @@ msgstr ""
 msgid "Current condition rules"
 msgstr "Obecne reguły warunków"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Nagłówki"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "Wyświetlanie panelu nagłówków powyżej okna wiadomości"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr "Wyświetlanie obrazów X-Face w podglądzie wiadomości"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "Zapisz (X-)Face w adresie książki jeśli morzliwe"
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr "Wyświetlanie buźki w widoku wiadomości"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr "Zapisz Face w książce adresów jeśli możliwe"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "Pokazywanie krótkich nagłówków w widoku wiadomości"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "Wiadomości HTML"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "Przetwarzanie wiadomości HTML do czystego tekstu"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Przetwarzanie wiadomości HTML za pomocą wtyczki jeśli to możliwe"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Wybierz część HTML z wieloczęściowych wiadomości"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Odstępy między liniami"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "piksele"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Pół strony"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Płynne przewijanie"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Pokazywanie opisów załączników (a nie nazwy)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Cytowanie"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Zwiń cytowanie po podwójnym kliknięciu"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Traktuj te znaki jako znaczniki cytatu"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Opcje tekstowe"
 
@@ -17411,8 +17705,8 @@ msgstr ""
 "Wybierz Kodowanie transferu (Content-Transfer-Encoding)\n"
 "dla wiadomość zawierających znaki odmienne od formatu ASCII"
 
-#: 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:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "Wysyłanie"
 
@@ -18219,7 +18513,7 @@ msgstr "Nie zdefiniowano kluczy odbiorcy."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Błąd podczas dekodowania BASE64]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr "Nie można odczytać części wiadomości"
 
@@ -18579,88 +18873,88 @@ msgstr "Wpisz tekst zastępujący '%s'"
 msgid "Enter variable"
 msgstr "Wprowadź zmienną"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Wysyłanie wiadomości za pomocą polecenia: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nie można wykonać polecenia: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Wystąpił błąd podczas wykonywania polecenia: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "Podłączanie"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "Wykonywanie POP przez SMTP"
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "POP przed SMTP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Konto '%s': Łączenie z serwerem SMTP: %s:%d..."
 
-#: src/send_message.c:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "Wiadomość została poprawnie wysłana."
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "Wysyłanie HELO..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "Uwierzytelnianie"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "Wysyłanie wiadomości..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "Wysyłanie EHLO..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "Wysyłanie MAIL FROM..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "Wysyłanie RCPT TO..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "Wysyłanie DATA..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "Wychodzenie..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Wysyłanie wiadomości (%d / %d bajtów)"
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "Wysyłanie wiadomości"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "Błąd podczas wysyłania wiadomości."
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18963,11 +19257,11 @@ msgstr "Od: %s, w %s"
 msgid "To: %s, on %s"
 msgstr "Do: %s, w %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr "Nie jesteś autorem artykułu."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4574
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -18975,83 +19269,83 @@ msgstr[0] "Czy naprawdę chcesz usunąć %d wybraną wiadomość?"
 msgstr[1] "Czy naprawdę chcesz usunąć %d wybrane wiadomości?"
 msgstr[2] "Czy naprawdę chcesz usunąć %d wybranych wiadomości?"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Usuń wiadomość"
 msgstr[1] "Usuń wiadomości"
 msgstr[2] "Usuń wiadomości"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr "Folder docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4796
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Wybierz katalog do przeniesienia wybranej wiadomości"
 msgstr[1] "Wybierz katalog do przeniesienia wybranych wiadomości"
 msgstr[2] "Wybierz katalog do przeniesienia wybranych wiadomości"
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr "Folder docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4881
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Wybierz katalog do skopiowania wybranej wiadomości"
 msgstr[1] "Wybierz katalog do skopiowania wybranych wiadomości"
 msgstr[2] "Wybierz katalog do skopiowania wybranych wiadomości"
 
-#: src/summaryview.c:5036
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr "Dodaj lub Nadpisz"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr "Dodać do, czy nadpisać istniejący plik?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr "_Dopisz"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr "_Nadpisz"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nie można zapisać pliku '%s'."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5090
 #, 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ć ? "
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr "Pomiń te regułki"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5799
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Wykonaj te regułki bez względu na to z jakim kontem są powiązane"
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5802
 msgid "Apply these rules if they apply to the current account"
 msgstr "Wykonaj te regułki jeśli powiązane są z bieżącym kontem"
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr "Filtrowanie..."
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19059,75 +19353,75 @@ msgstr ""
 "Istnieją regułki powiązane z tym kontem.\n"
 "Wybierz co zrobić z tymi regułkami:"
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr "Filtrowanie..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr "Konfiguracja przetwarzania"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6095
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Czy naprawdę chcesz zresetować kolor etykiet dla wszystkich wybranych "
 "wiadomości?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6097
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Czy naprawdę chcesz ustawić kolor etykiet dla wszystkich wybranych "
 "wiadomości?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Reset color label"
 msgstr "Resetowanie koloru etykiet"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Set color label"
 msgstr "Ustaw kolor etykiet"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr "Ignorowany wątek"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr "Śledzony wątek"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpowiedziano ale także przekazano - kliknij aby zobaczyć odpowiedź"
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr "Odpowiedziano - kliknij aby zobaczyć odpowiedź"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr "Przeznaczone do przeniesienia"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr "Do skopiowania"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr "Podpisana, posiada załącznik(i)"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr "Wiadomość jest zaszyfrowana i posiada załącznik(i)"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr "Zaszyfrowana wiadomość"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr "Wiadomość posiada załącznik(i)"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19136,11 +19430,11 @@ msgstr ""
 "Błąd regularnego wyrażenia (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8402
 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:8403
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr "Powrót do listy katalogów"
 
@@ -19963,3 +20257,57 @@ msgstr ""
 "Program Claws Mail jest gotowy do pracy.\n"
 "Kliknij przycisk Zapisz, aby  zapisać konfigurację i rozpocząć pracę z "
 "programem."
+
+#~ msgid "_Yes"
+#~ msgstr "Yes"
+
+#~ msgid "_New"
+#~ msgstr "_Nowy"
+
+#~ msgid "_Properties"
+#~ msgstr "_Właściwości"
+
+#~ msgid "Find and _Replace"
+#~ msgstr "Znajdź i Za_mień"
+
+#~ msgid "_Bottom"
+#~ msgstr "_Dół"
+
+#~ msgid "_Down"
+#~ msgstr "N_iżej"
+
+#~ msgid "_Next"
+#~ msgstr "_Następne"
+
+#~ msgid "_Previous"
+#~ msgstr "_Poprzedni"
+
+#~ msgid "_Top"
+#~ msgstr "S_zczyt"
+
+#~ msgid "_Up"
+#~ msgstr "_Góra"
+
+#~ msgid "_Add"
+#~ msgstr "Dod_aj"
+
+#~ msgid "_Stop"
+#~ msgstr "_Stop"
+
+#~ msgid "_Execute"
+#~ msgstr "Wy_konaj"
+
+#~ msgid "_Refresh"
+#~ msgstr "_Odśwież"
+
+#~ msgid "_Apply"
+#~ msgstr "_Zatwierdź"
+
+#~ msgid "_Quit"
+#~ msgstr "_Wyjście"
+
+#~ msgid "_Rename"
+#~ msgstr "_Zmień nazwę"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Używanie bezpiecznego mechanizmu autoryzacji (APOP)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 225b4be68..e703097e2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,22 +3,22 @@
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
-# Frederico Goncalves Guimaraes <frederico at teia.bio.br>, 2006-2018.
 #
+# Frederico Goncalves Guimaraes <frederico at teia.bio.br>, 2006-2018, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.14.0git127\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2019-07-19 08:25+0100\n"
-"PO-Revision-Date: 2019-07-23 22:43-0300\n"
-"Last-Translator: Frederico Goncalves Guimaraes <frederico at teia.bio.br>\n"
-"Language-Team: Frederico Goncalves Guimaraes <frederico at teia.bio.br>\n"
+"POT-Creation-Date: 2021-07-03 09:16+0100\n"
+"PO-Revision-Date: 2021-07-04 13:26-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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Lokalize 20.12.0\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -59,47 +59,48 @@ msgstr "Contas com pastas remotas não podem ser copiadas."
 msgid "Copy of %s"
 msgstr "Cópia de %s"
 
-#: src/account.c:1119
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Deseja realmente excluir a conta '%s'?"
 
-#: src/account.c:1121
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr "(Sem título)"
 
-#: src/account.c:1122
+#: src/account.c:1129
 msgid "Delete account"
 msgstr "Excluir conta"
 
-#: src/account.c:1596
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1602
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
-msgstr "'Receber mensagem' busca os e-mails das contas marcadas"
+msgstr "'Receber mensagem' busca as mensagens das contas marcadas"
 
-#: src/account.c:1609 src/addrduplicates.c:471 src/addressadd.c:222
-#: src/addressbook.c:128 src/compose.c:7467 src/editaddress.c:1473
-#: src/editaddress.c:1502 src/editaddress.c:1518
+#: src/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
+#: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
-#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:170
-#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:427
-#: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
-#: src/mimeview.c:303 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
-#: src/plugins/pgpcore/select-keys.c:463 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1874 src/prefs_template.c:79 src/prefs_themes.c:990
+#: 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
 msgid "Name"
 msgstr "Nome"
 
-#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4647
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1625 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Servidor"
 
@@ -150,7 +151,8 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
+#: 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/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -223,7 +225,7 @@ msgstr ""
 "Não é possível mover uma pasta para dentro dela mesma ou de sua sub-"
 "estrutura."
 
-#: src/addr_compl.c:689 src/addressbook.c:5017
+#: src/addr_compl.c:699 src/addressbook.c:5009
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Grupo"
@@ -296,15 +298,15 @@ msgstr ""
 "Deseja realmente substituir todos os nomes de\n"
 "atributos pelos valores originais?"
 
-#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
-#: src/addressbook.c:484 src/edittags.c:286
-#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1085
-#: src/prefs_filtering.c:1699 src/prefs_template.c:1111
+#: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:462
+#: src/addressbook.c:479 src/edittags.c:286
+#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
+#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "_Delete"
 msgstr "E_xcluir"
 
-#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
+#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1087
+#: src/prefs_filtering.c:1701 src/prefs_template.c:1113
 msgid "Delete _all"
 msgstr "Excluir _todos"
 
@@ -343,46 +345,47 @@ msgstr "Mostrar duplicatas em livros diferentes"
 
 #: src/addrduplicates.c:144
 msgid "Find address book email duplicates"
-msgstr "Encontrar e-mails duplicados no livro de endereços"
+msgstr "Encontrar emails duplicados no livro de endereços"
 
 #: src/addrduplicates.c:145
 msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
 msgstr ""
-"O Claws Mail irá agora pesquisar endereços de e-mail duplicados no livro de "
+"O Claws Mail irá agora pesquisar endereços de email duplicados no livro de "
 "endereços."
 
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
 msgstr ""
-"Não foi encontrado nenhum endereço de e-mail duplicado no livro de endereços"
+"Não foi encontrado nenhum endereço de email duplicado no livro de endereços"
 
-#: src/addrduplicates.c:346
+#: src/addrduplicates.c:347
 msgid "Duplicate email addresses"
-msgstr "Endereços de e-mail duplicados"
+msgstr "Endereços de email duplicados"
 
-#: src/addrduplicates.c:442 src/addressadd.c:234
-#: src/plugins/pgpcore/select-keys.c:469 src/toolbar.c:529
+#: src/addrduplicates.c:443 src/addressadd.c:235
+#: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
+#: src/toolbar.c:529
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addrduplicates.c:464
+#: src/addrduplicates.c:465
 msgid "Address book path"
 msgstr "Caminho do livro de endereços"
 
-#: src/addrduplicates.c:790 src/addressbook.c:1444 src/addressbook.c:1497
+#: src/addrduplicates.c:791 src/addressbook.c:1436 src/addressbook.c:1489
 msgid "Delete address(es)"
 msgstr "Excluir endereço(s)"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1498
+#: src/addrduplicates.c:792 src/addressbook.c:1490
 msgid "Really delete the address(es)?"
 msgstr "Deseja realmente excluir o(s) endereço(s)?"
 
-#: src/addrduplicates.c:840
+#: src/addrduplicates.c:841
 msgid "Delete address"
 msgstr "Excluir endereço"
 
-#: src/addrduplicates.c:841 src/addressbook.c:1445
+#: src/addrduplicates.c:842 src/addressbook.c:1437
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 "Os dados deste endereço são \"somente para leitura\" e não podem ser "
@@ -392,167 +395,157 @@ msgstr ""
 msgid "Add to address book"
 msgstr "Adicionar ao Livro de Endereços"
 
-#: src/addressadd.c:214
+#: src/addressadd.c:215
 msgid "Contact"
 msgstr "Contato"
 
-#: src/addressadd.c:245 src/addressbook.c:130 src/editaddress.c:1257
-#: src/editaddress.c:1301 src/editgroup.c:292
+#: src/addressadd.c:246 src/addressbook.c:130 src/editaddress.c:1258
+#: src/editaddress.c:1302 src/editgroup.c:292
 msgid "Remarks"
 msgstr "Notas"
 
-#: src/addressadd.c:286 src/addressbook_foldersel.c:158
+#: src/addressadd.c:289 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "Selecione a pasta do Livro de Endereços"
 
-#: src/addressadd.c:596 src/addressbook.c:3267 src/addressbook.c:3318
+#: src/addressadd.c:599 src/addressbook.c:3259 src/addressbook.c:3310
 msgid "Add address(es)"
 msgstr "Adicionar endereço(s)"
 
-#: src/addressadd.c:597
+#: src/addressadd.c:600
 msgid "Can't add the specified address"
 msgstr "Não foi possível adicionar o endereço especificado"
 
-#: src/addressbook.c:129 src/addressbook.c:5005 src/editaddress.c:1246
-#: src/editaddress.c:1284 src/editgroup.c:291 src/expldifdlg.c:517
+#: 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
 msgid "Email Address"
-msgstr "Endereço de e-mail"
+msgstr "Endereço de email"
 
 #: src/addressbook.c:405
 msgid "_Book"
 msgstr "Li_vro"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
+#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
+#: src/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
-#: src/messageview.c:216
-msgid "_Help"
-msgstr "_Ajuda"
-
-#: src/addressbook.c:411 src/addressbook.c:469
+#: src/addressbook.c:410 src/addressbook.c:464
 msgid "New _Book"
 msgstr "Novo li_vro"
 
-#: src/addressbook.c:412 src/addressbook.c:470
+#: src/addressbook.c:411 src/addressbook.c:465
 msgid "New _Folder"
 msgstr "Nova _pasta"
 
-#: src/addressbook.c:413
+#: src/addressbook.c:412
 msgid "New _vCard"
 msgstr "Novo _vCard"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:416
 msgid "New _JPilot"
 msgstr "Novo _JPilot"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:419
 msgid "New LDAP _Server"
 msgstr "Novo Servidor _LDAP"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:423
 msgid "_Edit book"
 msgstr "_Editar livro"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:424
 msgid "_Delete book"
 msgstr "E_xcluir livro"
 
-#: src/addressbook.c:427 src/compose.c:624
+#: src/addressbook.c:426 src/compose.c:632
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "_Fechar"
 
-#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
+#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
 msgid "_Select all"
 msgstr "Selecionar _todos"
 
-#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
+#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
 msgid "C_ut"
 msgstr "_Recortar"
 
-#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
+#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
+#: src/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
-#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: src/addressbook.c:440 src/addressbook.c:486
+#: src/addressbook.c:439 src/addressbook.c:481
 msgid "New _Address"
 msgstr "Novo e_ndereço"
 
-#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
+#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
 msgid "New _Group"
 msgstr "Novo _grupo"
 
-#: src/addressbook.c:443 src/addressbook.c:493
+#: src/addressbook.c:442 src/addressbook.c:488
 msgid "_Mail To"
 msgstr "Enviar _mensagem para"
 
-#: src/addressbook.c:444 src/addressbook.c:497
+#: src/addressbook.c:443 src/addressbook.c:492
 msgid "_Merge"
 msgstr "Me_sclar"
 
-#: src/addressbook.c:448
+#: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr "Importar arquivo _LDIF..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Import M_utt file..."
 msgstr "Importar arquivo do _Mutt..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Import _Pine file..."
 msgstr "Importar arquivo do _Pine..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:451
 msgid "Export _HTML..."
 msgstr "Exportar _HTML..."
 
-#: src/addressbook.c:453
+#: src/addressbook.c:452
 msgid "Export LDI_F..."
 msgstr "Exportar L_DIF..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:454
 msgid "Find duplicates..."
 msgstr "Encontrar d_uplicatas..."
 
-#: src/addressbook.c:456
+#: src/addressbook.c:455
 msgid "Edit custom attributes..."
 msgstr "Editar atributos _personalizados..."
 
-#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
-#: src/messageview.c:340
-msgid "_About"
-msgstr "_Sobre"
-
-#: src/addressbook.c:495
+#: src/addressbook.c:490
 msgid "_Browse Entry"
 msgstr "Percorrer a entra_da"
 
-#: src/addressbook.c:509 src/crash.c:456 src/crash.c:475 src/importldif.c:114
+#: 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
@@ -560,120 +553,120 @@ msgstr "Percorrer a entra_da"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
 msgid "Success"
 msgstr "Sucesso"
 
-#: src/addressbook.c:517 src/importldif.c:122
+#: src/addressbook.c:512 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Argumentos incorretos"
 
-#: src/addressbook.c:518 src/importldif.c:123
+#: src/addressbook.c:513 src/importldif.c:123
 msgid "File not specified"
 msgstr "Arquivo não especificado"
 
-#: src/addressbook.c:519 src/importldif.c:124
+#: src/addressbook.c:514 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Ocorreu um erro ao abrir o arquivo"
 
-#: src/addressbook.c:520 src/importldif.c:125
+#: src/addressbook.c:515 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Ocorreu um erro ao ler o arquivo"
 
-#: src/addressbook.c:521 src/importldif.c:126
+#: src/addressbook.c:516 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Foi encontrado o fim do arquivo"
 
-#: src/addressbook.c:522 src/importldif.c:127
+#: src/addressbook.c:517 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Ocorreu um erro de alocação de memória"
 
-#: src/addressbook.c:523 src/importldif.c:128
+#: src/addressbook.c:518 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Formato do arquivo incorreto"
 
-#: src/addressbook.c:524 src/importldif.c:129
+#: src/addressbook.c:519 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Ocorreu um erro ao escrever no arquivo"
 
-#: src/addressbook.c:525 src/importldif.c:130
+#: src/addressbook.c:520 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Ocorreu um erro ao abrir o diretório"
 
-#: src/addressbook.c:526 src/importldif.c:131
+#: src/addressbook.c:521 src/importldif.c:131
 msgid "No path specified"
 msgstr "Não foi especificado nenhum caminho"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error connecting to LDAP server"
 msgstr "Ocorreu um erro ao conectar ao servidor LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "Error initializing LDAP"
 msgstr "Ocorreu um erro na inicialização do LDAP"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "Error binding to LDAP server"
 msgstr "Ocorreu um erro durante a conexão com o servidor LDAP"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error searching LDAP database"
 msgstr "Ocorreu um erro durante a pesquisa no banco de dados LDAP"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Timeout performing LDAP operation"
 msgstr "Tempo esgotado durante a operação do LDAP"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Error in LDAP search criteria"
 msgstr "Erro no critério de pesquisa no LDAP"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "No LDAP entries found for search criteria"
 msgstr "Não foram encontradas entradas LDAP para o critério da pesquisa"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "LDAP search terminated on request"
 msgstr "A pesquisa no LDAP foi terminada sob solicitação"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:539
 msgid "Error starting STARTTLS connection"
 msgstr "Erro ao iniciar a conexão STARTTLS"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:540
 msgid "Distinguished Name (dn) is missing"
-msgstr "Falta o nome distinto (dn)"
+msgstr "Falta o Distinguished Name (dn)"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:541
 msgid "Missing required information"
 msgstr "Faltam informações necessárias"
 
-#: src/addressbook.c:547
+#: src/addressbook.c:542
 msgid "Another contact exists with that key"
 msgstr "Já existe outro contato com essa chave"
 
-#: src/addressbook.c:548
+#: src/addressbook.c:543
 msgid "Strong(er) authentication required"
 msgstr "Foi requerida uma autenticação (mais) forte"
 
-#: src/addressbook.c:916
+#: src/addressbook.c:911
 msgid "Sources"
 msgstr "Fontes"
 
-#: src/addressbook.c:920 src/prefs_matcher.c:642 src/prefs_other.c:492
+#: src/addressbook.c:915 src/prefs_matcher.c:643 src/prefs_other.c:493
 #: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "Livro de endereços"
 
-#: src/addressbook.c:1117 src/editldap.c:793
+#: src/addressbook.c:1109 src/editldap.c:794
 msgid "Search"
 msgstr "Pesquisar"
 
-#: src/addressbook.c:1489
+#: src/addressbook.c:1481
 msgid "Delete group"
 msgstr "Excluir grupo"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1482
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -681,28 +674,28 @@ msgstr ""
 "Deseja realmente excluir esse(s) grupo(s)?\n"
 "Os endereços nele(s) contidos não serão perdidos."
 
-#: src/addressbook.c:2217
+#: src/addressbook.c:2209
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 "Não é possível colar. O livro de endereços de destino é \"somente para "
 "leitura\"."
 
-#: src/addressbook.c:2227
+#: src/addressbook.c:2219
 msgid "Cannot paste into an address group."
 msgstr "Não é possível colar em um grupo de endereços."
 
-#: src/addressbook.c:2964
+#: src/addressbook.c:2956
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Deseja excluir os resultados da consulta e endereços em '%s'?"
 
-#: src/addressbook.c:2967 src/addressbook.c:2993 src/addressbook.c:3000
+#: 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
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/addressbook.c:2976
+#: src/addressbook.c:2968
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -711,20 +704,20 @@ msgstr ""
 "Deseja excluir '%s'? Se você excluir somente a pasta, os endereços nela "
 "contidos serão movidos para a pasta superior."
 
-#: src/addressbook.c:2979 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: 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
 msgid "Delete folder"
 msgstr "Excluir a pasta"
 
-#: src/addressbook.c:2980
+#: src/addressbook.c:2972
 msgid "Delete _folder only"
 msgstr "Excluir somente a _pasta"
 
-#: src/addressbook.c:2980
+#: src/addressbook.c:2972
 msgid "Delete folder and _addresses"
 msgstr "Excluir a pasta e os _endereços"
 
-#: src/addressbook.c:2991
+#: src/addressbook.c:2983
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -733,7 +726,7 @@ msgstr ""
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos não serão perdidos."
 
-#: src/addressbook.c:2998
+#: src/addressbook.c:2990
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -742,29 +735,29 @@ msgstr ""
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos serão perdidos."
 
-#: src/addressbook.c:3112
+#: src/addressbook.c:3104
 #, c-format
 msgid "Search '%s'"
 msgstr "Pesquisar '%s'"
 
-#: src/addressbook.c:3250 src/addressbook.c:3299
+#: src/addressbook.c:3242 src/addressbook.c:3291
 msgid "New Contacts"
 msgstr "Novos contatos"
 
-#: src/addressbook.c:4136
+#: src/addressbook.c:4128
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:4140
+#: src/addressbook.c:4132
 msgid "New user, could not save address book files."
 msgstr ""
 "Novo usuário, não foi possível salvar os arquivos do livros de endereços."
 
-#: src/addressbook.c:4150
+#: src/addressbook.c:4142
 msgid "Old address book converted successfully."
 msgstr "A versão anterior do Livro de Endereços foi convertida com sucesso."
 
-#: src/addressbook.c:4155
+#: src/addressbook.c:4147
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -772,7 +765,7 @@ msgstr ""
 "O Livro de Endereços antigo foi convertido,\n"
 "não foi possível salvar o novo arquivo de índice dos endereços."
 
-#: src/addressbook.c:4168
+#: src/addressbook.c:4160
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -780,7 +773,7 @@ msgstr ""
 "Não foi possível converter o Livro de\n"
 "Endereços, mas foi criado um novo, em branco."
 
-#: src/addressbook.c:4174
+#: src/addressbook.c:4166
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -788,7 +781,7 @@ msgstr ""
 "Não foi possível converter o Livro de Endereços,\n"
 "nem foi possível salvar o novo arquivo de índice dos endereços."
 
-#: src/addressbook.c:4179
+#: src/addressbook.c:4171
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -796,56 +789,56 @@ msgstr ""
 "Não foi possível converter o Livro de Endereços, e não\n"
 "foi possível criar os novos arquivos do Livro de Endereços."
 
-#: src/addressbook.c:4186 src/addressbook.c:4192
+#: src/addressbook.c:4178 src/addressbook.c:4184
 msgid "Addressbook conversion error"
 msgstr "Ocorreu um erro na conversão do Livro de Endereços"
 
-#: src/addressbook.c:4307
+#: src/addressbook.c:4299
 msgid "Addressbook Error"
 msgstr "Erro no Livro de Endereços"
 
-#: src/addressbook.c:4308
+#: src/addressbook.c:4300
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice dos endereços"
 
-#: src/addressbook.c:4639
+#: src/addressbook.c:4631
 msgid "Busy searching..."
 msgstr "Ocupado pesquisando..."
 
-#: src/addressbook.c:4969 src/prefs_send.c:220
+#: src/addressbook.c:4961 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4981
+#: src/addressbook.c:4973
 msgid "Address Books"
 msgstr "Livros de Endereços"
 
-#: src/addressbook.c:4993
+#: src/addressbook.c:4985
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:5029 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3172 src/prefs_folder_column.c:77
+#: 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
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:5041
+#: src/addressbook.c:5033
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5053 src/addressbook.c:5065
+#: src/addressbook.c:5045 src/addressbook.c:5057
 msgid "JPilot"
 msgstr "JPllot"
 
-#: src/addressbook.c:5077
+#: src/addressbook.c:5069
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
-#: src/addressbook.c:5089
+#: src/addressbook.c:5081
 msgid "LDAP Query"
 msgstr "Consulta LDAP"
 
-#: src/addressbook_foldersel.c:200 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:371 src/expldifdlg.c:388
 #: src/exporthtml.c:985 src/importldif.c:541
 msgid "Address Book"
 msgstr "Livro de Endereços"
@@ -894,13 +887,13 @@ msgstr ""
 
 #: src/addrgather.c:415
 msgid "Process these mail header fields"
-msgstr "Processar estes campos de cabeçalho do e-mail"
+msgstr "Processar estes campos de cabeçalho das mensagens"
 
 #: src/addrgather.c:434
 msgid "Include subfolders"
 msgstr "Incluir sub-pastas"
 
-#: src/addrgather.c:492 src/prefs_filtering_action.c:1383
+#: src/addrgather.c:492 src/prefs_filtering_action.c:1384
 msgid "Header Name"
 msgstr "Nome do cabeçalho"
 
@@ -908,22 +901,22 @@ msgstr "Nome do cabeçalho"
 msgid "Address Count"
 msgstr "Contagem de endereços"
 
-#: src/addrgather.c:585
+#: src/addrgather.c:586
 msgid "Header Fields"
 msgstr "Campos do cabeçalho"
 
-#: src/addrgather.c:586 src/exphtmldlg.c:658 src/expldifdlg.c:722
-#: src/importldif.c:981
+#: src/addrgather.c:587 src/exphtmldlg.c:659 src/expldifdlg.c:723
+#: src/importldif.c:982
 msgid "Finish"
 msgstr "Finalizar"
 
-#: src/addrgather.c:644
+#: src/addrgather.c:645
 msgid "Collect email addresses from selected messages"
-msgstr "Coletar endereços de e-mail das mensagens selecionadas"
+msgstr "Coletar endereços de email das mensagens selecionadas"
 
-#: src/addrgather.c:648
+#: src/addrgather.c:649
 msgid "Collect email addresses from folder"
-msgstr "Coletar endereços de e-mail da pasta"
+msgstr "Coletar endereços de email da pasta"
 
 #: src/addrindex.c:125
 msgid "Common addresses"
@@ -950,18 +943,18 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Não foi possível atualizar. As mudanças não foram escritas no diretório."
 
-#: src/alertpanel.c:144 src/compose.c:9788
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr "Nota"
 
-#: src/alertpanel.c:157 src/compose.c:5853 src/compose.c:6395
-#: src/compose.c:12377 src/file_checker.c:84 src/file_checker.c:108
+#: 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:5111
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5790 src/inc.c:723
+#: 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
 msgid "Error"
 msgstr "Erro"
@@ -984,7 +977,7 @@ msgstr "Nome do servidor:"
 
 #: src/browseldap.c:253
 msgid "Distinguished Name (dn):"
-msgstr "Nome distinto (dn):"
+msgstr "Distinguished Name (dn):"
 
 #: src/browseldap.c:284
 msgid "LDAP Name"
@@ -1080,36 +1073,36 @@ msgstr "A sua versão do Claws Mail é muito antiga para o plugin '%s'."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "A sua versão do Claws Mail é muito antiga para o plugin."
 
-#: src/common/session.c:201 src/imap.c:1233
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "Não foi possível efetuar o handshake do SSL/TLS\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "Nenhum método SMTP AUTH disponível\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "O método SMTP AUTH selecionado não está disponível\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "resposta incorreta do SMTP\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "ocorreu um erro durante a sessão SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "A mensagem é muito grande (o tamanho máximo é %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "não foi possível iniciar a sessão STARTTLS\n"
 
@@ -1247,646 +1240,654 @@ msgstr "%d,%02dMb"
 msgid "%.2fGB"
 msgstr "%.2fGb"
 
-#: src/common/utils.c:4028
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4029
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: src/common/utils.c:4030
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: src/common/utils.c:4031
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: src/common/utils.c:4032
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: src/common/utils.c:4033
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: src/common/utils.c:4034
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/common/utils.c:4036
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Janeiro"
 
-#: src/common/utils.c:4037
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Fevereiro"
 
-#: src/common/utils.c:4038
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Março"
 
-#: src/common/utils.c:4039
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4040
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maio"
 
-#: src/common/utils.c:4041
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junho"
 
-#: src/common/utils.c:4042
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julho"
 
-#: src/common/utils.c:4043
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4044
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Setembro"
 
-#: src/common/utils.c:4045
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Outubro"
 
-#: src/common/utils.c:4046
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembro"
 
-#: src/common/utils.c:4047
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Dezembro"
 
-#: src/common/utils.c:4049
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4050
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Seg"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ter"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Qua"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Qui"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Sex"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4058
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Fev"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Set"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Out"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dez"
 
-#: src/common/utils.c:4079
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:596
+#: src/compose.c:198
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+"Você optou por assinar e/ou criptografar essa mensagem, mas não selecionou "
+"nenhum sistema de privacidade.\n"
+"\n"
+"A assinatura e a criptografia foram desabilitadas para essa mensagem."
+
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Adicionar..."
 
-#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/compose.c:599 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: src/compose.c:609
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "Orto_grafia"
 
-#: src/compose.c:611 src/compose.c:678
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Opções"
 
-#: src/compose.c:615
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: src/compose.c:623
 msgid "S_end"
 msgstr "_Enviar"
 
-#: src/compose.c:616
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "Enviar _mais tarde"
 
-#: src/compose.c:619
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "_Anexar arquivo"
 
-#: src/compose.c:620
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "_Inserir arquivo"
 
-#: src/compose.c:621
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Inserir assina_tura"
 
-#: src/compose.c:622
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "S_ubstituir assinatura"
 
-#: src/compose.c:626
+#: src/compose.c:634
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Desfazer"
 
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Re_fazer"
 
-#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Recortar"
 
-#: src/compose.c:639
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "Colar _especial"
 
-#: src/compose.c:640
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Como _citação"
 
-#: src/compose.c:641
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "Com _quebra de linhas"
 
-#: src/compose.c:642
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "_Sem quebra de linhas"
 
-#: src/compose.c:644 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Selecionar _tudo"
 
-#: src/compose.c:646
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "_Avançado"
 
-#: src/compose.c:647
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Mover um caractere para trás"
 
-#: src/compose.c:648
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Mover um caractere para frente"
 
-#: src/compose.c:649
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Mover uma palavra para trás"
 
-#: src/compose.c:650
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Mover uma palavra para frente"
 
-#: src/compose.c:651
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Mover para o início da linha"
 
-#: src/compose.c:652
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Mover para o final da linha"
 
-#: src/compose.c:653
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Mover para a linha anterior"
 
-#: src/compose.c:654
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Mover para a próxima linha"
 
-#: src/compose.c:655
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Apagar um caractere para trás"
 
-#: src/compose.c:656
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Apagar um caractere para frente"
 
-#: src/compose.c:657
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Apagar uma palavra para trás"
 
-#: src/compose.c:658
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Apagar uma palavra para frente"
 
-#: src/compose.c:659
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Apagar a linha"
 
-#: src/compose.c:660
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Apagar até o final da linha"
 
-#: src/compose.c:663 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "Locali_zar"
 
-#: src/compose.c:666
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "_Quebrar parágrafo atual"
 
-#: src/compose.c:667
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Quebrar todas as l_inhas longas"
 
-#: src/compose.c:669
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Editar com um programa e_xterno"
 
-#: src/compose.c:672
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "_Verificar tudo ou somente a seleção"
 
-#: src/compose.c:673
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "_Destacar todas as palavras erradas"
 
-#: src/compose.c:674
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "Verificar palavras erradas _anteriores"
 
-#: src/compose.c:675
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "Avançar para a _próxima palavra errada"
 
-#: src/compose.c:682
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "Modo da _resposta"
 
-#: src/compose.c:684
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "Sistema de _privacidade"
 
-#: src/compose.c:688
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "_Prioridade"
 
-#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "_Codificação dos caracteres"
 
-#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Europeu Ocidental"
 
-#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonês"
 
-#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Chinês"
 
-#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Tailandês"
 
-#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Livro de endereços"
 
-#: src/compose.c:708
+#: src/compose.c:716
 msgid "_Template"
 msgstr "_Modelo"
 
-#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "_Ações"
 
-#: src/compose.c:719
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
+msgid "_About"
+msgstr "_Sobre"
+
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Quebra auto_mática"
 
-#: src/compose.c:720
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Rec_uo automático"
 
-#: src/compose.c:721
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "_Assinar"
 
-#: src/compose.c:722
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "_Criptografar"
 
-#: src/compose.c:723
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "_Solicitar confirmação de recebimento"
 
-#: src/compose.c:724
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "_Remover referências"
 
-#: src/compose.c:725
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "Exibir _régua"
 
-#: src/compose.c:730 src/compose.c:740
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
-#: src/summaryview.c:431
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
+#: src/summaryview.c:433
 msgid "_All"
 msgstr "_Todos"
 
-#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
-#: src/summaryview.c:432
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
+#: src/summaryview.c:434
 msgid "_Sender"
 msgstr "_Remetente"
 
-#: src/compose.c:733
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "_Lista de discussão"
 
-#: src/compose.c:738
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "_Altíssima"
 
-#: src/compose.c:739
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "A_lta"
 
-#: src/compose.c:741
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "_Baixa"
 
-#: src/compose.c:742
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "Bai_xíssima"
 
-#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automática"
 
-#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "U_nicode (UTF-8)"
 
-#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europeu Central (ISO-8859-_2)"
 
-#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "_Grego (ISO-8859-7)"
 
-#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
-#: src/compose.c:1015 src/compose.c:1697
-msgid ""
-"You have opted to sign and/or encrypt this message but have not selected a "
-"privacy system.\n"
-"\n"
-"Signing and encrypting have been disabled for this message."
-msgstr ""
-"Você optou por assinar e/ou criptografar essa mensagem, mas não selecionou "
-"nenhum sistema de privacidade.\n"
-"\n"
-"A assinatura e a criptografia foram desabilitadas para essa mensagem."
-
-#: src/compose.c:1051
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr "Erro no formato do remetente da mensagem."
 
-#: src/compose.c:1144
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr "Erro no formato do assunto da mensagem."
 
-#: src/compose.c:1176 src/quote_fmt.c:563
+#: src/compose.c:1181 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "O corpo do modelo \"Nova mensagem\" possui um erro na linha %d."
 
-#: src/compose.c:1445
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 "Não foi possível responder. A mensagem original provavelmente não existe."
 
-#: src/compose.c:1630 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
-"O campo \"De\" do modelo \"Responder\" possui um endereço de e-mail inválido."
+"O campo \"De\" do modelo \"Responder\" possui um endereço de email inválido."
 
-#: src/compose.c:1679 src/quote_fmt.c:583
+#: src/compose.c:1684 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "O corpo do modelo \"Responder\" possui um erro na linha %d."
 
-#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
-"O campo \"De\" do modelo \"Encaminhar\" possui um endereço de e-mail "
+"O campo \"De\" do modelo \"Encaminhar\" possui um endereço de email "
 "inválido."
 
-#: src/compose.c:1883 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "O corpo do modelo \"Encaminhar\" possui um erro na linha %d."
 
-#: src/compose.c:2059
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
-msgstr "Enc: múltiplos e-mails"
+msgstr "Enc: múltiplos emails"
 
-#: src/compose.c:2566
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "O corpo do modelo \"Redirecionar\" possui um erro na linha %d."
 
-#: src/compose.c:2633 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2636 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Cco:"
 
-#: src/compose.c:2639 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder para:"
 
-#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
-#: src/compose.c:2645 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Seguindo a:"
 
-#: src/compose.c:2648 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Em resposta a:"
 
-#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
-#: src/gtk/headers.h:13 src/summary_search.c:421
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
+#: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2842
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Não foi possível anexar o arquivo (erro na conversão da codificação dos "
 "caracteres)."
 
-#: src/compose.c:2848 src/compose.c:10974
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1901,16 +1902,16 @@ msgstr[1] ""
 "Os seguintes arquivos foram anexados: \n"
 "%s"
 
-#: src/compose.c:3128
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "A \"Marca de citação\" do modelo é inválida."
 
-#: src/compose.c:3657
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Não foi possível obter o tamanho do arquivo '%s'."
 
-#: src/compose.c:3675
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1919,57 +1920,57 @@ msgstr ""
 "Você esta prestes a inserir um arquivo de %s no corpo da mensagem. Deseja "
 "realmente fazer isso?"
 
-#: src/compose.c:3678
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr "Tem certeza?"
 
-#: src/compose.c:3679 src/compose.c:10837 src/compose.c:11857
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: src/compose.c:3804
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:3805
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr "Arquivo vazio"
 
-#: src/compose.c:3806
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr "_Anexar mesmo assim"
 
-#: src/compose.c:3815
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:3842
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Editada]"
 
-#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Escrever mensagem%s"
 
-#: src/compose.c:4862 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sem assunto] - Escrever mensagem%s"
 
-#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Escrever mensagem"
 
-#: src/compose.c:4891 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1977,59 +1978,59 @@ msgstr ""
 "Não foi especificada uma conta para o envio da\n"
 "mensagem. Por favor, selecione uma conta antes de enviar."
 
-#: src/compose.c:5108 src/compose.c:5145
+#: src/compose.c:5126 src/compose.c:5163
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "O único destinatário é o endereço '%s' padrão. Enviar mesmo assim?"
 
-#: src/compose.c:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
-#: src/prefs_account.c:3781 src/toolbar.c:487 src/toolbar.c:519
+#: 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
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
-#: src/compose.c:5791 src/folderview.c:2546 src/messageview.c:859
+#: 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
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:5166
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr "O destinatário não foi especificado."
 
-#: src/compose.c:5181
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "A mensagem está sem assunto. %s"
 
-#: src/compose.c:5182 src/compose.c:5225
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Enviar mesmo assim?"
 
-#: src/compose.c:5183 src/compose.c:5226
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Mandar para a Fila de Saída mesmo assim?"
 
-#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr "Mandar para a _Fila de Saída"
 
-#: src/compose.c:5224
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Enviando para %d destinatários. %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5271
 msgid "Could not queue message."
 msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
 
-#: src/compose.c:5256
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2040,7 +2041,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5260
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2051,7 +2052,7 @@ msgstr ""
 "\n"
 "Falha na assinatura: %s"
 
-#: src/compose.c:5265
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2062,7 +2063,7 @@ msgstr ""
 "\n"
 "Falha na criptografia: %s"
 
-#: src/compose.c:5270
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2072,7 +2073,7 @@ msgstr ""
 "\n"
 "Ocorreu um erro na conversão da codificação dos caracteres."
 
-#: src/compose.c:5274
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2082,7 +2083,7 @@ msgstr ""
 "\n"
 "Não foi possível obter a chave de criptografia do destinatário."
 
-#: src/compose.c:5334 src/compose.c:5394
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2091,7 +2092,7 @@ msgstr ""
 "Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
 "tentar novamente."
 
-#: src/compose.c:5390
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
@@ -2101,7 +2102,7 @@ msgstr ""
 "Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
 "tentar novamente."
 
-#: src/compose.c:5787
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2112,7 +2113,7 @@ msgstr ""
 "para a codificação %s especificada.\n"
 "Enviá-la como %s?"
 
-#: src/compose.c:5849
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2125,99 +2126,99 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:6081
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr "Aviso de criptografia"
 
-#: src/compose.c:6082
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr "C_ontinuar"
 
-#: src/compose.c:6131
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr "Não existem contas para enviar a mensagem!"
 
-#: src/compose.c:6140
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "A conta selecionada não é NNTP: é impossível enviar a mensagem."
 
-#: src/compose.c:6394
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "O anexo %s não existe mais. Devo ignorar?"
 
-#: src/compose.c:6396 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Cancelar o envio"
 
-#: src/compose.c:6396
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr "Ignorar o anexo"
 
-#: src/compose.c:6452
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr "Parte %s original"
 
-#: src/compose.c:7052
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr "Adicionar ao _Livro de Endereços"
 
-#: src/compose.c:7219
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr "Excluir o conteúdo da entrada"
 
-#: src/compose.c:7223 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Use <tab> para completar automaticamente a partir do Livro de Endereços"
 
-#: src/compose.c:7455
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7461 src/mimeview.c:302 src/plugins/pgpcore/select-keys.c:451
-#: src/prefs_matcher.c:640 src/prefs_summaries.c:612
-#: src/prefs_summary_column.c:84 src/summaryview.c:470
+#: 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
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:7523
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr "Salvar mensagem em "
 
-#: src/compose.c:7554 src/editjpilot.c:276 src/editldap.c:517
-#: src/editvcard.c:192 src/export.c:165 src/import.c:163 src/importmutt.c:238
-#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1081
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
+#: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
+#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:434
+#: src/plugins/spamassassin/spamassassin_gtk.c:437
 msgid "_Browse"
 msgstr "Nav_egar"
 
-#: src/compose.c:7570
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr "Selecione a pasta de salvamento da mensagem"
 
-#: src/compose.c:8027
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "_Cabeçalho"
 
-#: src/compose.c:8032
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "Ane_xos"
 
-#: src/compose.c:8046
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "_Outros"
 
-#: src/compose.c:8061
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "_Assunto:"
 
-#: src/compose.c:8285
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2226,19 +2227,19 @@ msgstr ""
 "Não foi possível iniciar o verificador ortográfico.\n"
 "%s"
 
-#: src/compose.c:8432
+#: src/compose.c:8456
 msgid "_From:"
 msgstr "_De:"
 
-#: src/compose.c:8449
+#: src/compose.c:8473
 msgid "Account to use for this email"
-msgstr "Conta a ser usada por esse e-mail"
+msgstr "Conta a ser usada por esse email"
 
-#: src/compose.c:8451
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr "Endereço do remetente a ser usado"
 
-#: src/compose.c:8633
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2247,73 +2248,109 @@ msgstr ""
 "Não foi possível carregar o sistema de privacidade '%s'. Você não poderá "
 "assinar ou criptografar essa mensagem."
 
-#: src/compose.c:8744 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "_Nenhum"
 
-#: src/compose.c:8845 src/prefs_template.c:751
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "O corpo do modelo possui um erro na linha %d."
 
-#: src/compose.c:8942
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Erro no formato do '%s' do modelo."
 
-#: src/compose.c:9366
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:9381
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:9455
+#: src/compose.c:9479
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:9472
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9505
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:9525
+#: src/compose.c:9550
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:9526
+#: src/compose.c:9551
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:9785
+#: src/compose.c:9646
+#, c-format
+#| msgid ""
+#| "Could not create mbox file:\n"
+#| "%s\n"
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"Não foi possível salvar o corpo da mensagem no arquivo:\n"
+"%s"
+
+#: src/compose.c:9704
 #, c-format
+#| msgid ""
+#| "Could not fork to execute the following command:\n"
+#| "%s\n"
+#| "%s"
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Não foi possível gerar o seguinte comando:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9743
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr "O editor externo encerrou com um erro:%s"
+
+#: src/compose.c:9817
+#, c-format
+#| msgid ""
+#| "The external editor is still working.\n"
+#| "Force terminating the process?\n"
+#| "process group id: %d"
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
 "O editor externo ainda está ativo.\n"
-"Deseja terminar o processo?\n"
-"Id do grupo do processo: %d"
+"Deseja forçar o término do processo?\n"
+"Id do processo: %d"
 
-#: src/compose.c:10258 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "O Claws Mail necessita de acesso à rede para enviar essa mensagem."
 
-#: src/compose.c:10451
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 
-#: src/compose.c:10455
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr "Não foi possível salvar o rascunho"
 
-#: src/compose.c:10456
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2321,24 +2358,24 @@ msgstr ""
 "Não foi possível salvar o rascunho.\n"
 "Deseja cancelar a saída ou descartar essa mensagem?"
 
-#: src/compose.c:10458
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr "_Cancelar a saída"
 
-#: src/compose.c:10458
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr "_Descartar a mensagem"
 
-#: src/compose.c:10647 src/compose.c:10661
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr "Selecione o arquivo"
 
-#: src/compose.c:10675
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 
-#: src/compose.c:10677
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2347,59 +2384,50 @@ msgstr ""
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 
-#: src/compose.c:10756
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr "Descartar a mensagem"
 
-#: src/compose.c:10757
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 
-#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10758 src/compose.c:10763
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr "Salvar em _Rascunhos"
 
-#: src/compose.c:10761 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Salvar alterações"
 
-#: src/compose.c:10762
+#: src/compose.c:10734
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Essa mensagem foi modificada. Deseja salvar as últimas alterações?"
 
-#: src/compose.c:10763
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr "_Não salvar"
 
-#: src/compose.c:10834
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Deseja aplicar o modelo '%s'?"
 
-#: src/compose.c:10836
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr "Aplicar o modelo"
 
-#: src/compose.c:10837 src/prefs_actions.c:330 src/prefs_filtering_action.c:582
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:794 src/prefs_template.c:310
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:11024
-#, c-format
-msgid ""
-"The pasted image has been attached as: \n"
-"%s"
-msgstr ""
-"A imagem colada foi anexada como: \n"
-"%s"
-
-#: src/compose.c:11850
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2412,22 +2440,22 @@ msgstr[0] ""
 "mail?"
 msgstr[1] ""
 "Você deseja inserir o conteúdo dos %d arquivos no corpo da mensagem ou anexá-"
-"los ao e-mail?"
+"los ao email?"
 
-#: src/compose.c:11856
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 
-#: src/compose.c:11857
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr "_Anexar"
 
-#: src/compose.c:12075
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erro no formato da citação, na linha %d."
 
-#: src/compose.c:12371
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2445,7 +2473,7 @@ msgstr "O processo (%ld) do Claws Mail recebeu o sinal %ld"
 msgid "Claws Mail has crashed"
 msgstr "Ocorreu um problema com o Claws Mail"
 
-#: src/crash.c:202
+#: src/crash.c:203
 #, c-format
 msgid ""
 "%s.\n"
@@ -2454,23 +2482,23 @@ msgstr ""
 "%s.\n"
 "Por favor, envie um relatório de erro com as informações abaixo."
 
-#: src/crash.c:207
+#: src/crash.c:208
 msgid "Debug log"
 msgstr "Relatório de depuração"
 
-#: src/crash.c:251 src/toolbar.c:539
+#: src/crash.c:252 src/toolbar.c:539
 msgid "Close"
 msgstr "Fechar"
 
-#: src/crash.c:256
+#: src/crash.c:257
 msgid "Save..."
 msgstr "Salvar..."
 
-#: src/crash.c:261
+#: src/crash.c:262
 msgid "Create bug report"
 msgstr "Criar relatório de erros"
 
-#: src/crash.c:311
+#: src/crash.c:312
 msgid "Save crash information"
 msgstr "Salvar as informações do problema"
 
@@ -2498,7 +2526,7 @@ msgstr ""
 " - Primeiro nome\n"
 " - Sobrenome\n"
 " - Apelido\n"
-" - qualquer endereço de e-mail\n"
+" - qualquer endereço de email\n"
 " - qualquer atributo adicional\n"
 "\n"
 "Clique em Ok para continuar editando esse contato.\n"
@@ -2520,7 +2548,7 @@ msgstr ""
 "uma das informações seguintes seja definida:\n"
 " - Primeiro nome\n"
 " - Sobrenome\n"
-" - qualquer endereço de e-mail\n"
+" - qualquer endereço de email\n"
 " - qualquer atributo adicional\n"
 "\n"
 "Clique em Ok para continuar editando esse contato.\n"
@@ -2532,7 +2560,7 @@ msgstr "Editar os detalhes da pessoa"
 
 #: src/editaddress.c:507
 msgid "An Email address must be supplied."
-msgstr "Você deve informar um endereço de e-mail."
+msgstr "Você deve informar um endereço de email."
 
 #: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
 msgid "A Name and Value must be supplied."
@@ -2546,15 +2574,15 @@ msgstr "Descartar"
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/editaddress.c:851 src/editaddress.c:900
+#: src/editaddress.c:851 src/editaddress.c:901
 msgid "Edit Person Data"
 msgstr "Editar os dados da pessoa"
 
-#: src/editaddress.c:929
+#: src/editaddress.c:930
 msgid "Choose a picture"
 msgstr "Selecione uma imagem"
 
-#: src/editaddress.c:948
+#: src/editaddress.c:949
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2563,58 +2591,58 @@ msgstr ""
 "Não foi possível importar a imagem: \n"
 "%s"
 
-#: src/editaddress.c:990
+#: src/editaddress.c:991
 msgid "_Set picture"
 msgstr "_Definir a imagem"
 
-#: src/editaddress.c:991
+#: src/editaddress.c:992
 msgid "_Unset picture"
 msgstr "_Excluir a imagem"
 
-#: src/editaddress.c:1049
+#: src/editaddress.c:1050
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:516
+#: src/editaddress.c:1097 src/editaddress.c:1099 src/expldifdlg.c:516
 #: src/exporthtml.c:762 src/ldif.c:747
 msgid "Display Name"
 msgstr "Nome exibido"
 
-#: src/editaddress.c:1107 src/editaddress.c:1111 src/ldif.c:755
+#: src/editaddress.c:1108 src/editaddress.c:1112 src/ldif.c:755
 msgid "Last Name"
 msgstr "Sobrenome"
 
-#: src/editaddress.c:1108 src/editaddress.c:1110 src/ldif.c:751
+#: src/editaddress.c:1109 src/editaddress.c:1111 src/ldif.c:751
 msgid "First Name"
 msgstr "Primeiro Nome"
 
-#: src/editaddress.c:1114 src/editaddress.c:1116
+#: src/editaddress.c:1115 src/editaddress.c:1117
 msgid "Nickname"
 msgstr "Apelido"
 
-#: src/editaddress.c:1252 src/editaddress.c:1293
+#: src/editaddress.c:1253 src/editaddress.c:1294
 msgid "Alias"
 msgstr "Pseudônimo"
 
-#: src/editaddress.c:1478 src/editaddress.c:1511 src/editaddress.c:1527
+#: src/editaddress.c:1479 src/editaddress.c:1512 src/editaddress.c:1528
 #: src/editaddress_other_attributes_ldap.c:376
-#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:222
+#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:223
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1593
+#: src/editaddress.c:1594
 msgid "_User Data"
 msgstr "Dados do _usuário"
 
-#: src/editaddress.c:1594
+#: src/editaddress.c:1595
 msgid "_Email Addresses"
-msgstr "Endereços de _e-mail"
+msgstr "Endereços de _email"
 
-#: src/editaddress.c:1597 src/editaddress.c:1600
+#: src/editaddress.c:1598 src/editaddress.c:1601
 msgid "O_ther Attributes"
 msgstr "Outros _atributos"
 
-#: src/editaddress.c:1768
+#: src/editaddress.c:1769
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2635,21 +2663,21 @@ msgstr "O arquivo não parece estar em um formato de Livro de Endereços válido
 msgid "Could not read file."
 msgstr "Não foi possível ler o arquivo."
 
-#: src/editbook.c:149 src/editbook.c:262
+#: src/editbook.c:149 src/editbook.c:263
 msgid "Edit Addressbook"
 msgstr "Editar o Livro de Endereço"
 
-#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
+#: src/editbook.c:178 src/editjpilot.c:264 src/editvcard.c:181
 msgid " Check File "
 msgstr " Verificar o arquivo "
 
-#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2181
+#: 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
 msgid "File"
 msgstr "Arquivo"
 
-#: src/editbook.c:281
+#: src/editbook.c:282
 msgid "Add New Addressbook"
 msgstr "Adicionar um novo Livro de Endereços"
 
@@ -2661,44 +2689,44 @@ msgstr "Você deve informar um nome para o grupo."
 msgid "Edit Group Data"
 msgstr "Editar os dados do grupo"
 
-#: src/editgroup.c:325 src/exporthtml.c:598
+#: src/editgroup.c:326 src/exporthtml.c:598
 msgid "Group Name"
 msgstr "Nome do grupo"
 
-#: src/editgroup.c:344
+#: src/editgroup.c:345
 msgid "Addresses in Group"
 msgstr "Endereços no grupo"
 
-#: src/editgroup.c:378
+#: src/editgroup.c:379
 msgid "Available Addresses"
 msgstr "Endereços disponíveis"
 
-#: src/editgroup.c:452
+#: src/editgroup.c:453
 msgid "Move Email Addresses to or from Group with arrow buttons"
-msgstr "Mover os endereços de e-mail do ou para o grupo com botões de setas"
+msgstr "Mover os endereços de email do ou para o grupo com botões de setas"
 
-#: src/editgroup.c:500
+#: src/editgroup.c:501
 msgid "Edit Group Details"
 msgstr "Editar os detalhes do grupo"
 
-#: src/editgroup.c:503
+#: src/editgroup.c:504
 msgid "Add New Group"
 msgstr "Adicionar um novo grupo"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:553
 msgid "Edit folder"
 msgstr "Editar a pasta"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:553
 msgid "Input the new name of folder:"
 msgstr "Digite o novo nome da pasta:"
 
-#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c: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
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
@@ -2717,7 +2745,7 @@ msgstr "Editar a entrada JPilot"
 
 #: src/editjpilot.c:281
 msgid "Additional e-Mail address item(s)"
-msgstr "Item(ns) adicional(is) do endereço de e-mail"
+msgstr "Item(ns) adicional(is) do endereço de email"
 
 #: src/editjpilot.c:372
 msgid "Add New JPilot Entry"
@@ -2727,32 +2755,32 @@ msgstr "Adicionar uma nova entrada JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Selecionar a base de pesquisa"
 
-#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2933
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Endereço do servidor"
 
-#: src/editldap_basedn.c:182 src/editldap.c:457
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2940
+#: 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
 msgid "Port"
 msgstr "Porta"
 
-#: src/editldap_basedn.c:192 src/editldap.c:501
+#: src/editldap_basedn.c:193 src/editldap.c:502
 msgid "Search Base"
 msgstr "Base de pesquisa"
 
-#: src/editldap_basedn.c:220
+#: src/editldap_basedn.c:221
 msgid "Available Search Base(s)"
 msgstr "Base(s) de pesquisa disponíveis"
 
-#: src/editldap_basedn.c:326
+#: src/editldap_basedn.c:327
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "Não foi possível ler a(s) base(s) de pesquisa do servidor - por favor, "
 "defina manualmente"
 
-#: src/editldap_basedn.c:330 src/editldap.c:281
+#: src/editldap_basedn.c:331 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "Não foi possível conectar ao servidor"
 
@@ -2772,15 +2800,15 @@ msgstr "Você deve informar ao menos um atributo de pesquisa no LDAP."
 msgid "Connected successfully to server"
 msgstr "A conexão com o servidor foi bem sucedida"
 
-#: src/editldap.c:335 src/editldap.c:990
+#: src/editldap.c:335 src/editldap.c:991
 msgid "Edit LDAP Server"
 msgstr "Editar o servidor LDAP"
 
-#: src/editldap.c:436
+#: src/editldap.c:437
 msgid "A name that you wish to call the server."
 msgstr "O nome pelo qual você deseja chamar o servidor."
 
-#: src/editldap.c:449
+#: src/editldap.c:450
 msgid ""
 "This is the hostname of the server. For example, \"ldap.example.org\" may be "
 "appropriate for the \"example.org\" organization. An IP address may also be "
@@ -2792,15 +2820,15 @@ msgstr ""
 "endereço IP. Você deve especificar \"localhost\" se estiver executando um "
 "servidor LDAP no mesmo computador que o Claws Mail."
 
-#: src/editldap.c:468
+#: src/editldap.c:469
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:469 src/prefs_account.c:3854
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: src/editldap.c:473
+#: src/editldap.c:474
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2812,7 +2840,7 @@ msgstr ""
 "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:478
+#: 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 "
@@ -2822,19 +2850,19 @@ msgstr ""
 "se efetue, certifique-se de verificar a configuração correta em ldap.conf "
 "(campos TLS_CACERTDIR e TLS_REQCERT)."
 
-#: src/editldap.c:490
+#: src/editldap.c:491
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "O número da porta de conexão com o servidor. A porta 389 é o padrão."
 
-#: src/editldap.c:493
+#: src/editldap.c:494
 msgid " Check Server "
 msgstr " Verificar Servidor "
 
-#: src/editldap.c:497
+#: src/editldap.c:498
 msgid "Press this button to test the connection to the server."
 msgstr "Pressione esse botão para testar a conexão com o servidor."
 
-#: src/editldap.c:510
+#: src/editldap.c:511
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2848,7 +2876,7 @@ msgstr ""
 "  ou=pessoas,dc=domínio,dc=com\n"
 "  o=nome da organização,c=país\n"
 
-#: src/editldap.c:521
+#: src/editldap.c:522
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
@@ -2856,11 +2884,11 @@ msgstr ""
 "Pressione esse botão para procurar pelos nomes dos diretórios disponíveis no "
 "servidor."
 
-#: src/editldap.c:577
+#: src/editldap.c:578
 msgid "Search Attributes"
 msgstr "Atributos da pesquisa"
 
-#: src/editldap.c:586
+#: src/editldap.c:587
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
@@ -2868,11 +2896,11 @@ msgstr ""
 "Uma lista dos nomes dos atributos LDAP que devem ser pesquisados ao se "
 "tentar encontrar um nome ou endereço."
 
-#: src/editldap.c:589
+#: src/editldap.c:590
 msgid " Defaults "
 msgstr " Padrões "
 
-#: src/editldap.c:593
+#: src/editldap.c:594
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
@@ -2881,11 +2909,11 @@ msgstr ""
 "encontrar mais nomes e endereços durante o processo de pesquisa do nome ou "
 "endereço."
 
-#: src/editldap.c:599
+#: src/editldap.c:600
 msgid "Max Query Age (secs)"
 msgstr "Duração máxima da consulta (s)"
 
-#: src/editldap.c:613
+#: src/editldap.c:614
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2910,11 +2938,11 @@ msgstr ""
 "recurso útil em servidores que possuem tempo de resposta lentos, mas, em "
 "compensação, consome mais memória para armazenar os resultados."
 
-#: src/editldap.c:630
+#: src/editldap.c:631
 msgid "Include server in dynamic search"
 msgstr "Incluir o servidor na pesquisa dinâmica"
 
-#: src/editldap.c:635
+#: src/editldap.c:636
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2922,11 +2950,11 @@ msgstr ""
 "Selecione essa opção para incluir esse servidor nas pesquisas dinâmicas, "
 "quando estiver usando a complementação do endereço."
 
-#: src/editldap.c:641
+#: src/editldap.c:642
 msgid "Match names 'containing' search term"
 msgstr "Encontrar nomes que 'contenham' o termo da pesquisa"
 
-#: src/editldap.c:646
+#: 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\" "
@@ -2941,11 +2969,11 @@ msgstr ""
 "com\" para todas as pesquisas, ao contrário das outras interfaces de "
 "endereço."
 
-#: src/editldap.c:709
+#: src/editldap.c:710
 msgid "Bind DN"
 msgstr "DN associado"
 
-#: src/editldap.c:718
+#: src/editldap.c:719
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2957,54 +2985,54 @@ msgstr ""
 "nome é: \"cn=usuário,dc=claws-mail,dc=com\". Isso normalmente é deixado em "
 "branco durante as pesquisas."
 
-#: src/editldap.c:725
+#: src/editldap.c:726
 msgid "Bind Password"
 msgstr "Senha associada"
 
-#: src/editldap.c:735
+#: src/editldap.c:736
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 "A senha a ser usada quando se conectar como usuário o \"DN associado\"."
 
-#: src/editldap.c:738 src/prefs_account.c:1405 src/prefs_account.c:2026
-#: src/prefs_account.c:2745 src/prefs_account.c:2773 src/prefs_account.c:2978
+#: 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
 msgid "Show password"
 msgstr "Exibir a senha"
 
-#: src/editldap.c:747
+#: src/editldap.c:748
 msgid "Timeout (secs)"
 msgstr "Limite de tempo (s)"
 
-#: src/editldap.c:760
+#: src/editldap.c:761
 msgid "The timeout period in seconds."
 msgstr "O limite de tempo em segundos."
 
-#: src/editldap.c:764
+#: src/editldap.c:765
 msgid "Maximum Entries"
 msgstr "Número máximo de entradas"
 
-#: src/editldap.c:777
+#: src/editldap.c:778
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 "O número máximo de entradas que devem ser apresentadas como resultado da "
 "pesquisa."
 
-#: src/editldap.c:792 src/prefs_account.c:3745
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr "Básico"
 
-#: src/editldap.c:794 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "Extendido"
 
-#: src/editldap.c:995
+#: src/editldap.c:996
 msgid "Add New LDAP Server"
 msgstr "Adicionar um novo Servidor LDAP"
 
-#: src/edittags.c:192 src/prefs_filtering_action.c:1402
-#: src/prefs_summaries.c:619
+#: src/edittags.c:192 src/prefs_filtering_action.c:1403
+#: src/prefs_summaries.c:640
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -3038,11 +3066,11 @@ msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Aplicar etiquetas"
 
-#: src/edittags.c:566
+#: src/edittags.c:567
 msgid "New tag:"
 msgstr "Nova etiqueta:"
 
-#: src/edittags.c:599
+#: src/edittags.c:600
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr ""
 "Por favor, selecione as etiquetas a serem aplicadas/removidas. As mudanças "
@@ -3056,11 +3084,11 @@ msgstr "O arquivo não parece estar no formato vCard."
 msgid "Select vCard File"
 msgstr "Selecionar o arquivo vCard"
 
-#: src/editvcard.c:152 src/editvcard.c:256
+#: src/editvcard.c:152 src/editvcard.c:257
 msgid "Edit vCard Entry"
 msgstr "Editar a entrada vCard"
 
-#: src/editvcard.c:261
+#: src/editvcard.c:262
 msgid "Add New vCard Entry"
 msgstr "Adicionar uma nova entrada vCard"
 
@@ -3128,7 +3156,7 @@ msgstr "Selecione o arquivo HTML de saída"
 msgid "HTML Output File"
 msgstr "Arquivo HTML de saída"
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:172 src/import.c:170
+#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:173 src/import.c:171
 #: src/importldif.c:568
 msgid "B_rowse"
 msgstr "Explo_rar"
@@ -3138,16 +3166,16 @@ msgid "Stylesheet"
 msgstr "Folha de Estilo"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
-#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:123 src/mainwindow.c:1181
+#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1040
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6289
+#: 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
 msgid "None"
 msgstr "Nenhum"
 
 #: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
 #: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
-#: src/prefs_other.c:128 src/prefs_other.c:416
+#: src/prefs_other.c:129 src/prefs_other.c:417
 msgid "Default"
 msgstr "Padrão"
 
@@ -3190,7 +3218,7 @@ msgstr "Faixa de cores"
 
 #: src/exphtmldlg.c:488
 msgid "Format Email Links"
-msgstr "Formatar os links do e-mail"
+msgstr "Formatar os links do email"
 
 #: src/exphtmldlg.c:494
 msgid "Format User Attributes"
@@ -3212,11 +3240,11 @@ msgstr "Abrir com o navegador Web"
 msgid "Export Address Book to HTML File"
 msgstr "Exportar o Livro de Endereços para um arquivo HTML"
 
-#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:979
+#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:980
 msgid "File Info"
 msgstr "Informações do arquivo"
 
-#: src/exphtmldlg.c:657
+#: src/exphtmldlg.c:658
 msgid "Format"
 msgstr "Formato"
 
@@ -3229,8 +3257,8 @@ msgstr ""
 #: src/expldifdlg.c:110
 msgid "Specify parameters to format distinguished name."
 msgstr ""
-"Especifique os parâmetros para formatar o nome distinto ('distinguished "
-"name')."
+"Especifique os parâmetros para formatar o \"Distinguished "
+"Name\"."
 
 #: src/expldifdlg.c:187
 #, c-format
@@ -3304,7 +3332,7 @@ msgid ""
 "formatted similar to:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"O primeiro endereço de e-mail pertencente a uma pessoa  é usado para criar "
+"O primeiro endereço de email pertencente a uma pessoa  é usado para criar "
 "um DN que tem um formato similar a:\n"
 "  mail=fulano.tal at dominio.com,ou=pessoas,dc=claws-mail,dc=org"
 
@@ -3320,8 +3348,8 @@ msgid ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
-"O sufixo é usado para criar um \"Nome Distinto\" (\"Distinguished Name\" ou, "
-"simplesmente, DN) para uma entrada LDAP. Como exemplos, temos:\n"
+"O sufixo é usado para criar um \"Distinguished Name\" (ou DN) para uma "
+"entrada LDAP. Como exemplos, temos:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=pessoas,dc=nome do domínio,dc=com\n"
 "  o=nome da organização,c=país\n"
@@ -3342,12 +3370,12 @@ msgid ""
 "Distinguished Name\" (or RDN) to create the DN. Please select one of the "
 "available RDN options that will be used to create the DN."
 msgstr ""
-"O arquivo LDIF contém vários registros que são geralmente carregados em um "
-"servidor LDAP. Cada registro no arquivo LDIF é identificado com "
-"exclusividade por um \"Nome DIstinto\" (Distinguished Name ou DN). O sufixo "
-"é adicionado ao \"Nome Distinto Relativo\" (Relative Distinguished Name ou "
-"RDN) para criar o DN. Por favor, selecione uma das opções de RDN disponíveis "
-"que serão utilizadas para criar o DN."
+"O arquivo LDIF contém vários registros que são geralmente carregados em "
+"um servidor LDAP. Cada registro no arquivo LDIF é identificado com "
+"exclusividade por um \"Distinguished Name\" (ou DN). O sufixo é adicionado "
+"ao \"Relative Distinguished Name\" (ou RDN) para criar o DN. Por favor, "
+"selecione uma das opções de RDN disponíveis que serão utilizadas para criar "
+"o DN."
 
 #: src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
@@ -3361,64 +3389,64 @@ msgid ""
 "above will be used if the DN user attribute is not found."
 msgstr ""
 "O Livro de Endereços pode conter entradas importadas previamente de um "
-"arquivo LDIF. Caso o atributo de usuário \"Nome Distinto\" (DN) esteja "
+"arquivo LDIF. Caso o atributo de usuário \"Distinguished Name\" (DN) esteja "
 "presente nos dados do Livro de Endereços, ele pode ser usado no arquivo LDIF "
 "exportado. O RDN selecionado acima será usado se o atributo de usuário DN "
 "não for encontrado."
 
 #: src/expldifdlg.c:558
 msgid "Exclude record if no Email Address"
-msgstr "Excluir os registros que não possuam endereço de e-mail"
+msgstr "Excluir os registros que não possuam endereço de email"
 
 #: src/expldifdlg.c:563
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
 msgstr ""
-"Um Livro de Endereços pode conter entradas sem um endereço de e-mail. Marque "
+"Um Livro de Endereços pode conter entradas sem um endereço de email. Marque "
 "essa opção para ignorar estes registros."
 
 #: src/expldifdlg.c:655
 msgid "Export Address Book to LDIF File"
 msgstr "Exportar o Livro de Endereços para um arquivo LDIF"
 
-#: src/expldifdlg.c:721
+#: src/expldifdlg.c:722
 msgid "Distinguished Name"
-msgstr "Nome Distinto (dn)"
+msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8504
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr "Exporta para arquivo mbox"
 
-#: src/export.c:131
+#: src/export.c:132
 msgid "Locate the folder to export and specify the mbox file."
 msgstr "Localize a pasta a ser exportada e especifique o arquivo mbox."
 
-#: src/export.c:142
+#: src/export.c:143
 msgid "Source folder:"
 msgstr "Pasta de origem:"
 
-#: src/export.c:148 src/import.c:142
+#: src/export.c:149 src/import.c:143
 msgid "Mbox file:"
 msgstr "Arquivo mbox:"
 
-#: src/export.c:204
+#: src/export.c:205
 msgid "Target mbox filename can't be left empty."
 msgstr "O nome do arquivo mbox de destino não pode ser deixado em branco."
 
-#: src/export.c:209
+#: src/export.c:210
 msgid "Source folder can't be left empty."
 msgstr "A pasta de origem não pode ser deixada em branco."
 
-#: src/export.c:222
+#: src/export.c:223
 msgid "Couldn't find the source folder."
 msgstr "Não foi possível encontrar a pasta de origem."
 
-#: src/export.c:246
+#: src/export.c:247
 msgid "Select exporting file"
 msgstr "Selecione arquivo de exportação"
 
-#: src/export.c:269
+#: src/export.c:270
 msgid "Select folder to export"
 msgstr "Selecionar a pasta a ser exportada"
 
@@ -3426,7 +3454,7 @@ msgstr "Selecionar a pasta a ser exportada"
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: src/exporthtml.c:772 src/importldif.c:980
+#: src/exporthtml.c:772 src/importldif.c:981
 #: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "Atributos"
@@ -3451,18 +3479,18 @@ msgstr "O nome é muito longo."
 msgid "Not specified."
 msgstr "Não especificado."
 
-#: 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 ""
 "O arquivo %s não foi encontrado. Deseja usar o arquivo de backup de %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 "Não foi possível copiar %s para %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 "
@@ -3570,51 +3598,51 @@ msgstr "não foi possível aplicar a ação\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "não outro processamento após a ação [ %s ]\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "regra de processamento '%s' [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "regra de processamento <sem nome> [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "regra desabilitada '%s' [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "regra desabilitada <sem nome> [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "indeterminado"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "incorporação"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "manualmente"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "processamento da pasta"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "pré-processamento"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "pós-processamento"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3631,11 +3659,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3670,48 +3698,52 @@ msgstr "Rascunhos"
 msgid "Processing (%s)...\n"
 msgstr "Processando (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s para %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movendo %s para %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Atualizando o cache para %s ..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "Processando as mensagens..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso desconectado...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr "O nome da pasta não pode começar ou terminar com um ponto."
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "O nome da pasta não pode terminar com um ponto."
 
-#: src/foldersel.c:249
+#: src/foldersel.c:251
 msgid "Select folder"
 msgstr "Selecione a pasta"
 
-#: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: 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
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:580 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:576 src/imap_gtk.c:198 src/mh_gtk.c:147
+msgid "Inherit properties and processing rules from parent folder"
+msgstr "Propriedades e regras de processamento herdadas da pasta superior"
+
+#: 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
@@ -3720,7 +3752,7 @@ msgstr "NovaPasta"
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' não pode ser incluído no nome da pasta."
 
-#: src/foldersel.c:595 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: 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
@@ -3728,7 +3760,7 @@ msgstr "'%c' não pode ser incluído no nome da pasta."
 msgid "The folder '%s' already exists."
 msgstr "A pasta '%s' já existe."
 
-#: src/foldersel.c:602 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:608 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
@@ -3777,13 +3809,13 @@ msgstr "Definir colunas visíveis"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6563
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr "Nova"
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6565
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Não lida"
@@ -3794,7 +3826,7 @@ msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:453 src/summaryview.c:471
+#: src/folderview.c:453 src/summaryview.c:473
 msgid "#"
 msgstr "#"
 
@@ -3802,7 +3834,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Configurando as informações da pasta..."
 
-#: src/folderview.c:868 src/summaryview.c:4308
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 
@@ -3814,11 +3846,11 @@ msgstr ""
 "Deseja realmente marcar todas as mensagens dessa pasta e suas sub-pastas "
 "como lidas?"
 
-#: src/folderview.c:871 src/summaryview.c:4309
+#: src/folderview.c:871 src/summaryview.c:4292
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Deseja realmente marcar todas as mensagens dessa pasta como lidas?"
 
-#: src/folderview.c:874 src/summaryview.c:4354
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr "Marcar todas como não lidas"
 
@@ -3830,16 +3862,16 @@ msgstr ""
 "Deseja realmente marcar todas as mensagens dessa pasta e suas sub-pastas "
 "como não lidas?"
 
-#: src/folderview.c:877 src/summaryview.c:4355
+#: src/folderview.c:877 src/summaryview.c:4338
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Deseja realmente marcar todas as mensagens dessa pasta como não lidas?"
 
-#: src/folderview.c:1067 src/imap.c:4637
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Vasculhando a pasta %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4641 src/mainwindow.c:5290 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Vasculhando a pasta %s..."
@@ -3898,7 +3930,7 @@ msgstr "Excluir todas as mensagens da Lixeira?"
 msgid "_Empty trash"
 msgstr "_Esvaziar a Lixeira"
 
-#: src/folderview.c:2532 src/inc.c:1662 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Aviso de modo desconectado"
 
@@ -3918,7 +3950,7 @@ msgstr "Enviar todas as mensagens da Fila de Saída?"
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocorreram erros durante o envio das mensagens da Fila de Saída."
 
-#: src/folderview.c:2557 src/main.c:2811 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3984,17 +4016,17 @@ msgstr "Não foi possível mover!"
 msgid "Processing configuration for folder %s"
 msgstr "Configuração de processamento da pasta %s"
 
-#: src/folderview.c:3175 src/summaryview.c:4763 src/summaryview.c:4869
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr "A pasta de destino só pode ser usada para armazenar sub-pastas."
 
 #: src/grouplistdialog.c:161
 msgid "Newsgroup subscription"
-msgstr "Assinatura de newsgroup"
+msgstr "Inscrição em newsgroup"
 
 #: src/grouplistdialog.c:178
 msgid "Select newsgroups for subscription:"
-msgstr "Selecione os newsgroups para assinar:"
+msgstr "Selecione os newsgroups para se inscrever:"
 
 #: src/grouplistdialog.c:184
 msgid "Find groups:"
@@ -4030,15 +4062,15 @@ msgstr "somente leitura"
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/grouplistdialog.c:421
+#: src/grouplistdialog.c:424
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista do newsgroup."
 
-#: src/grouplistdialog.c:458 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr "Pronto."
 
-#: src/grouplistdialog.c:491
+#: src/grouplistdialog.c:494
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroups recebidos (%s lidos)"
@@ -4046,7 +4078,7 @@ msgstr "%d newsgroups recebidos (%s lidos)"
 #: src/gtk/about.c:133
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr ""
-"O Claws Mail é um cliente de e-mail leve, rápido e altamente configurável."
+"O Claws Mail é um cliente de email leve, rápido e altamente configurável."
 
 #: src/gtk/about.c:136
 msgid "For further information visit the Claws Mail website:"
@@ -4056,8 +4088,8 @@ msgstr "Para maiores informações, visite o site do Claws Mail:"
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
-"Para suporte e discussões, assine a lista de discussão de usuários do Claws "
-"Mail:"
+"Para suporte e discussões, inscreva-se na lista de discussão de usuários do "
+"Claws Mail:"
 
 #: src/gtk/about.c:147
 msgid ""
@@ -4067,13 +4099,17 @@ msgstr ""
 "O Claws Mail é um software livre liberado sob a licença GPL. Se você deseja "
 "fazer doações para o projeto do Claws Mail, você pode fazê-lo em:"
 
-#: src/gtk/about.c:163 src/gtk/about.c:851
+#: src/gtk/about.c:163 src/gtk/about.c:852
+#| msgid ""
+#| "Copyright (C) 1999-2019\n"
+#| "The Claws Mail Team\n"
+#| "and Hiroyuki Yamamoto"
 msgid ""
-"Copyright (C) 1999-2019\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2019\n"
+"Copyright (C) 1999-2021\n"
 "A Equipe do Claws Mail\n"
 "e Hiroyuki Yamamoto"
 
@@ -4228,44 +4264,44 @@ msgstr ""
 "Você deve ter recebido uma cópia da GNU General Public License juntamente "
 "com este programa. Caso contrário, veja "
 
-#: src/gtk/about.c:718 src/main.c:2635
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr "Estatísticas da sessão\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2645 src/main.c:2648
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr "Início: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2654
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr "Tráfego de entrada\n"
 
-#: src/gtk/about.c:741 src/main.c:2657
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mensagens recebidas: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2663
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr "Tráfego de saída\n"
 
-#: src/gtk/about.c:751 src/main.c:2666
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Mensagens novas/redirecionadas: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2670
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Mensagens respondidas: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2674
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Mensagens encaminhadas: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2678
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total de mensagens enviadas: %d\n"
@@ -4274,27 +4310,27 @@ msgstr "Total de mensagens enviadas: %d\n"
 msgid "About Claws Mail"
 msgstr "Sobre o Claws Mail"
 
-#: src/gtk/about.c:865
+#: src/gtk/about.c:866
 msgid "_Info"
 msgstr "_Informação"
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:872
 msgid "_Authors"
 msgstr "_Autores"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:878
 msgid "_Features"
 msgstr "_Recursos"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:884
 msgid "_License"
 msgstr "_Licença"
 
-#: src/gtk/about.c:891
+#: src/gtk/about.c:892
 msgid "_Release Notes"
 msgstr "_Notas do lançamento"
 
-#: src/gtk/about.c:897
+#: src/gtk/about.c:898
 msgid "_Statistics"
 msgstr "_Estatísticas"
 
@@ -4362,13 +4398,13 @@ msgstr "Magenta"
 msgid "Set mailbox order"
 msgstr "Configure a ordem da caixa postal"
 
-#: src/gtk/foldersort.c:276
+#: src/gtk/foldersort.c:277
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 "Mova as caixas postais para cima ou para baixo para mudar a ordem na lista "
 "de pastas."
 
-#: src/gtk/foldersort.c:310
+#: src/gtk/foldersort.c:311
 msgid "Mailboxes"
 msgstr "Caixas postais"
 
@@ -4477,26 +4513,26 @@ msgstr ""
 "O verificador ortográfico não conseguiu trocar o dicionário alternativo.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1862
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "Falha: não foi encontrado nenhum registro do serviço."
 
-#: src/gtk/gtkutils.c:1865
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "Falha: erro de rede."
 
-#: src/gtk/gtkutils.c:1868
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Falha: erro desconhecido (%d)."
 
-#: src/gtk/gtkutils.c:1938
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "Configurando..."
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1224
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2213 src/prefs_summaries.c:613
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:469
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
+#: src/prefs_matcher.c:646 src/prefs_matcher.c:2217 src/prefs_summaries.c:634
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:471
 msgid "Date"
 msgstr "Data"
 
@@ -4504,13 +4540,13 @@ msgstr "Data"
 msgid "Date:"
 msgstr "Data:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1221
-#: src/prefs_matcher.c:2210 src/prefs_summaries.c:615
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:467
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1222
+#: src/prefs_matcher.c:2214 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:469
 msgid "From"
 msgstr "De"
 
-#: src/gtk/headers.h:10 src/summary_search.c:414
+#: src/gtk/headers.h:10 src/summary_search.c:415
 msgid "From:"
 msgstr "De:"
 
@@ -4526,14 +4562,14 @@ msgstr "Remetente:"
 msgid "Reply-To"
 msgstr "Responder para"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1222
-#: src/prefs_matcher.c:2211 src/prefs_summaries.c:616
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:468
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1223
+#: src/prefs_matcher.c:2215 src/prefs_summaries.c:637
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:470
 msgid "To"
 msgstr "Para"
 
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1223
-#: src/prefs_matcher.c:2212 src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
+#: src/prefs_matcher.c:2216 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4541,8 +4577,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Cco"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:2214 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
+#: src/prefs_matcher.c:2218 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "ID da Mensagem"
 
@@ -4554,8 +4590,8 @@ msgstr "ID da Mensagem:"
 msgid "In-Reply-To"
 msgstr "Respondendo a"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1227
-#: src/prefs_matcher.c:2216 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
+#: src/prefs_matcher.c:2220 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referências"
 
@@ -4563,14 +4599,14 @@ msgstr "Referências"
 msgid "References:"
 msgstr "Referências:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1220
-#: src/prefs_matcher.c:2209 src/prefs_summaries.c:617
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:466
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1221
+#: src/prefs_matcher.c:2213 src/prefs_summaries.c:638
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:468
 msgid "Subject"
 msgstr "Assunto"
 
 #: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
-#: src/summary_search.c:428
+#: src/summary_search.c:429
 msgid "Subject:"
 msgstr "Assunto:"
 
@@ -4662,8 +4698,8 @@ msgstr "Recebido"
 msgid "Received:"
 msgstr "Recebido:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1226
-#: src/prefs_matcher.c:2215 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1227
+#: src/prefs_matcher.c:2219 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
@@ -4688,9 +4724,9 @@ msgid "Seen:"
 msgstr "Visualizado:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:190 src/prefs_summaries.c:621
+#: 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:2918
+#: src/summaryview.c:2898
 msgid "Status"
 msgstr "Status"
 
@@ -4724,17 +4760,17 @@ msgstr "Destinatário da confirmação de recebimento:"
 
 #: src/gtk/headers.h:41
 msgid "User-Agent"
-msgstr "Cliente de e-mail do remetente"
+msgstr "Cliente de email do remetente"
 
 #: src/gtk/headers.h:41
 msgid "User-Agent:"
-msgstr "Cliente de e-mail do remetente:"
+msgstr "Cliente de email do remetente:"
 
 #: src/gtk/headers.h:42
 msgid "Content-Type"
 msgstr "Formato do conteúdo"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:338
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr "Formato do conteúdo:"
 
@@ -4762,7 +4798,7 @@ msgstr "Precedência"
 msgid "Precedence:"
 msgstr "Precedência:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "Organização"
 
@@ -4788,19 +4824,19 @@ msgstr "Envio para a lista:"
 
 #: src/gtk/headers.h:50
 msgid "List-Subscribe"
-msgstr "Assinar a lista"
+msgstr "Inscrição na lista"
 
 #: src/gtk/headers.h:50
 msgid "List-Subscribe:"
-msgstr "Assinar a lista:"
+msgstr "Inscrição na lista:"
 
 #: src/gtk/headers.h:51
 msgid "List-Unsubscribe"
-msgstr "Cancelar a assinatura da lista"
+msgstr "Cancelar a inscrição na lista"
 
 #: src/gtk/headers.h:51
 msgid "List-Unsubscribe:"
-msgstr "Cancelar a assinatura da lista:"
+msgstr "Cancelar a inscrição na lista:"
 
 #: src/gtk/headers.h:52
 msgid "List-Help"
@@ -4836,11 +4872,11 @@ msgstr "Rótulo definido pelo usuário:"
 
 #: src/gtk/headers.h:57
 msgid "X-Mailer"
-msgstr "Cliente de e-mail do rementente"
+msgstr "Cliente de email do rementente"
 
 #: src/gtk/headers.h:57
 msgid "X-Mailer:"
-msgstr "Cliente de e-mail do rementente:"
+msgstr "Cliente de email do rementente:"
 
 #: src/gtk/headers.h:58
 msgid "X-Status"
@@ -4980,13 +5016,13 @@ msgstr "Pasta IMAP que contém somente sub-pastas"
 
 #: src/gtk/icon_legend.c:93
 msgid "IMAP mailbox showing only subscribed folders"
-msgstr "Caixa postal IMAP exibindo apenas pastas assinadas"
+msgstr "Caixa postal IMAP exibindo apenas pastas inscritas"
 
 #: src/gtk/icon_legend.c:127
 msgid "Icon Legend"
 msgstr "Texto do ícone"
 
-#: src/gtk/icon_legend.c:145
+#: src/gtk/icon_legend.c:146
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr ""
@@ -5020,19 +5056,19 @@ msgstr "Lembrar a senha para essa sessão"
 msgid "Remember this"
 msgstr "Lembrar disso"
 
-#: src/gtk/logwindow.c:449
+#: src/gtk/logwindow.c:450
 msgid "_Go to last error"
 msgstr "Ir para o último _erro"
 
-#: src/gtk/logwindow.c:456
+#: src/gtk/logwindow.c:457
 msgid "Clear _Log"
 msgstr "Limpar _relatório"
 
-#: src/gtk/menu.c:135
+#: src/gtk/menu.c:139
 msgid "Warning:"
 msgstr "Aviso:"
 
-#: src/gtk/menu.c:136
+#: src/gtk/menu.c:140
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5085,7 +5121,8 @@ msgstr ""
 #: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
-#: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/libravatar/libravatar_prefs.c:563
+#: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
@@ -5098,43 +5135,43 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/spamassassin/spamassassin_gtk.c:673
 #: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gtk/pluginwindow.c:336
+#: src/gtk/pluginwindow.c:337
 msgid "_Load..."
 msgstr "_Carregar..."
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:338
 msgid "_Unload"
 msgstr "_Descarregar"
 
-#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:235
+#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:237
 msgid "Description"
 msgstr "Descrição"
 
-#: src/gtk/pluginwindow.c:375
+#: src/gtk/pluginwindow.c:376
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
 "Para maiores informações sobre os plugins, dê uma olhada no %ssite web do "
 "Claws Mail%s."
 
-#: src/gtk/pluginwindow.c:416
+#: src/gtk/pluginwindow.c:417
 msgid "Click here to load one or more plugins"
 msgstr "Clique aqui para transferir um ou mais plugins"
 
-#: src/gtk/pluginwindow.c:419
+#: src/gtk/pluginwindow.c:420
 msgid "Unload the selected plugin"
 msgstr "Descarregar o plugin selecionado"
 
-#: src/gtk/pluginwindow.c:484
+#: src/gtk/pluginwindow.c:485
 msgid "Loaded plugins"
 msgstr "Plugins carregados"
 
-#: src/gtk/prefswindow.c:639
+#: src/gtk/prefswindow.c:640
 msgid "Page Index"
 msgstr "Índice"
 
@@ -5142,12 +5179,12 @@ msgstr "Índice"
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:693
-#: src/prefs_account.c:3744 src/prefs_account.c:3762 src/prefs_account.c:3780
-#: src/prefs_account.c:3798 src/prefs_account.c:3816 src/prefs_account.c:3834
-#: src/prefs_account.c:3853 src/prefs_account.c:3946 src/prefs_account.c:3964
-#: src/prefs_filtering_action.c:1379 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1883
+#: 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
 msgid "Account"
 msgstr "Conta"
 
@@ -5359,7 +5396,7 @@ msgstr ""
 "todas as expressões de filtragem são permitidas, mas não podem ser "
 "combinadas através de operadores lógicos com as expressões acima"
 
-#: src/gtk/quicksearch.c:535 src/summary_search.c:461
+#: src/gtk/quicksearch.c:535 src/summary_search.c:462
 msgid "Extended Search"
 msgstr "Pesquisa Extendida"
 
@@ -5374,64 +5411,64 @@ msgstr ""
 "mensagens.\n"
 "Os seguintes símbolos podem ser usados:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 "Ocorreu algum problema durante a pesquisa. Por favor, verifique seus "
 "relatórios."
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr "De/Para/Cc/Assunto/Etiqueta"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Recursivo"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "Manter filtro"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "Pesquisar enquanto digita"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "Executar na seleção"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "Limpar a pesquisa atual"
 
-#: src/gtk/quicksearch.c:790 src/summary_search.c:412
+#: src/gtk/quicksearch.c:787 src/summary_search.c:413
 msgid "Edit search criteria"
 msgstr "Editar os critérios da pesquisa"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr "Informação sobre os símbolos extendidos"
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr "_Informação"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr "E_ditar"
 
-#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:348
-#: src/prefs_filtering.c:495 src/prefs_template.c:329
+#: src/gtk/quicksearch.c:836 src/gtk/quicksearch.c:860 src/prefs_actions.c:349
+#: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "_Limpar"
 
-#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:300
+#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:301
 #, c-format
 msgid "Correct%s"
 msgstr "Correto%s"
 
 #: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
-#: src/ssl_manager.c:300 src/ssl_manager.c:304
+#: src/ssl_manager.c:301 src/ssl_manager.c:305
 msgid " (expired)"
 msgstr " (expirado)"
 
@@ -5584,225 +5621,225 @@ msgstr "Etiquetas:"
 
 #: 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:3519
-#: src/summaryview.c:3537 src/summaryview.c:3576
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3499
+#: src/summaryview.c:3517 src/summaryview.c:3556
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
 #: 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:3588
-#: src/summaryview.c:3591
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3568
+#: src/summaryview.c:3571
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr "Erro:"
 
-#: src/image_viewer.c:310 src/mimeview.c:2657
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: src/image_viewer.c:317
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr "Tamanho do arquivo:"
 
-#: src/image_viewer.c:366
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr "Carregar imagem"
 
-#: src/imap.c:577
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr "A conexão com o IMAP foi interrompida\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: 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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Erro no IMAP em %s:"
 
-#: src/imap.c:622
+#: src/imap.c:628
 msgid "authenticated"
 msgstr "autenticado"
 
-#: src/imap.c:625
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "não autenticado"
 
-#: src/imap.c:628
+#: src/imap.c:634
 msgid "bad state"
 msgstr "estado ruim"
 
-#: src/imap.c:631
+#: src/imap.c:637
 msgid "stream error"
 msgstr "erro no fluxo"
 
-#: src/imap.c:634
+#: src/imap.c:640
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "erro de análise (muito provavelmente uma submissão não-RFC do servidor)"
 
-#: src/imap.c:638
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "conexão recusada"
 
-#: src/imap.c:641
+#: src/imap.c:647
 msgid "memory error"
 msgstr "erro de memória"
 
-#: src/imap.c:644
+#: src/imap.c:650
 msgid "fatal error"
 msgstr "erro fatal"
 
-#: src/imap.c:647
+#: src/imap.c:653
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 "erro de protocolo (muito provavelmente uma submissão não-RFC do servidor)"
 
-#: src/imap.c:651
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr "conexão não aceita"
 
-#: src/imap.c:654
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr "erro no APPEND"
 
-#: src/imap.c:657
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr "erro no NOOP"
 
-#: src/imap.c:660
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr "erro no LOGOUT"
 
-#: src/imap.c:663
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr "erro no CAPABILITY"
 
-#: src/imap.c:666
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr "erro no CHECK"
 
-#: src/imap.c:669
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr "erro no CLOSE"
 
-#: src/imap.c:672
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr "erro no EXPUNGE"
 
-#: src/imap.c:675
+#: src/imap.c:681
 msgid "COPY error"
 msgstr "erro no COPY"
 
-#: src/imap.c:678
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr "erro no UID COPY"
 
-#: src/imap.c:681
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr "erro no CREATE"
 
-#: src/imap.c:684
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr "erro no DELETE"
 
-#: src/imap.c:687
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr "erro no EXAMINE"
 
-#: src/imap.c:690
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr "erro no FETCH"
 
-#: src/imap.c:693
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr "erro no UID FETCH"
 
-#: src/imap.c:696
+#: src/imap.c:702
 msgid "LIST error"
 msgstr "erro no LIST"
 
-#: src/imap.c:699
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr "erro no LOGIN"
 
-#: src/imap.c:702
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr "erro no LSUB"
 
-#: src/imap.c:705
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr "erro no RENAME"
 
-#: src/imap.c:708
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr "erro no SEARCH"
 
-#: src/imap.c:711
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr "erro no UID SEARCH"
 
-#: src/imap.c:714
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr "erro no SELECT"
 
-#: src/imap.c:717
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr "erro no STATUS"
 
-#: src/imap.c:720
+#: src/imap.c:726
 msgid "STORE error"
 msgstr "erro no STORE"
 
-#: src/imap.c:723
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr "erro no UID STORE"
 
-#: src/imap.c:726
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr "erro no SUBSCRIBE"
 
-#: src/imap.c:729
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr "erro no UNSUBSCRIBE"
 
-#: src/imap.c:732
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr "erro no STARTTLS"
 
-#: src/imap.c:735
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr "erro no INVAL"
 
-#: src/imap.c:738
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr "erro no EXTENSION"
 
-#: src/imap.c:741
+#: src/imap.c:747
 msgid "SASL error"
 msgstr "erro no SASL"
 
-#: src/imap.c:745
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr "erro no SSL/TLS"
 
-#: src/imap.c:749
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Erro desconhecido [%d]"
 
-#: src/imap.c:955
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5814,7 +5851,7 @@ msgstr ""
 "Autenticações CRAM-MD5 funcionam somente se a libetpan estiver compilada com "
 "suporte a SASL e o plugin CRAM-MD5 SASL instalado."
 
-#: src/imap.c:961
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5826,7 +5863,7 @@ msgstr ""
 "Autenticações DIGEST-MD5 funcionam somente se a libetpan estiver compilada "
 "com suporte a SASL e o plugin DIGEST-MD5 SASL estiver instalado."
 
-#: src/imap.c:967
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5838,7 +5875,7 @@ msgstr ""
 "Autenticações SCRAM-SHA-1 funcionam somente se a libetpan estiver compilada "
 "com suporte a SASL e o plugin SCRAM SASL estiver instalado."
 
-#: src/imap.c:973
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5850,7 +5887,7 @@ msgstr ""
 "Autenticações PLAIN funcionam somente se a libetpan estiver compilada com "
 "suporte a SASL e o plugin PLAIN SASL estiver instalado."
 
-#: src/imap.c:979
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5862,37 +5899,37 @@ msgstr ""
 "Autenticações LOGIN funcionam somente se a libetpan estiver compilada com "
 "suporte a SASL e o plugin LOGIN SASL estiver instalado."
 
-#: src/imap.c:986
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Erro na conexão com %s: login recusado.%s"
 
-#: src/imap.c:990
+#: src/imap.c:1003
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Erro na conexão com %s: login recusado.%s\n"
 
-#: src/imap.c:1008
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Erro na conexão com %s"
 
-#: src/imap.c:1015 src/imap.c:1018
+#: src/imap.c:1028 src/imap.c:1031
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP com %s foi interrompida. Reconectando...\n"
 
-#: src/imap.c:1048 src/imap.c:3687 src/imap.c:4346 src/imap.c:4440
-#: src/imap.c:4618 src/imap.c:5429
+#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "O Claws Mail necessita de acesso à rede para conectar-se ao servidor IMAP."
 
-#: src/imap.c:1158 src/inc.c:873 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: src/imap.c:1159 src/inc.c:874 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5905,108 +5942,108 @@ msgstr ""
 "\n"
 "Você quer continuar a conexão ao servidor? A comunicação não será segura."
 
-#: src/imap.c:1165 src/inc.c:880 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "Con_tinuar a conexão"
 
-#: src/imap.c:1174
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor IMAP: %s:%d..."
 
-#: src/imap.c:1239
+#: src/imap.c:1252
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Não foi possível conectar com o servidor IMAP: %s:%d"
 
-#: src/imap.c:1242
+#: src/imap.c:1255
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Não foi possível conectar com o servidor IMAP: %s:%d\n"
 
-#: src/imap.c:1274 src/imap.c:4108
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "Não foi possível iniciar sessão STARTTLS.\n"
 
-#: src/imap.c:1343
+#: src/imap.c:1359
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Não foi possível autenticar-se no servidor IMAP %s.\n"
 
-#: src/imap.c:1346
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Não foi possível conectar-se ao servidor IMAP %s."
 
-#: src/imap.c:1774
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 
-#: src/imap.c:1979 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 
-#: src/imap.c:2501
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr "Não foi possível realizar a pesquisa devido a uma falha no servidor."
 
-#: src/imap.c:2580
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 
-#: src/imap.c:2587 src/imap.c:5059
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 
-#: src/imap.c:2938
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
-msgstr "Procurando por pastas não assinadas em %s..."
+msgstr "Procurando por pastas não inscritas em %s..."
 
-#: src/imap.c:2941
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Procurando por sub-pastas de %s..."
 
-#: src/imap.c:3229
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não foi possível criar a caixa postal: falha no comando LIST\n"
 
-#: src/imap.c:3242
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 
-#: src/imap.c:3373
+#: src/imap.c:3422
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não foi possível renomear a caixa postal: %s para %s\n"
 
-#: src/imap.c:3486
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 
-#: src/imap.c:3765
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 
-#: src/imap.c:3850
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr "Marcando as mensagens..."
 
-#: src/imap.c:3953
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 
-#: src/imap.c:4105
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "O servidor depende do STARTTLS para efetuar a autenticação.\n"
 
-#: src/imap.c:4115
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as capacidades.\n"
 
-#: src/imap.c:4120
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6015,20 +6052,20 @@ msgstr ""
 "Ocorreu uma falha na conexão com %s: o servidor requer STARTTLS, mas o Claws "
 "Mail foi compilado sem o suporte a STARTTLS.\n"
 
-#: src/imap.c:4128
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 
-#: src/imap.c:4351
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 
-#: src/imap.c:5052
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "não foi possível definir marcas de exclusão: %d\n"
 
-#: src/imap.c:6087
+#: src/imap.c:6136
 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"
@@ -6073,15 +6110,15 @@ msgstr "_Obter mensagens"
 
 #: src/imap_gtk.c:75
 msgid "S_ubscriptions"
-msgstr "Ass_inaturas"
+msgstr "_Inscrições"
 
 #: src/imap_gtk.c:77
 msgid "_Subscribe..."
-msgstr "Assi_nar..."
+msgstr "I_nscrever..."
 
 #: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Unsubscribe..."
-msgstr "Cance_lar assinatura..."
+msgstr "Cance_lar inscrição..."
 
 #: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
 #: src/plugins/mailmbox/plugin_gtk.c:64
@@ -6110,10 +6147,6 @@ msgstr ""
 "(se deseja criar uma pasta apenas para armazenar\n"
 "sub-pastas e não mensagens, adicione '/' ao final do nome)"
 
-#: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties and processing rules from parent folder"
-msgstr "Propriedades e regras de processamento herdadas da pasta superior"
-
 #: 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
@@ -6170,7 +6203,7 @@ msgstr "Não foi possível remover a pasta '%s'."
 #: src/imap_gtk.c:506
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
-msgstr "Deseja pesquisar por sub-pastas não assinadas de '%s'?"
+msgstr "Deseja pesquisar por sub-pastas não inscritas em '%s'?"
 
 #: src/imap_gtk.c:509
 msgid "Search recursively"
@@ -6178,7 +6211,7 @@ msgstr "Pesquisar recursivamente"
 
 #: src/imap_gtk.c:514 src/imap_gtk.c:573
 msgid "Subscriptions"
-msgstr "Assinaturas"
+msgstr "Inscrições"
 
 #: src/imap_gtk.c:515
 msgid "_Search"
@@ -6187,11 +6220,11 @@ msgstr "_Pesquisar"
 #: src/imap_gtk.c:525
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
-msgstr "Selecione uma sub-pasta de %s para assinar: "
+msgstr "Selecione uma sub-pasta de %s para inscrever: "
 
 #: src/imap_gtk.c:536 src/mainwindow.c:689
 msgid "Subscribe"
-msgstr "Assinar"
+msgstr "Inscrever"
 
 #: src/imap_gtk.c:538 src/imap_gtk.c:540
 msgid "All of them"
@@ -6204,9 +6237,9 @@ msgid ""
 "If there are new folders, created and subscribed to from another client, use "
 "\"Check for new folders\" at the mailbox's root folder."
 msgstr ""
-"Essa pasta já foi assinada e não possui nenhuma sub-pasta não assinada.\n"
+"Essa pasta já foi inscrita e não possui nenhuma sub-pasta não inscrita.\n"
 "\n"
-"Se existirem novas pastas, criadas ou assinadas a partir de outro cliente, "
+"Se existirem novas pastas, criadas ou inscritas a partir de outro cliente, "
 "utilize \"Verificar novas pastas\" na pasta raiz."
 
 #: src/imap_gtk.c:565
@@ -6216,11 +6249,11 @@ msgstr "Deseja '%s' a '%s' pasta?"
 
 #: src/imap_gtk.c:566
 msgid "subscribe"
-msgstr "assinar"
+msgstr "inscrever"
 
 #: src/imap_gtk.c:566
 msgid "unsubscribe"
-msgstr "cancelar assinatura"
+msgstr "cancelar inscrição"
 
 #: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
 #: src/prefs_folder_item.c:1593
@@ -6229,29 +6262,29 @@ msgstr "Aplicar às sub-pastas"
 
 #: src/imap_gtk.c:574
 msgid "_Subscribe"
-msgstr "_Assinar"
+msgstr "_Inscrever"
 
 #: src/imap_gtk.c:574 src/news_gtk.c:252
 msgid "_Unsubscribe"
-msgstr "_Cancelar a assinatura"
+msgstr "_Cancelar a inscrição"
 
-#: src/import.c:113 src/import.c:207
+#: src/import.c:113 src/import.c:209
 msgid "Import mbox file"
 msgstr "Importar arquivo mbox"
 
-#: src/import.c:131
+#: src/import.c:132
 msgid "Locate the mbox file and specify the destination folder."
 msgstr "Especifique o arquivo mbox e a pasta de destino."
 
-#: src/import.c:148
+#: src/import.c:149
 msgid "Destination folder:"
 msgstr "Pasta de destino:"
 
-#: src/import.c:202
+#: src/import.c:204
 msgid "Source mbox filename can't be left empty."
 msgstr "O nome do arquivo mbox de origem não pode ser deixado em branco."
 
-#: src/import.c:207
+#: src/import.c:209
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6259,15 +6292,20 @@ msgstr ""
 "A pasta de destino não foi definida.\n"
 "Importar o arquivo mbox para a pasta Caixa de Entrada?"
 
-#: src/import.c:229
+#: src/import.c:231
 msgid "Can't find the destination folder."
 msgstr "Não foi possível encontrar a pasta de destino."
 
-#: src/import.c:254
+#: src/import.c:236
+#| msgid "_Import mbox file..."
+msgid "Importing mbox file..."
+msgstr "Importação do arquivo mbox..."
+
+#: src/import.c:258
 msgid "Select importing file"
 msgstr "Selecione o arquivo a importar"
 
-#: src/import.c:272
+#: src/import.c:276
 msgid "Select folder to import to"
 msgstr "Selecione a pasta para a importação"
 
@@ -6324,7 +6362,7 @@ msgstr "Selecione o arquivo LDIF a ser importado."
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:710 src/summaryview.c:464
+#: src/importldif.c:710 src/summaryview.c:466
 msgid "S"
 msgstr "E"
 
@@ -6390,7 +6428,7 @@ msgstr "Registros importados:"
 msgid "Import LDIF file into Address Book"
 msgstr "Incorporar o arquivo LDIF ao Livro de Endereços"
 
-#: src/importldif.c:939
+#: src/importldif.c:940
 msgid "Proceed"
 msgstr "Prosseguir"
 
@@ -6406,7 +6444,7 @@ msgstr "Selecione o arquivo do MUTT"
 msgid "Import MUTT file into Address Book"
 msgstr "Incorporar o arquivo do MUTT ao Livro de Endereços"
 
-#: src/importmutt.c:288 src/importpine.c:288
+#: src/importmutt.c:289 src/importpine.c:289
 msgid "Please select a file to import."
 msgstr "Por favor, selecione um arquivo para importar."
 
@@ -6422,142 +6460,142 @@ msgstr "Selecione o arquivo do Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Incorporar o arquivo do Pine ao Livro de Endereços"
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "O Claws Mail necessita de acesso à rede para obter as mensagens."
 
-#: src/inc.c:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "%s falhou\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "Recebendo novas mensagens"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:675 src/inc.c:729
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:686
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Recebendo"
 
-#: src/inc.c:695
+#: src/inc.c:703
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Pronto (%d mensagem, (%s) recebida)"
 msgstr[1] "Pronto (%d mensagens, (%s) recebidas)"
 
-#: src/inc.c:701
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "Pronto (não há novas mensagens)"
 
-#: src/inc.c:706
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Ocorreu uma falha na conexão"
 
-#: src/inc.c:709 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Ocorreu um erro na autenticação"
 
-#: src/inc.c:716 src/prefs_matcher.c:407 src/prefs_summaries.c:624
-#: src/prefs_summary_column.c:87 src/summaryview.c:2914 src/summaryview.c:6589
+#: 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
 msgid "Locked"
 msgstr "Travada"
 
-#: src/inc.c:726 src/plugins/spamassassin/spamassassin_gtk.c:394
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr "Tempo esgotado"
 
-#: src/inc.c:812
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Concluído (%d mensagem nova)"
 msgstr[1] "Concluído (%d mensagens novas)"
 
-#: src/inc.c:816
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "Concluído (não há novas mensagens)"
 
-#: src/inc.c:857
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:886
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor POP3: %s:%d..."
 
-#: src/inc.c:920
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Não foi possível conectar ao servidor POP3: %s:%d"
 
-#: src/inc.c:924
+#: src/inc.c:932
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:1004 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:1006
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Recuperando mensagens de %s (%s)..."
 
-#: src/inc.c:1012
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:1016
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:1020
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamanho das mensagens (LIST)..."
 
-#: src/inc.c:1031 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:1056
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando a mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:1069
+#: src/inc.c:1077
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Recebendo (%d mensagem), (%s) recebida)"
 msgstr[1] "Recebendo (%d mensagens, (%s) recebidas)"
 
-#: src/inc.c:1228
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Ocorreu uma falha na conexão com %s:%d."
 
-#: src/inc.c:1233
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro durante o processamento da mensagem."
 
-#: src/inc.c:1239
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6566,37 +6604,37 @@ msgstr ""
 "Ocorreu um erro durante o processamento da mensagem:\n"
 "%s"
 
-#: src/inc.c:1245
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1250
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1255
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "Erro de socket."
 
-#: src/inc.c:1258
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Erro de socket na conexão com %s:%d."
 
-#: src/inc.c:1263 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "A conexão foi fechada pelo servidor remoto."
 
-#: src/inc.c:1266
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "A conexão com %s:%d foi fechada pelo servidor remoto."
 
-#: src/inc.c:1271
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "A caixa postal está travada."
 
-#: src/inc.c:1275
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6605,11 +6643,11 @@ msgstr ""
 "A caixa postal está travada:\n"
 "%s"
 
-#: src/inc.c:1281 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "Ocorreu uma falha na autenticação."
 
-#: src/inc.c:1287 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6618,7 +6656,7 @@ msgstr ""
 "Ocorreu uma falha na autenticação:\n"
 "%s"
 
-#: src/inc.c:1292 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6626,46 +6664,46 @@ msgstr ""
 "O tempo da sessão está esgotado. Você pode recuperá-la aumentando o valor do "
 "tempo limite em Preferências/Outros/Miscelânea."
 
-#: src/inc.c:1297
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Tempo esgotado na conexão com %s:%d."
 
-#: src/inc.c:1335
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr "A incorporação foi cancelada\n"
 
-#: src/inc.c:1627 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1789
-#: src/prefs_other.c:577 src/prefs_receive.c:203 src/prefs_summaries.c:530
+#: 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
 msgid "seconds"
 msgstr "segundos"
 
-#: src/inc.c:1637 src/inc.c:1647
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/inc.c:1640
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/inc.c:1652
+#: src/inc.c:1656
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir por %d %s?"
 
-#: src/inc.c:1658
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir?"
 
-#: src/inc.c:1665
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "Apenas _uma vez"
 
@@ -6711,7 +6749,7 @@ msgstr ""
 "O arquivo '%s' já existe.\n"
 "Não foi possível criar a pasta."
 
-#: src/main.c:375
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6720,7 +6758,7 @@ msgstr ""
 "Foi encontrada uma configuração para %s.\n"
 "Deseja migrar essa configuração?"
 
-#: src/main.c:377
+#: src/main.c:382
 #, c-format
 msgid ""
 "\n"
@@ -6733,11 +6771,11 @@ msgstr ""
 "As suas regras de filtragem do Sylpheed podem ser\n"
 "convertidas por um script disponível em %s."
 
-#: src/main.c:389
+#: src/main.c:394
 msgid "Keep old configuration"
 msgstr "Manter a configuração antiga"
 
-#: src/main.c:392
+#: src/main.c:397
 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 "
@@ -6747,31 +6785,31 @@ msgstr ""
 "consumir um tempo se você tem dados de IMAP ou News no cache, além de ocupar "
 "um espaço extra no seu disco."
 
-#: src/main.c:400
+#: src/main.c:405
 msgid "Migration of configuration"
 msgstr "Migração de configuração"
 
-#: src/main.c:411
+#: src/main.c:416
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando a configuração... Isso pode demorar um pouco..."
 
-#: src/main.c:420
+#: src/main.c:425
 msgid "Migration failed!"
 msgstr "Falha na migração!"
 
-#: src/main.c:429
+#: src/main.c:434
 msgid "Migrating configuration..."
 msgstr "Migrando a configuração..."
 
-#: src/main.c:1141
+#: src/main.c:1146
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread não é suportado pela glib.\n"
 
-#: src/main.c:1161 src/main.c:1165 src/main.c:1169
+#: src/main.c:1166 src/main.c:1170 src/main.c:1174
 msgid "(or older)"
 msgstr "(ou mais antiga)"
 
-#: src/main.c:1510
+#: src/main.c:1515
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6790,7 +6828,7 @@ msgstr[1] ""
 "plugins para maiores informações:\n"
 "%s"
 
-#: src/main.c:1552
+#: src/main.c:1557
 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 "
@@ -6801,7 +6839,7 @@ msgstr ""
 "de pastas\" no menu de contexto da pasta raiz da pasta da caixa postal para "
 "tentar consertá-la."
 
-#: src/main.c:1558
+#: src/main.c:1563
 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 "
@@ -6811,36 +6849,81 @@ msgstr ""
 "carregá-la. Ela provavelmente foi fornecida por um plugin externo "
 "desatualizado. Por favor, reinstale o plugin e tente novamente."
 
-#: src/main.c:1798
+#: src/main.c:1804
 msgid "Missing filename\n"
 msgstr "Falta o nome do arquivo\n"
 
-#: src/main.c:1805
+#: src/main.c:1811
 msgid "Cannot open filename for reading\n"
 msgstr "Não foi possível abrir o arquivo para leitura\n"
 
-#: src/main.c:1816
+#: src/main.c:1822
 msgid "Malformed header\n"
 msgstr "Cabeçalho malformatado\n"
 
-#: src/main.c:1823
+#: src/main.c:1829
 msgid "Duplicated 'To:' header\n"
 msgstr "Cabeçalho 'To:' duplicado\n"
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "Missing required 'To:' header\n"
 msgstr "Falta o cabeçalho 'To:' (e ele é necessário)\n"
 
-#: src/main.c:1979
+#: src/main.c:1866
+#, c-format
+#| msgid "Unknown option. Try -h or --help for usage.\n"
+msgid "%s. Try -h or --help for usage.\n"
+msgstr "%s. Tente -h ou --help para o uso.\n"
+
+#: src/main.c:1893 src/main.c:1956
+#, c-format
+#| msgid "Missing required information"
+msgid "Missing file argument for option %s"
+msgstr "Falta o argumento de arquivo para a opção %s"
+
+#: src/main.c:1915
+#, c-format
+#| msgid "Missing required information"
+msgid "Missing or empty uri argument for option %s"
+msgstr "Argumento de URI ausente ou em branco, para a opção %s"
+
+#: src/main.c:1918
+#, c-format
+#| msgid "Missing required information"
+msgid "Missing uri argument for option %s"
+msgstr "Falta o argumento de URI para a opção %s"
+
+#: src/main.c:1951
+#, c-format
+msgid "Missing at least one non-empty file argument for option %s"
+msgstr "Falta ao menos um argumento não vazio de arquivo para a opção %s"
+
+#: src/main.c:2020
+#, c-format
+msgid "Missing folder, type and request arguments for option %s"
+msgstr "Faltam os argumentos de pasta, tipo e requisição para a opção %s"
+
+#: src/main.c:2023
+#, c-format
+msgid "Missing type and request arguments for option %s"
+msgstr "Faltam os argumentos de tipo e requisição para a opção %s"
+
+#: src/main.c:2026
+#, c-format
+#| msgid "Missing required information"
+msgid "Missing request argument for option %s"
+msgstr "Falta o argumento de requisição para a opção %s"
+
+#: src/main.c:2042
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilização: %s [OPÇÕES]...\n"
 
-#: src/main.c:1981
+#: src/main.c:2044
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endereço]   abre a janela de composição de mensagens"
 
-#: src/main.c:1982
+#: src/main.c:2045
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6858,14 +6941,15 @@ msgstr ""
 "                         entrada padrão;\n"
 "                         formato do conteúdo: cabeçalhos (To: é obrigatório) "
 "até uma\n"
-"                         linha em branco e o corpo do e-mail até o fim do "
+"                         linha em branco e o corpo do email até o fim do "
 "arquivo."
 
-#: src/main.c:1987
-msgid "  --subscribe [uri]      subscribe to the given URI if possible"
-msgstr "  --subscribe [uri]      assina a URI fornecida, caso seja possível"
+#: src/main.c:2050
+#| msgid "  --subscribe [uri]      subscribe to the given URI if possible"
+msgid "  --subscribe uri        subscribe to the given URI if possible"
+msgstr "  --subscribe uri      assina a URI fornecida, caso seja possível"
 
-#: src/main.c:1988
+#: src/main.c:2051
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6876,7 +6960,7 @@ msgstr ""
 "arquivos\n"
 "                         especificados"
 
-#: src/main.c:1991
+#: src/main.c:2054
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6887,23 +6971,23 @@ msgstr ""
 "arquivos\n"
 "                         especificados"
 
-#: src/main.c:1994
+#: src/main.c:2057
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensagens"
 
-#: src/main.c:1995
+#: src/main.c:2058
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
-#: src/main.c:1996
+#: src/main.c:2059
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     cancela o recebimento de mensagens"
 
-#: src/main.c:1997
+#: src/main.c:2060
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       cancela o envio de mensagens"
 
-#: src/main.c:1998
+#: src/main.c:2061
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6923,15 +7007,15 @@ msgstr ""
 "                         recursive: falso se o argumento começar com 0, n, "
 "N, f ou F"
 
-#: src/main.c:2005
+#: src/main.c:2068
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da Fila de Saída"
 
-#: src/main.c:2006
+#: src/main.c:2069
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...    mostra o número total de mensagens"
 
-#: src/main.c:2007
+#: src/main.c:2070
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6939,106 +7023,139 @@ msgstr ""
 "  --status-full [pasta]...\n"
 "                         mostra o status de cada pasta"
 
-#: src/main.c:2009
+#: src/main.c:2072
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           exibe as estatísticas da sessão"
 
-#: src/main.c:2010
+#: src/main.c:2073
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     reinicia as estatísticas de sessão"
 
-#: src/main.c:2011
+#: src/main.c:2074
+#| msgid ""
+#| "  --select folder[/msg]  jumps to the specified folder/message\n"
+#| "                         folder is a folder id like 'folder/sub_folder'"
 msgid ""
-"  --select folder[/msg]  jumps to the specified folder/message\n"
-"                         folder is a folder id like 'folder/sub_folder'"
+"  --select folder[/msg]  jump to the specified folder/message\n"
+"                         folder is a folder id like 'folder/sub_folder', a "
+"file:// uri or an absolute path"
 msgstr ""
 "  --select pasta[/msg]   vai para a pasta/mensagem especificada\n"
-"                         pasta é uma id de pasta, como 'pasta/sub_pasta'"
+"                         pasta é uma id de pasta, como 'pasta/sub_pasta', "
+"uma uri do tipo arquivo:// ou um caminho absoluto"
 
-#: src/main.c:2013
+#: src/main.c:2076
 msgid "  --online               switch to online mode"
 msgstr "  --online               alterna para o modo conectado"
 
-#: src/main.c:2014
+#: src/main.c:2077
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              alterna para o modo desconectado"
 
-#: src/main.c:2015
+#: src/main.c:2078
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sai do Claws Mail"
 
-#: src/main.c:2016
-msgid "  --debug                debug mode"
-msgstr "  --debug                modo de depuração"
+#: src/main.c:2079
+#| msgid "  --debug                debug mode"
+msgid "  --debug -d             debug mode"
+msgstr "  --debug -d                modo de depuração"
 
-#: src/main.c:2017
+#: src/main.c:2080
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         alterna o mode de debug"
 
-#: src/main.c:2018
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h              exibe essa tela de ajuda e finaliza"
+#: src/main.c:2081
+#| msgid "  --help -h              display this help and exit"
+msgid "  --help -h              display this help"
+msgstr "  --help -h              exibe essa tela de ajuda"
 
-#: src/main.c:2019
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           exibe a versão do programa e finaliza"
+#: src/main.c:2082
+#| msgid "  --version -v           output version information and exit"
+msgid "  --version -v           output version information"
+msgstr "  --version -v           exibe a versão do programa"
 
-#: src/main.c:2020
+#: src/main.c:2083
+#| msgid ""
+#| "  --version-full -V      output version and built-in features information "
+#| "and exit"
 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      exibe a versão do programa e informações sobre os\n"
-"                         recursos internos e finaliza"
+"  --version-full -V      exibe a versão do programa e informações sobre os "
+"recursos internos"
 
-#: src/main.c:2021
+#: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           exibe o diretório de configurações"
 
-#: src/main.c:2022
+#: src/main.c:2085
+#| msgid ""
+#| "  --alternate-config-dir [dir]\n"
+#| "                         use specified configuration directory"
 msgid ""
-"  --alternate-config-dir [dir]\n"
+"  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
 msgstr ""
-"  --alternate-config-dir [dir]\n"
+"  --alternate-config-dir diretório\n"
 "                         usa o diretório de configurações especificado"
 
-#: src/main.c:2024
+#: src/main.c:2087
+#| msgid ""
+#| "  --geometry -geometry WxH+X+Y\n"
+#| "                         set geometry for main window"
 msgid ""
-"  --geometry -geometry WxH+X+Y\n"
+"  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 msgstr ""
-"  --geometry -geometry WxH+X+Y\n"
+"  --geometry -geometry [WxH][+X+Y]\n"
 "                         define a geometria da janela principal"
 
-#: src/main.c:2077
-msgid "Unknown option. Try -h or --help for usage.\n"
-msgstr "Opção desconhecida. Tente -h ou --help para ver as opções.\n"
+#: src/main.c:2104
+#, c-format
+msgid "Missing directory argument for option %s"
+msgstr "Falta o argumento de diretório para a opção %s"
+
+#: src/main.c:2112
+#, c-format
+msgid "Missing geometry argument for option %s"
+msgstr "Falta o argumento de geometria para a opção %s"
 
-#: src/main.c:2095
+#: src/main.c:2123
+#, c-format
+msgid "Missing folder argument for option %s"
+msgstr "Falta o argumento de pasta para a opção %s"
+
+#: src/main.c:2156 src/main.c:2159
+#, c-format
+#| msgid "Unknown error [%d]"
+msgid "Unknown option %s"
+msgstr "Opção desconhecida %s"
+
+#: src/main.c:2175
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processando (%s)..."
 
-#: src/main.c:2098
+#: src/main.c:2178
 msgid "top level folder"
 msgstr "pasta do nível mais acima"
 
-#: src/main.c:2180
+#: src/main.c:2260
 msgid "Queued messages"
 msgstr "Mensagens na Fila de Saída"
 
-#: src/main.c:2181
+#: src/main.c:2261
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Ainda existem mensagens da Fila de Saída que não foram enviadas. Finalizar "
 "agora?"
 
-#: src/main.c:2939
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: a rede está conectada.\n"
 
-#: src/main.c:2945
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: a rede está desconectada.\n"
 
@@ -7046,7 +7163,7 @@ msgstr "NetworkManager: a rede está desconectada.\n"
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:445
+#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:447
 msgid "_View"
 msgstr "E_xibir"
 
@@ -7222,11 +7339,11 @@ msgstr "Próxima pa_sta não lida"
 msgid "F_older..."
 msgstr "P_asta..."
 
-#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:229
+#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:230
 msgid "Next part"
 msgstr "Próxima parte"
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Parte anterior"
 
@@ -7242,11 +7359,11 @@ msgstr "Linha anterior"
 msgid "Next line"
 msgstr "Próxima linha"
 
-#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:475
+#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:476
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:481
+#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:482
 msgid "Next page"
 msgstr "Próxima página"
 
@@ -7308,22 +7425,22 @@ msgstr "_Enviar mensagens da Fila de Saída"
 
 #: src/mainwindow.c:669
 msgid "Compose a_n email message"
-msgstr "Escrever uma mensa_gem de e-mail"
+msgstr "Escrever uma mensa_gem de email"
 
 #: src/mainwindow.c:670
 msgid "Compose a news message"
 msgstr "Escrever artigo de _Newsgroup"
 
 #: src/mainwindow.c:672 src/messageview.c:303
-#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:429
+#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:431
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:430
+#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:432
 msgid "Repl_y to"
 msgstr "Responder _para"
 
-#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:433
+#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:435
 msgid "Mailing _list"
 msgstr "_Lista de discussão"
 
@@ -7331,17 +7448,17 @@ msgstr "_Lista de discussão"
 msgid "Follow-up and reply to"
 msgstr "_Acompanhar o assunto e responder"
 
-#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:435
+#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:437
 #: src/toolbar.c:2449
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:436
+#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
 #: src/toolbar.c:2450
 msgid "For_ward as attachment"
 msgstr "Encaminhar como _anexo"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:437
+#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
 #: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr "Re_direcionar"
@@ -7360,7 +7477,7 @@ msgstr "_Ajuda"
 
 #: src/mainwindow.c:691
 msgid "Unsubscribe"
-msgstr "Cancelar assinatura"
+msgstr "Cancelar inscrição"
 
 #: src/mainwindow.c:693
 msgid "View archive"
@@ -7398,7 +7515,7 @@ msgstr "_Excluir a discussão"
 msgid "Cancel a news message"
 msgstr "Cancelar uma mensagem de Ne_wsgroup"
 
-#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:438
+#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:440
 msgid "_Mark"
 msgstr "_Marcar"
 
@@ -7415,12 +7532,14 @@ msgid "Mark as unr_ead"
 msgstr "Marcar como _não lida"
 
 #: src/mainwindow.c:716
-msgid "Mark all read"
-msgstr "Marcar _todas como lidas"
+#| msgid "Mark all read"
+msgid "Mark all read in folder"
+msgstr "Marcar todas na pasta como lidas"
 
 #: src/mainwindow.c:717
-msgid "Mark all unread"
-msgstr "Marcar todas como não l_idas"
+#| msgid "Mark all unread"
+msgid "Mark all unread in folder"
+msgstr "Marcar todas na pasta como não lidas"
 
 #: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
 #: src/toolbar.c:503
@@ -7456,11 +7575,11 @@ msgstr "Travar"
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/mainwindow.c:732 src/summaryview.c:439
+#: src/mainwindow.c:732 src/summaryview.c:441
 msgid "Color la_bel"
 msgstr "Ró_tulo colorido"
 
-#: src/mainwindow.c:733 src/summaryview.c:440
+#: src/mainwindow.c:733 src/summaryview.c:442
 msgid "Ta_gs"
 msgstr "E_tiquetas"
 
@@ -7468,7 +7587,7 @@ msgstr "E_tiquetas"
 msgid "Re-_edit"
 msgstr "Reedi_tar"
 
-#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1047
+#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1048
 msgid "Check signature"
 msgstr "Verificar assinatura"
 
@@ -7524,7 +7643,7 @@ msgstr "Pelo _destinatário (Para:)"
 msgid "By _Subject"
 msgstr "Pelo a_ssunto"
 
-#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:443
+#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:445
 msgid "Create processing rule"
 msgstr "Criar re_gra de processamento"
 
@@ -7668,7 +7787,7 @@ msgstr "_Cabeçalhos das colunas"
 msgid "Th_read view"
 msgstr "A_grupar por assunto"
 
-#: src/mainwindow.c:837 src/prefs_summaries.c:646
+#: src/mainwindow.c:837 src/prefs_summaries.c:667
 msgid "Hide read threads"
 msgstr "Ocultar discussões lidas"
 
@@ -7676,7 +7795,7 @@ msgstr "Ocultar discussões lidas"
 msgid "_Hide read messages"
 msgstr "Ocultar mensagens _lidas"
 
-#: src/mainwindow.c:839 src/prefs_summaries.c:652
+#: src/mainwindow.c:839 src/prefs_summaries.c:673
 msgid "Hide deleted messages"
 msgstr "Ocultar as mensagens excluídas"
 
@@ -7788,11 +7907,11 @@ msgstr "Pelo tra_vamento"
 msgid "D_on't sort"
 msgstr "Não _ordenar"
 
-#: src/mainwindow.c:884 src/prefs_summaries.c:633
+#: src/mainwindow.c:884 src/prefs_summaries.c:654
 msgid "Ascending"
 msgstr "Crescente"
 
-#: src/mainwindow.c:885 src/prefs_summaries.c:634
+#: src/mainwindow.c:885 src/prefs_summaries.c:655
 msgid "Descending"
 msgstr "Decrescente"
 
@@ -7800,7 +7919,7 @@ msgstr "Decrescente"
 msgid "_Auto detect"
 msgstr "_Autodetectar"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6515
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr "Aplicar etiquetas..."
 
@@ -7894,54 +8013,54 @@ msgstr ""
 "Talvez já existam arquivos, ou você não possui permissão para escrita nesta "
 "pasta."
 
-#: src/mainwindow.c:3430
+#: src/mainwindow.c:3415
 msgid "No posting allowed"
 msgstr "Não é permitido o envio de mensagens"
 
-#: src/mainwindow.c:4012
+#: src/mainwindow.c:3997
 msgid "Mbox import has failed."
 msgstr "Não foi possível importar o mbox."
 
-#: src/mainwindow.c:4021 src/mainwindow.c:4030
+#: src/mainwindow.c:4006 src/mainwindow.c:4015
 msgid "Export to mbox has failed."
 msgstr "Não foi possível exportar para o mbox."
 
-#: src/mainwindow.c:4071 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:4071 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Sair do Claws Mail?"
 
-#: src/mainwindow.c:4272
+#: src/mainwindow.c:4257
 msgid "Folder synchronisation"
 msgstr "Sincronização das pastas"
 
-#: src/mainwindow.c:4273
+#: src/mainwindow.c:4258
 msgid "Do you want to synchronise your folders now?"
 msgstr "Deseja sincronizar suas pastas agora?"
 
-#: src/mainwindow.c:4274
+#: src/mainwindow.c:4259
 msgid "_Synchronise"
 msgstr "_Sincronizar"
 
-#: src/mainwindow.c:4747
+#: src/mainwindow.c:4737
 msgid "Deleting duplicated messages..."
 msgstr "Excluindo mensagens duplicadas..."
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4747
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Não foi encontrada nenhuma mensagem duplicada na pasta selecionada.\n"
 
-#: src/mainwindow.c:4763
+#: src/mainwindow.c:4753
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "%d mensagem duplicada foi excluída na pasta selecionada.\n"
 msgstr[1] "%d mensagens duplicadas foram excluídas na pasta selecionada.\n"
 
-#: src/mainwindow.c:4767
+#: src/mainwindow.c:4757
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -7950,61 +8069,61 @@ msgstr[0] ""
 msgstr[1] ""
 "%d mensagens duplicadas foram marcadas para exclusão na pasta selecionada.\n"
 
-#: src/mainwindow.c:4805
+#: src/mainwindow.c:4795
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Excluindo mensagens duplicadas em todas as pastas..."
 
-#: src/mainwindow.c:4811
+#: src/mainwindow.c:4801
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Foi excluída %d mensagem duplicada em %d pastas.\n"
 msgstr[1] "Foram excluídas %d mensagens duplicadas em %d pastas.\n"
 
-#: src/mainwindow.c:4816
+#: src/mainwindow.c:4806
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Não foi encontrada nenhuma mensagem duplicada em %d pastas.\n"
 
-#: src/mainwindow.c:4978 src/messageview.c:2622
+#: src/mainwindow.c:4968 src/messageview.c:2634
 msgid "Select folder to go to"
 msgstr "Selecione a pasta de destino"
 
-#: src/mainwindow.c:5079 src/summaryview.c:5958
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 
-#: src/mainwindow.c:5087
+#: src/mainwindow.c:5077
 msgid "Processing rules to apply after folder rules"
 msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 
-#: src/mainwindow.c:5095 src/summaryview.c:5969
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr "Configuração da filtragem"
 
-#: src/mainwindow.c:5210
+#: src/mainwindow.c:5200
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Não foi possível registrar como cliente padrão: impossível obter o caminho "
 "do executável."
 
-#: src/mainwindow.c:5269
+#: src/mainwindow.c:5259
 msgid "Claws Mail has been registered as default client."
 msgstr "O Claws Mail foi registrado como o cliente padrão."
 
-#: src/mainwindow.c:5271
+#: src/mainwindow.c:5261
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Não foi possível registrar como cliente padrão: impossível escrever no "
 "registro."
 
-#: src/mainwindow.c:5285 src/setup.c:91
+#: src/mainwindow.c:5275 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Vasculhando a pasta %s%c%s..."
 
-#: src/mainwindow.c:5429
+#: src/mainwindow.c:5419
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8034,7 +8153,7 @@ msgid "tag"
 msgstr "etiqueta"
 
 #: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
-#: src/message_search.c:214 src/prefs_matcher.c:748 src/summary_search.c:454
+#: src/message_search.c:215 src/prefs_matcher.c:752 src/summary_search.c:455
 msgid "Case sensitive"
 msgstr "Diferenciar maiúsc./minúsc."
 
@@ -8060,7 +8179,19 @@ msgstr "a mensagem não corresponde\n"
 msgid "(none)"
 msgstr "(nenhuma)"
 
-#: src/mbox.c:97
+#: src/mbox.c:98
+#, c-format
+#| msgid ""
+#| "Could not create mbox file:\n"
+#| "%s\n"
+msgid ""
+"Could not stat mbox file:\n"
+"%s\n"
+msgstr ""
+"Não foi possível verificar o status do arquivo mbox:\n"
+"%s\n"
+
+#: src/mbox.c:104
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -8069,26 +8200,28 @@ msgstr ""
 "Não foi possível abrir o arquivo mbox:\n"
 "%s\n"
 
-#: src/mbox.c:134
+#: src/mbox.c:142
 #, c-format
-msgid "Importing from mbox... (%d mail imported)"
-msgid_plural "Importing from mbox... (%d mails imported)"
-msgstr[0] "Importação da mbox... (%d mensagem importada)"
-msgstr[1] "Importação da mbox... (%d mensagens importadas)"
+#| msgid "Importing from mbox... (%d mail imported)"
+#| msgid_plural "Importing from mbox... (%d mails imported)"
+msgid "Importing from mbox... (%ld MB imported)"
+msgid_plural "Importing from mbox... (%ld MB imported)"
+msgstr[0] "Importando da mbox... (%ld MB importado)"
+msgstr[1] "Importando da mbox... (%ld MB importados)"
 
-#: src/mbox.c:539
+#: src/mbox.c:550
 msgid "Overwrite mbox file"
 msgstr "Sobrescrever o arquivo mbox"
 
-#: src/mbox.c:540
+#: src/mbox.c:551
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "O arquivo já existe. Deseja sobrescrevê-lo?"
 
-#: src/mbox.c:541 src/mimeview.c:1888 src/prefs_themes.c:596
+#: src/mbox.c:552 src/mimeview.c:1897 src/prefs_themes.c:596
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: src/mbox.c:550
+#: src/mbox.c:561
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -8097,7 +8230,7 @@ msgstr ""
 "Não foi possível criar o arquivo mbox:\n"
 "%s\n"
 
-#: src/mbox.c:554
+#: src/mbox.c:565
 msgid "Exporting to mbox..."
 msgstr "Exportação para a mbox..."
 
@@ -8105,27 +8238,27 @@ msgstr "Exportação para a mbox..."
 msgid "Find in current message"
 msgstr "Localizar na mensagem atual"
 
-#: src/message_search.c:191
+#: src/message_search.c:192
 msgid "Find text:"
 msgstr "Localizar texto:"
 
-#: src/message_search.c:317 src/summary_search.c:778
+#: src/message_search.c:318 src/summary_search.c:779
 msgid "Search failed"
 msgstr "Ocorreu um erro na pesquisa"
 
-#: src/message_search.c:318 src/summary_search.c:779
+#: src/message_search.c:319 src/summary_search.c:780
 msgid "Search string not found."
 msgstr "A sequência pesquisada não foi localizada."
 
-#: src/message_search.c:327
+#: src/message_search.c:328
 msgid "Beginning of message reached; continue from end?"
 msgstr "Foi atingido o início da mensagem; continuar a partir do final?"
 
-#: src/message_search.c:330
+#: src/message_search.c:331
 msgid "End of message reached; continue from beginning?"
 msgstr "Foi atingido o fim da mensagem; continuar a partir do início?"
 
-#: src/message_search.c:333 src/summary_search.c:790
+#: src/message_search.c:334 src/summary_search.c:791
 msgid "Search finished"
 msgstr "Pesquisa concluída"
 
@@ -8292,11 +8425,11 @@ msgstr ""
 "Por favor, selecione qual a conta que você deseja utilizar para enviar a "
 "confirmação de recebimento:"
 
-#: src/messageview.c:2171
+#: src/messageview.c:2171 src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Não foi possível imprimir: a mensagem não contém texto."
 
-#: src/messageview.c:2932
+#: src/messageview.c:2944
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8304,7 +8437,7 @@ msgstr ""
 "\n"
 "  Não existem mais mensagens nesta pasta"
 
-#: src/messageview.c:2940
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8312,7 +8445,7 @@ msgstr ""
 "\n"
 "  A mensagem foi excluída"
 
-#: src/messageview.c:2941
+#: src/messageview.c:2953
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8320,8 +8453,8 @@ msgstr ""
 "\n"
 "  A mensagem foi excluída ou movida para outra pasta"
 
-#: src/messageview.c:2974 src/messageview.c:2980 src/summaryview.c:4440
-#: src/summaryview.c:7320
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr "Ocorreu um erro durante a aprendizagem.\n"
 
@@ -8361,64 +8494,64 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Remover a caixa postal"
 
-#: src/mimeview.c:220
+#: src/mimeview.c:221
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/mimeview.c:222
+#: src/mimeview.c:223
 msgid "Open _with..."
 msgstr "Abrir _com..."
 
-#: src/mimeview.c:224 src/prefs_filtering_action.c:172
+#: src/mimeview.c:225 src/prefs_filtering_action.c:172
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/mimeview.c:225
+#: src/mimeview.c:226
 msgid "Send to..."
 msgstr "_Enviar para..."
 
-#: src/mimeview.c:226
+#: src/mimeview.c:227
 msgid "_Display as text"
 msgstr "Exibir como _texto"
 
-#: src/mimeview.c:227
+#: src/mimeview.c:228
 msgid "_Save as..."
 msgstr "_Salvar como..."
 
-#: src/mimeview.c:228
+#: src/mimeview.c:229
 msgid "Save _all..."
 msgstr "Salvar _todos..."
 
-#: src/mimeview.c:301
+#: src/mimeview.c:302
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:1052 src/mimeview.c:1057 src/mimeview.c:1062
-#: src/mimeview.c:1067
+#: src/mimeview.c:1053 src/mimeview.c:1058 src/mimeview.c:1063
+#: src/mimeview.c:1068
 msgid "View full information"
 msgstr "Exibir informações completas"
 
-#: src/mimeview.c:1073
+#: src/mimeview.c:1074
 msgid "Check again"
 msgstr "Verificar novamente"
 
-#: src/mimeview.c:1085
+#: src/mimeview.c:1086
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Clique no ícone verificá-la."
 
-#: src/mimeview.c:1087
+#: src/mimeview.c:1088
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Clique no ícone ou pressione '%s' para verificá-la."
 
-#: src/mimeview.c:1097
+#: src/mimeview.c:1098
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Tempo esgotado durante a checagem da assinatura. Clique no ícone para tentar "
 "novamente."
 
-#: src/mimeview.c:1099
+#: src/mimeview.c:1100
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8426,27 +8559,27 @@ msgstr ""
 "Tempo esgotado durante a checagem da assinatura. Clique no ícone ou "
 "pressione '%s' para tentar novamente."
 
-#: src/mimeview.c:1344
+#: src/mimeview.c:1345
 msgid "Checking signature..."
 msgstr "Verificando a assinatura..."
 
-#: src/mimeview.c:1385
+#: src/mimeview.c:1386
 msgid "Go back to email"
 msgstr "Voltar à mensagem"
 
-#: src/mimeview.c:1806 src/mimeview.c:1898 src/mimeview.c:2140
-#: src/mimeview.c:2176 src/mimeview.c:2288 src/plugins/fancy/fancy_viewer.c:440
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 "Não foi possível salvar uma das partes da mensagem com múltiplas partes: %s"
 
-#: src/mimeview.c:1885
+#: src/mimeview.c:1894
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobrescrever o arquivo %s existente?"
 
-#: src/mimeview.c:1909
+#: src/mimeview.c:1918
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8455,59 +8588,59 @@ msgstr ""
 "Ocorreu um erro no salvamento da parte #%d da mensagem. Deseja cancelar a "
 "operação ou ignorar o erro e continuar?"
 
-#: src/mimeview.c:1912
+#: src/mimeview.c:1921
 msgid "Error saving all message parts"
 msgstr "Erro no salvamento de todas as partes da mensagem"
 
-#: src/mimeview.c:1913
+#: src/mimeview.c:1922
 msgid "Skip"
 msgstr "Ignorar"
 
-#: src/mimeview.c:1913
+#: src/mimeview.c:1922
 msgid "Skip all"
 msgstr "Ignorar tudo"
 
-#: src/mimeview.c:1923
+#: src/mimeview.c:1932
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d arquivo foi salvo com sucesso."
 msgstr[1] "%d arquivos foram salvos com sucesso."
 
-#: src/mimeview.c:1931
+#: src/mimeview.c:1940
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d arquivo foi salvo com sucesso"
 msgstr[1] "%d arquivos foram salvos com sucesso"
 
-#: src/mimeview.c:1936
+#: src/mimeview.c:1945
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d arquivo apresentou erro."
 msgstr[1] "%s, %d arquivos apresentaram erro."
 
-#: src/mimeview.c:1969 src/plugins/archive/archiver_prefs.c:142
-#: src/prefs_filtering_action.c:1262
+#: src/mimeview.c:1978 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Selecione a pasta de destino"
 
-#: src/mimeview.c:1976 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1985 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' não é um diretório."
 
-#: src/mimeview.c:2093 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5052
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr "Salvar como"
 
-#: src/mimeview.c:2223 src/mimeview.c:2230
+#: src/mimeview.c:2232 src/mimeview.c:2239
 msgid "Open with"
 msgstr "Abrir com"
 
-#: src/mimeview.c:2224 src/mimeview.c:2231
+#: src/mimeview.c:2233 src/mimeview.c:2240
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8516,7 +8649,7 @@ msgstr ""
 "Digite o comando para abrir o arquivo:\n"
 "('%s' será substituído pelo nome do arquivo)"
 
-#: src/mimeview.c:2326
+#: src/mimeview.c:2335
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8527,11 +8660,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2334
+#: src/mimeview.c:2343
 msgid "Execute untrusted binary?"
 msgstr "Executar binário não confiável?"
 
-#: src/mimeview.c:2335
+#: src/mimeview.c:2344
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8543,20 +8676,20 @@ msgstr ""
 "\n"
 "Deseja executar esse arquivo?"
 
-#: src/mimeview.c:2339
+#: src/mimeview.c:2348
 msgid "Run binary"
 msgstr "Executar o binário"
 
-#: src/mimeview.c:2642 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/mimeview.c:2643 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2808
+#: src/mimeview.c:2652 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2788
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/mimeview.c:2657 src/plugins/vcalendar/vcalendar.c:1240
+#: 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
 msgid "Description:"
@@ -8650,25 +8783,102 @@ msgstr ""
 
 #: src/news_gtk.c:56
 msgid "_Subscribe to newsgroup..."
-msgstr "_Assinar o Newsgroup..."
+msgstr "_Inscrever-se no Newsgroup..."
 
 #: src/news_gtk.c:57
 msgid "_Unsubscribe newsgroup"
-msgstr "_Cancelar a assinatura do Newsgroup"
+msgstr "_Cancelar a inscrição no Newsgroup"
 
 #: src/news_gtk.c:250
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
-msgstr "Deseja realmente cancelar a assinatura do Newsgroup '%s'?"
+msgstr "Deseja realmente cancelar a inscrição no Newsgroup '%s'?"
 
 #: src/news_gtk.c:251
 msgid "Unsubscribe newsgroup"
-msgstr "Cancelar a assinatura do Newsgroup"
+msgstr "Cancelar a inscrição no Newsgroup"
 
 #: src/news_gtk.c:291
 msgid "Rename newsgroup folder"
 msgstr "Renomear a pasta do Newsgroup"
 
+#: src/oauth2.c:238
+#| msgid "Default missing icon mode"
+msgid "OAuth2 missing authentication code\n"
+msgstr "Falta o código de autenticação do OAuth2\n"
+
+#: src/oauth2.c:244 src/oauth2.c:359
+#| msgid "IMAP connection broken\n"
+msgid "OAuth2 connection error\n"
+msgstr "Erro na conexão com OAuth2\n"
+
+#: src/oauth2.c:253 src/oauth2.c:367
+#| msgid "IMAP connection broken\n"
+msgid "OAuth2 SSL connection error\n"
+msgstr "Erro na conexão SSL com OAuth2\n"
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr "O token de acesso ao OAuth2 foi obtido\n"
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr "O token de acesso ao OAuth2 não foi obtido\n"
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr "O token de atualização do OAuth2 foi obtido\n"
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "O token de atualização do OAuth2 não foi obtido\n"
+
+#: src/oauth2.c:452
+#| msgid "Socket write error"
+msgid "OAuth2 socket write error\n"
+msgstr "Erro na escrita do socket OAuth2\n"
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr "Erro de limite de tempo do socket OAuth2\n"
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr "O token de acesso ao OAuth2 ainda está válido\n"
+
+#: src/oauth2.c:534
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr "Obtendo token de acesso  OAuth2 através do token de atualização\n"
+
+#: src/oauth2.c:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr ""
+"Tentando obter um token de acesso OAuth2 válido com o código "
+"de autenticação\n"
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr "O token de acesso OAuth2 foi atualizado\n"
+
+#: src/oauth2.c:583
+#, c-format
+#| msgid "Original %s part"
+msgid "OAuth2 original: %s\n"
+msgstr "OAuth2 original: %s\n"
+
+#: src/oauth2.c:584
+#, c-format
+#| msgid "--- Ended: %s\n"
+msgid "OAuth2 encoded: %s\n"
+msgstr "OAuth2 codificado: %s\n"
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr "OAuth2 decodificado: %s\n"
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr "Digite a senha mestra"
@@ -8851,9 +9061,9 @@ msgstr "Caminho no Livro de Endereços onde os endereços serão armazenados"
 #: 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/spamassassin/spamassassin_gtk.c:463
-#: src/prefs_filtering_action.c:545 src/prefs_filtering_action.c:552
-#: src/prefs_matcher.c:686
+#: src/plugins/spamassassin/spamassassin_gtk.c:466
+#: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
+#: src/prefs_matcher.c:690
 msgid "Select..."
 msgstr "Selecione..."
 
@@ -9093,7 +9303,7 @@ msgstr "Sim"
 #: 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:406
+#: src/prefs_summaries.c:409
 msgid "No"
 msgstr "Não"
 
@@ -9159,7 +9369,7 @@ msgstr "Localização e nome do pacote"
 
 #: src/plugins/archive/archiver_gtk.c:1098
 #: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:493
+#: src/plugins/pgpcore/select-keys.c:494
 msgid "_Select"
 msgstr "_Selecionar"
 
@@ -9324,7 +9534,7 @@ msgstr ""
 "significativamente o tempo de criação do pacote."
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:770
+#: src/plugins/managesieve/sieve_manager.c:771
 msgid "Rename"
 msgstr "Renomear"
 
@@ -9336,21 +9546,21 @@ msgstr "Selecione essa opção para excluir as mensagens após o empacotamento"
 msgid "Remove attachments"
 msgstr "Remover anexos"
 
-#: src/plugins/att_remover/att_remover.c:362
+#: src/plugins/att_remover/att_remover.c:363
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
 msgid "Remove"
 msgstr "Remover"
 
-#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:622
-#: src/prefs_summary_column.c:79 src/summaryview.c:2902
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:79 src/summaryview.c:2882
 msgid "Attachment"
 msgstr "Anexos"
 
-#: src/plugins/att_remover/att_remover.c:424
+#: src/plugins/att_remover/att_remover.c:425
 msgid "Destroy attachments"
 msgstr "Destruir anexos"
 
-#: src/plugins/att_remover/att_remover.c:425
+#: src/plugins/att_remover/att_remover.c:426
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -9360,34 +9570,34 @@ msgstr ""
 "\n"
 "Os dados excluídos não poderão ser recuperados."
 
-#: src/plugins/att_remover/att_remover.c:468
+#: src/plugins/att_remover/att_remover.c:469
 msgid "The selected messages don't have any attachments."
 msgstr "A mensagem selecionada não possui nenhum anexo."
 
-#: src/plugins/att_remover/att_remover.c:471
+#: src/plugins/att_remover/att_remover.c:472
 #, c-format
 msgid "Attachments removed from %d of the %d selected messages."
 msgstr "Anexos removidos de %d das %d mensagens selecionadas."
 
-#: src/plugins/att_remover/att_remover.c:474
+#: src/plugins/att_remover/att_remover.c:475
 #, c-format
 msgid "Attachments removed from all %d selected messages."
 msgstr "Os anexos foram removidos de todas as %d mensagens selecionadas."
 
-#: src/plugins/att_remover/att_remover.c:503
+#: src/plugins/att_remover/att_remover.c:504
 msgid "This message doesn't have any attachments."
 msgstr "Essa mensagem não possui nenhum anexo."
 
-#: src/plugins/att_remover/att_remover.c:516
+#: src/plugins/att_remover/att_remover.c:517
 msgid "Remove attachments..."
 msgstr "Remover anexos..."
 
-#: src/plugins/att_remover/att_remover.c:528
-#: src/plugins/att_remover/att_remover.c:588
+#: src/plugins/att_remover/att_remover.c:529
+#: src/plugins/att_remover/att_remover.c:589
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:593
+#: src/plugins/att_remover/att_remover.c:594
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9399,7 +9609,7 @@ msgstr ""
 "Atenção: esta operação não pode ser cancelada e os anexos excluídos estarão "
 "perdidos pra sempre (e pra sempre é realmente muito tempo)."
 
-#: src/plugins/att_remover/att_remover.c:617
+#: src/plugins/att_remover/att_remover.c:618
 msgid "Attachment handling"
 msgstr "Gerenciamento de anexos"
 
@@ -9479,7 +9689,7 @@ msgid ""
 msgstr ""
 "Não verifica a ausência de anexos ao encaminhar ou redirecionar mensagens"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:308
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:310
 msgid "Signatures"
 msgstr "Assinaturas"
 
@@ -9516,12 +9726,12 @@ msgstr "Bogofilter"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:118
-#: src/plugins/spamassassin/spamassassin_gtk.c:459
-#: src/plugins/spamassassin/spamassassin_gtk.c:508
-#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:682
-#: src/prefs_matcher.c:715 src/prefs_matcher.c:1657 src/prefs_matcher.c:1664
-#: src/prefs_matcher.c:1672 src/prefs_matcher.c:1674 src/prefs_matcher.c:2582
-#: src/prefs_matcher.c:2586
+#: 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
 msgid "Any"
 msgstr "Qualquer"
 
@@ -9617,25 +9827,25 @@ msgstr "Aprendizado de spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Process messages on receiving"
 msgstr "Processar as mensagens durante a recepção"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:374
+#: src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Maximum size"
 msgstr "Tamanho máximo"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:383
+#: src/plugins/spamassassin/spamassassin_gtk.c:386
 msgid "Messages larger than this will not be checked"
 msgstr "Mensagens maiores que isso não serão verificadas"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1639
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr "Kb"
 
@@ -9653,7 +9863,7 @@ msgstr "Apenas marcar como spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:432
+#: src/plugins/spamassassin/spamassassin_gtk.c:435
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9662,7 +9872,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:438
+#: src/plugins/spamassassin/spamassassin_gtk.c:441
 msgid "Click this button to select a folder for storing spam"
 msgstr "Clique nesse botão para selecionar uma pasta para armazenar os spams"
 
@@ -9694,13 +9904,13 @@ msgstr "Efetuado somente em mensagens nas pastas MH"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:453
+#: src/plugins/spamassassin/spamassassin_gtk.c:456
 msgid "Whitelist senders found in address book/folder"
-msgstr "Remetentes da lista branca presentes no Livro de Endereços/pasta"
+msgstr "Remetentes da lista limpa presentes no Livro de Endereços/pasta"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:457
+#: src/plugins/spamassassin/spamassassin_gtk.c:460
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9710,7 +9920,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:467
+#: src/plugins/spamassassin/spamassassin_gtk.c:470
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Clique nesse botão para selecionar um livro ou uma pasta no Livro de "
@@ -9719,7 +9929,7 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:207
 msgid "Learn whitelisted emails as ham"
-msgstr "Aprender os e-mails da lista branca como não-spam"
+msgstr "Aprender os emails da lista limpa como não-spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:270
 msgid ""
@@ -9727,7 +9937,7 @@ msgid ""
 "learn it as ham."
 msgstr ""
 "Se o Bogofilter definir uma mensagem como spam ou incerta, mas ela faz parte "
-"da lista branca, essa mensagem deve ser aprendida como não-spam."
+"da lista limpa, essa mensagem deve ser aprendida como não-spam."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:279
 msgid "Bogofilter call"
@@ -9739,7 +9949,7 @@ msgstr "Caminho para o programa Bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:445
+#: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Mark spam as read"
 msgstr "Marcar spam como lido"
 
@@ -9810,7 +10020,7 @@ msgstr ""
 "Bsfilter."
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:424
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid "Save spam in"
 msgstr "Salvar spam em"
 
@@ -9819,8 +10029,8 @@ msgid ""
 "If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
 msgstr ""
-"Se o Bsfilter identificar um e-mail como spam ou incerto, mas ele estiver na "
-"lista branca, será interpretado como não-spam."
+"Se o Bsfilter identificar um email como spam ou incerto, mas ele estiver na "
+"lista limpa, será interpretado como não-spam."
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:218
 msgid "Bsfilter call"
@@ -10162,7 +10372,7 @@ msgstr "Abrir no visualizador (o conteúdo remoto está habilitado)"
 msgid "Do nothing (remote content is disabled)"
 msgstr "Não fazer nada (o conteúdo remoto está desabilitado)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3947
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Proxy"
@@ -10176,6 +10386,7 @@ msgid "Use proxy"
 msgstr "Usar proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Recursos remotos"
 
@@ -10190,9 +10401,10 @@ msgstr ""
 "Carregar recursos remotos pode gerar alguns problemas de privacidade.\n"
 "Quando a carga de conteúdo remoto está desabilitada, nada é solicitado\n"
 "à rede. A renderização de imagens, scripts, objetos de plugin ou applets\n"
-"Java ainda podem estar habilitados para os conteúdos anexados ao e-mail."
+"Java ainda podem estar habilitados para os conteúdos anexados ao email."
 
 #: src/plugins/fancy/fancy_prefs.c:245
+#: src/plugins/litehtml_viewer/lh_prefs.c:121
 msgid "Enable loading of remote content"
 msgstr "Habilitar a carga de conteúdo remoto"
 
@@ -10211,8 +10423,8 @@ msgstr "O CSS desse arquivo será aplicado em todas as partes 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:1573 src/prefs_account.c:1662 src/prefs_account.c:2213
-#: src/prefs_customheader.c:235
+#: src/prefs_account.c:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
+#: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "E_xplorar"
 
@@ -10220,89 +10432,89 @@ msgstr "E_xplorar"
 msgid "Select stylesheet"
 msgstr "Selecione a folha de estilos"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr "A recuperação de conteúdo remoto está desabilitada."
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr "Carregar imagens"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr "Habilitar conteúdo remoto"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr "Habilitar Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr "Habilitar plugins"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr "Habilitar Java"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
 msgstr "Abrir os links com um navegador externo"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocorreu um erro: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s é uma fonte malformada ou não suportada"
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr "Pesquisar a Web"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr "Abrir no visualizador"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr "Abrir no navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr "Abrir a imagem"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
 msgstr "Copiar o link"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
 msgstr "Baixar o link"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr "Salvar imagem como"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr "Copiar a imagem"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr "Importar a fonte"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr "Visualizador HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10401,7 +10613,7 @@ msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:130
 msgid "GData plugin: Authorization required"
-msgstr "Plugin GData: É necessária autorização"
+msgstr "Plugin GData: É necessária a autorização"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:132
 msgid ""
@@ -10532,7 +10744,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Plugin GData: Tentando atualizar a autorização\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1944
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
 msgid "Authentication"
 msgstr "Autenticação"
 
@@ -10587,32 +10799,32 @@ msgstr ""
 msgid "GData integration"
 msgstr "Integração com GData"
 
-#: src/plugins/libravatar/libravatar.c:332
-#: src/plugins/libravatar/libravatar.c:397
-#: src/plugins/libravatar/libravatar.c:457
-#: src/plugins/libravatar/libravatar_prefs.c:546
+#: src/plugins/libravatar/libravatar.c:334
+#: src/plugins/libravatar/libravatar.c:399
+#: src/plugins/libravatar/libravatar.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:564
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: src/plugins/libravatar/libravatar.c:339
+#: src/plugins/libravatar/libravatar.c:341
 msgid "Failed to register avatar header update hook"
 msgstr ""
 "Não foi possível registrar o gancho de atualização do cabeçalho de avatar"
 
-#: src/plugins/libravatar/libravatar.c:348
+#: src/plugins/libravatar/libravatar.c:350
 msgid "Failed to register avatar image render hook"
 msgstr ""
 "Não foi possível registrar o gancho de renderização da imagem de avatar"
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:356
 msgid "Failed to create avatar image cache directory"
 msgstr "Não foi possível criar o diretório de cache da imagem de avatar"
 
-#: src/plugins/libravatar/libravatar.c:364
+#: src/plugins/libravatar/libravatar.c:366
 msgid "Failed to load missing items cache"
 msgstr "Não foi possível carregar o cache de itens faltantes"
 
-#: src/plugins/libravatar/libravatar.c:407
+#: src/plugins/libravatar/libravatar.c:409
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10643,34 +10855,34 @@ msgstr ""
 "\n"
 "Qualquer retorno para <ricardo at mones.org> é bem-vindo.\n"
 
-#: src/plugins/libravatar/libravatar_prefs.c:137
+#: src/plugins/libravatar/libravatar_prefs.c:146
 msgid "Error reading cache stats"
 msgstr "Ocorreu um erro ao ler as estatísticas do cache"
 
-#: src/plugins/libravatar/libravatar_prefs.c:141
+#: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr "Usando %s em %d arquivos, %d diretórios, %d outros e %d erros"
 
-#: src/plugins/libravatar/libravatar_prefs.c:150
+#: src/plugins/libravatar/libravatar_prefs.c:159
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
 msgstr "Usando %s em %d arquivos, %d diretórios e %d outros"
 
-#: src/plugins/libravatar/libravatar_prefs.c:164
+#: src/plugins/libravatar/libravatar_prefs.c:173
 msgid "Clear icon cache"
 msgstr "Limpar o cache de ícones"
 
-#: src/plugins/libravatar/libravatar_prefs.c:165
+#: src/plugins/libravatar/libravatar_prefs.c:174
 msgid "Are you sure you want to remove all cached avatar icons?"
 msgstr ""
 "Deseja realmente remover todos os ícones de avatares armazenados em cache?"
 
-#: src/plugins/libravatar/libravatar_prefs.c:178
+#: src/plugins/libravatar/libravatar_prefs.c:187
 msgid "Not enough memory for operation"
 msgstr "Não existe memória suficiente para essa operação"
 
-#: src/plugins/libravatar/libravatar_prefs.c:183
+#: src/plugins/libravatar/libravatar_prefs.c:192
 #, c-format
 msgid ""
 "Icon cache successfully cleared:\n"
@@ -10681,11 +10893,11 @@ msgstr ""
 "• %u entradas perdidas removidas.\n"
 "• %u arquivos removidos."
 
-#: src/plugins/libravatar/libravatar_prefs.c:188
+#: src/plugins/libravatar/libravatar_prefs.c:197
 msgid "Icon cache successfully cleared!"
 msgstr "O cache de ícones foi limpo com sucesso!"
 
-#: src/plugins/libravatar/libravatar_prefs.c:191
+#: src/plugins/libravatar/libravatar_prefs.c:200
 #, c-format
 msgid ""
 "Errors clearing icon cache:\n"
@@ -10700,84 +10912,102 @@ msgstr ""
 "• %u arquivos que não puderam ser lidos.\n"
 "• %u arquivos que não puderam ser removidos."
 
-#: src/plugins/libravatar/libravatar_prefs.c:198
+#: src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Error clearing icon cache."
 msgstr "Ocorreu um erro ao limpar o cache de ícones."
 
-#: src/plugins/libravatar/libravatar_prefs.c:213
+#: src/plugins/libravatar/libravatar_prefs.c:222
 msgid "_Use cached icons"
 msgstr "_Usar ícones do cache"
 
-#: src/plugins/libravatar/libravatar_prefs.c:214
+#: src/plugins/libravatar/libravatar_prefs.c:223
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 "Mantém os ícones no disco para reuso, ao invés de efetuar outra requisição à "
 "rede"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
+#: src/plugins/libravatar/libravatar_prefs.c:238
 msgid "Cache refresh interval"
 msgstr "Intervalo de atualização do cache"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1618
-#: src/prefs_account.c:1775 src/prefs_matcher.c:340 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "horas"
 
-#: src/plugins/libravatar/libravatar_prefs.c:305
+#: src/plugins/libravatar/libravatar_prefs.c:316
 msgid "Mystery man"
 msgstr "Mystery man"
 
-#: src/plugins/libravatar/libravatar_prefs.c:306
+#: src/plugins/libravatar/libravatar_prefs.c:317
 msgid "Identicon"
 msgstr "Identicon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:307
+#: src/plugins/libravatar/libravatar_prefs.c:318
 msgid "MonsterID"
 msgstr "MonsterID"
 
-#: src/plugins/libravatar/libravatar_prefs.c:308
+#: src/plugins/libravatar/libravatar_prefs.c:319
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: src/plugins/libravatar/libravatar_prefs.c:309
+#: src/plugins/libravatar/libravatar_prefs.c:320
 msgid "Retro"
 msgstr "Retro"
 
-#: src/plugins/libravatar/libravatar_prefs.c:310
+#: src/plugins/libravatar/libravatar_prefs.c:321
+msgid "Robohash"
+msgstr "Robohash"
+
+#: src/plugins/libravatar/libravatar_prefs.c:322
+msgid "Pagan"
+msgstr "Pagan"
+
+#: src/plugins/libravatar/libravatar_prefs.c:323
 msgid "Custom URL"
 msgstr "URL personalizada"
 
-#: src/plugins/libravatar/libravatar_prefs.c:313
+#: src/plugins/libravatar/libravatar_prefs.c:326
 msgid "A blank image"
 msgstr "Uma imagem em branco"
 
-#: src/plugins/libravatar/libravatar_prefs.c:314
+#: src/plugins/libravatar/libravatar_prefs.c:327
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "A silhueta em tom de cinza de baixo contraste não obstrusiva"
 
-#: src/plugins/libravatar/libravatar_prefs.c:315
+#: src/plugins/libravatar/libravatar_prefs.c:328
 msgid "A generated geometric pattern"
 msgstr "Um padrão geométrico"
 
-#: src/plugins/libravatar/libravatar_prefs.c:316
+#: src/plugins/libravatar/libravatar_prefs.c:329
 msgid "A generated full-body monster"
 msgstr "Um monstro de corpo inteiro"
 
-#: src/plugins/libravatar/libravatar_prefs.c:317
+#: src/plugins/libravatar/libravatar_prefs.c:330
 msgid "A generated almost unique face"
 msgstr "Uma face quase única"
 
-#: src/plugins/libravatar/libravatar_prefs.c:318
+#: src/plugins/libravatar/libravatar_prefs.c:331
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "Uma imagem pixelada ao estilo dos jogos 8-bit"
 
-#: src/plugins/libravatar/libravatar_prefs.c:319
+#: src/plugins/libravatar/libravatar_prefs.c:332
+#| msgid "A generated geometric pattern"
+msgid "A generated robotic character"
+msgstr "Um personagem robótico"
+
+#: src/plugins/libravatar/libravatar_prefs.c:333
+#| msgid "A generated geometric pattern"
+msgid "A generated retro adventure game character"
+msgstr "Um personagem de jogos de aventura retrô"
+
+#: src/plugins/libravatar/libravatar_prefs.c:334
 msgid "Redirect to a user provided URL"
 msgstr "Redireciona para uma URL fornecida pelo usuário"
 
-#: src/plugins/libravatar/libravatar_prefs.c:333
+#: src/plugins/libravatar/libravatar_prefs.c:348
 msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
@@ -10786,11 +11016,11 @@ msgstr ""
 "de usuário disponível. Deixe em branco para usar o ícone laranja padrão da "
 "libravatar."
 
-#: src/plugins/libravatar/libravatar_prefs.c:382
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "_Permitir redirecionamento para outros sites"
 
-#: src/plugins/libravatar/libravatar_prefs.c:383
+#: src/plugins/libravatar/libravatar_prefs.c:399
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -10798,24 +11028,24 @@ msgstr ""
 "Segue indicações de redirecionamento do servidor libravatar para outros "
 "serviços como o gravatar.com"
 
-#: src/plugins/libravatar/libravatar_prefs.c:392
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "_Habilitar servidores federados"
 
-#: src/plugins/libravatar/libravatar_prefs.c:393
+#: src/plugins/libravatar/libravatar_prefs.c:409
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
 "Tenta obter o avatar a partir do servidor libravatar do domínio do remetente"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr "Tempo da requisição esgotado"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/plugins/libravatar/libravatar_prefs.c:411
+#: 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."
@@ -10823,18 +11053,66 @@ msgstr ""
 "Defina 0 para usar o tempo limite global do socket de I/O. O valor máximo "
 "tem que ser menor que o tempo limite global do socket de I/O."
 
-#: src/plugins/libravatar/libravatar_prefs.c:455
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Cache de ícone"
 
-#: src/plugins/libravatar/libravatar_prefs.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "Modo de ícone faltante padrão"
 
-#: src/plugins/libravatar/libravatar_prefs.c:463
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Rede"
 
+#: src/plugins/litehtml_viewer/lh_prefs.c:116
+#| msgid ""
+#| "Loading remote resources can lead to some privacy issues.\n"
+#| "When remote content loading is disabled, nothing will be requested\n"
+#| "from the network. Rendering of images, scripts, plugin objects or\n"
+#| "Java applets can still be enabled for content that is attached\n"
+#| "in the email."
+msgid ""
+"Loading remote resources can lead to some privacy issues.\n"
+"When remote content loading is disabled, nothing will be requested\n"
+"from the network."
+msgstr ""
+"Carregar recursos remotos pode gerar alguns problemas de privacidade.\n"
+"Quando a carga de conteúdo remoto está desabilitada, nada é solicitado\n"
+"à rede."
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:133
+msgid "Size of image cache in megabytes"
+msgstr "Tamanho do cache de imagens em megabytes"
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:148
+#| msgid "Default format"
+msgid "Default font"
+msgstr "Fonte padrão"
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+#| msgid "Open with"
+msgid "Open Link"
+msgstr "Abrir o link"
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+#| msgid "Copy Link"
+msgid "Copy Link Location"
+msgstr "Copiar a localização do link"
+
+#: src/plugins/litehtml_viewer/plugin.c:50
+#| msgid "_List view"
+msgid "LiteHTML viewer"
+msgstr "Visualizador LiteHTML"
+
+#: src/plugins/litehtml_viewer/plugin.c:55
+msgid ""
+"Viewer plugin for HTML emails, using the litehtml library (http://www."
+"litehtml.com/)."
+msgstr ""
+"Plugin de visualização de emails em HTML, usando a biblioteca "
+"litehtml (http://www.litehtml.com/)."
+
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder"
 msgstr "pasta mailmbox"
@@ -10924,7 +11202,7 @@ msgstr "O método de autenticação não está disponível"
 msgid "sending error on Sieve session: %s\n"
 msgstr "erros de envio na sessão Sieve: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5850
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
 msgid "_Filter"
 msgstr "_Filtrar"
 
@@ -10983,7 +11261,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Filtro Sieve%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 "Abrindo..."
 
@@ -11033,7 +11311,7 @@ msgstr "Conectando..."
 msgid "Manage Sieve Filters"
 msgstr "Gerenciar filtros Sieve"
 
-#: src/plugins/managesieve/sieve_manager.c:805
+#: src/plugins/managesieve/sieve_manager.c:806
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "Para usar o Sieve, habilite-o nas preferências da conta."
 
@@ -11055,7 +11333,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Habilitar Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr "Informações do servidor"
 
@@ -11107,28 +11385,28 @@ msgstr "Especificar a autenticação"
 
 #: 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:1990
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 msgid "User ID"
 msgstr "ID do usuário"
 
 #: 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:2013 src/prefs_account.c:2741 src/prefs_account.c:2769
-#: src/prefs_account.c:2966 src/prefs_proxy.c:134 src/wizard.c:1216
+#: 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
 msgid "Password"
 msgstr "Senha"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1701
-#: src/prefs_account.c:1962
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1711
-#: src/prefs_account.c:1971 src/prefs_send.c:265 src/prefs_send.c:336
+#: 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
 msgid "Automatic"
 msgstr "Automático"
@@ -11168,7 +11446,7 @@ msgid ""
 "\n"
 "Current log is %s"
 msgstr ""
-"Este plugin escreve um sumário do cabeçalho de cada e-mail recebido, após "
+"Este plugin escreve um sumário do cabeçalho de cada email recebido, após "
 "ordená-los, em um arquivo de relatório\n"
 "\n"
 "O padrão é ~/Mail/NewLog\n"
@@ -11195,8 +11473,8 @@ msgstr "seleção recursiva"
 msgid "No new messages"
 msgstr "Nenhuma mensagem nova"
 
-#: src/plugins/notification/notification_plugin.c:216
-#: src/plugins/notification/notification_plugin.c:420
+#: src/plugins/notification/notification_plugin.c:220
+#: src/plugins/notification/notification_plugin.c:424
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -11208,57 +11486,57 @@ msgstr "Nenhuma mensagem nova"
 msgid "Notification"
 msgstr "Notificação"
 
-#: src/plugins/notification/notification_plugin.c:221
+#: src/plugins/notification/notification_plugin.c:225
 msgid "The Notification plugin needs threading support."
 msgstr "O plugin Notificação precisa suporte a agrupamento."
 
-#: src/plugins/notification/notification_plugin.c:228
+#: src/plugins/notification/notification_plugin.c:232
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
 "Não foi possível registrar o gancho de atualização de item da pasta no "
 "plugin Notificação"
 
-#: src/plugins/notification/notification_plugin.c:236
+#: src/plugins/notification/notification_plugin.c:240
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr ""
 "Não foi possível registrar o gancho de atualização da pasta no plugin "
 "Notificação"
 
-#: src/plugins/notification/notification_plugin.c:246
+#: src/plugins/notification/notification_plugin.c:250
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
 "Não foi possível registrar o gancho de atualização msginfo no plugin "
 "Notificação"
 
-#: src/plugins/notification/notification_plugin.c:256
+#: src/plugins/notification/notification_plugin.c:260
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr ""
 "Não foi possível registrar o gancho de desconexão no plugin Notificação"
 
-#: src/plugins/notification/notification_plugin.c:267
+#: src/plugins/notification/notification_plugin.c:271
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
 "Não foi possível registrar o gancho de encerramento da janela principal no "
 "plugin Notificação"
 
-#: src/plugins/notification/notification_plugin.c:280
+#: src/plugins/notification/notification_plugin.c:284
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr ""
 "Não foi possível registrar o gancho de minimização no plugin Notificação"
 
-#: src/plugins/notification/notification_plugin.c:293
+#: src/plugins/notification/notification_plugin.c:297
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
 "Não foi possível registrar o gancho de mudança na lista de contas no plugin "
 "Notificação"
 
-#: src/plugins/notification/notification_plugin.c:306
+#: src/plugins/notification/notification_plugin.c:310
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr ""
 "Não foi possível registrar o gancho de alteração do tema no plugin "
 "Notificação"
 
-#: src/plugins/notification/notification_plugin.c:425
+#: src/plugins/notification/notification_plugin.c:429
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -11274,13 +11552,13 @@ msgstr ""
 "\n"
 "Qualquer retorno para <berndth at gmx.de> é muito bem-vindo."
 
-#: src/plugins/notification/notification_plugin.c:450
+#: src/plugins/notification/notification_plugin.c:454
 msgid "Various tools"
 msgstr "Várias ferramentas"
 
 #: src/plugins/notification/notification_popup.c:311
 msgid "New Mail message"
-msgstr "Nova mensagem de e-mail"
+msgstr "Nova mensagem de email"
 
 #: src/plugins/notification/notification_popup.c:332
 msgid "New News post"
@@ -11323,7 +11601,7 @@ msgstr "Abrir a janela principal"
 
 #: src/plugins/notification/notification_popup.c:488
 msgid "Mail message"
-msgstr "Mensagem de e-mail"
+msgstr "Mensagem de email"
 
 #: src/plugins/notification/notification_popup.c:489
 #: src/plugins/notification/notification_popup.c:495
@@ -11379,7 +11657,7 @@ msgstr "Letreiro"
 msgid "Popup"
 msgstr "Janela de notificação"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:264
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:265
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Comando"
@@ -11402,7 +11680,7 @@ msgstr "Incluir os tipos de pasta"
 
 #: src/plugins/notification/notification_prefs.c:616
 msgid "Mail folders"
-msgstr "Pastas de e-mail"
+msgstr "Pastas de email"
 
 #: src/plugins/notification/notification_prefs.c:624
 msgid "News folders"
@@ -11452,7 +11730,7 @@ msgid "Never"
 msgstr "Nunca"
 
 #: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:502 src/prefs_summaries.c:555
+#: src/prefs_summaries.c:523 src/prefs_summaries.c:576
 msgid "Always"
 msgstr "Sempre"
 
@@ -11527,8 +11805,8 @@ msgstr "Cor da frente"
 
 #: src/plugins/notification/notification_prefs.c:927
 #: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:258 src/prefs_msg_colors.c:271
-#: src/prefs_msg_colors.c:284
+#: src/prefs_msg_colors.c:260 src/prefs_msg_colors.c:273
+#: src/prefs_msg_colors.c:286
 msgid "Background"
 msgstr "Fundo"
 
@@ -11690,7 +11968,7 @@ msgstr "%d nova(s), %d não lida(s), %d no total"
 
 #: src/plugins/notification/notification_trayicon.c:857
 msgid "New mail message"
-msgstr "Nova mensagem de e-mail"
+msgstr "Nova mensagem de email"
 
 #: src/plugins/notification/notification_trayicon.c:859
 msgid "New news post"
@@ -11762,95 +12040,95 @@ msgstr "Formato:"
 msgid "Optimized:"
 msgstr "Otimizado:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "Propriedades do PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "Digite a senha"
 
-#: 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 "Esse documento está travado e requer uma senha para ser aberto."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1387
 #, c-format
 msgid "%s Document"
 msgstr "Documento %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
 msgstr "de %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 "A renderização para PDF falhou por um motivo desconhecido."
 
-#: 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 "Índice do documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "Primeira página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr "Página anterior"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "Próxima página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "Última página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "Aumentar zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "Diminuir zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "Ajustar a página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "Ajustar a largura da página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "Girar para a esquerda"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "Girar para a direita"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "Imprimir documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "Informações do documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "Número da página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "Fator de 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 "
@@ -11863,13 +12141,13 @@ msgstr ""
 "\n"
 "Qualquer retorno é bem-vindo: 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 "Visualizador PDF"
 
-#: 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 "
@@ -11899,43 +12177,60 @@ msgstr ""
 msgid "Passphrase"
 msgstr "Frase-senha"
 
-#: src/plugins/pgpcore/passphrase.c:248
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[sem id do usuário]"
 
-#: src/plugins/pgpcore/passphrase.c:260
+#: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
 msgstr "Por favor, digite a senha para a nova chave:"
 
-#: src/plugins/pgpcore/passphrase.c:263
+#: src/plugins/pgpcore/passphrase.c:264
 msgid "Passphrases did not match.\n"
 msgstr "As senhas não conferem.\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:268
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "Por favor, digite novamente a senha para a nova chave:"
 
-#: src/plugins/pgpcore/passphrase.c:272
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Please enter the passphrase for:"
 msgstr "Por favor, digite a senha para:"
 
-#: src/plugins/pgpcore/passphrase.c:275
+#: src/plugins/pgpcore/passphrase.c:276
 msgid "Bad passphrase.\n"
 msgstr "Senha incorreta.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Importação de chaves"
 
-#: 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?"
 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 and import it?"
 msgstr ""
 "Essa chave não está no seu chaveiro. Deseja que o Claws Mail verifique-a e "
-"importe-a de um servidor de chaves?"
+"importe-a?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+#| msgid "No"
+msgid "_No"
+msgstr "_Não"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+#| msgid "Use proxy server"
+msgid "from keyserver"
+msgstr "do servidor de chaves"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+#| msgid "Create Directory"
+msgid "from Web Key Directory"
+msgstr "de um diretório web de chaves"
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
@@ -11943,15 +12238,15 @@ msgstr ""
 "\n"
 "  ID da chave "
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid "   This key is not in your keyring.\n"
 msgstr "   Essa chave não está no seu chaveiro.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   É possível importá-la "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -11959,17 +12254,21 @@ msgstr ""
 "quando estiver trabalhando conectado,\n"
 "   ou "
 
-#: src/plugins/pgpcore/pgp_viewer.c:188
+#: src/plugins/pgpcore/pgp_viewer.c:194
+#| msgid ""
+#| "with the following command: \n"
+#| "\n"
+#| "     "
 msgid ""
-"with the following command: \n"
+"with either of the following commands: \n"
 "\n"
 "     "
 msgstr ""
-"usando o seguinte comando: \n"
+"usando um dos comandos seguintes: \n"
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -11977,29 +12276,32 @@ msgstr ""
 "\n"
 "  Importação da ID da chave "
 
-#: 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 "   Essa chave foi importada para o seu chaveiro.\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 "   Não foi possível importar essa chave para o seu chaveiro.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Servidores de chaves algumas vezes são lentos.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Você pode tentar importá-la manualmente usando o comando:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+#| msgid ""
+#| "   You can try to import it manually with the command:\n"
+#| "\n"
+#| "     "
+msgid "   You can try to import it manually with the command:"
+msgstr "   Você pode tentar importá-la manualmente usando o comando:"
+
+#: src/plugins/pgpcore/pgp_viewer.c:288
+#| msgid "Port"
+msgid "or"
+msgstr "ou"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   Essa chave está no seu chaveiro.\n"
 
@@ -12060,8 +12362,8 @@ msgstr ""
 "Se for definida como '0', a senha será armazenada durante toda a sessão"
 
 #: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1782
-#: src/prefs_account.c:2079 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minutos"
 
@@ -12156,36 +12458,36 @@ msgstr "Máximo"
 msgid "Select Keys"
 msgstr "Selecione as chaves"
 
-#: src/plugins/pgpcore/select-keys.c:457
+#: src/plugins/pgpcore/select-keys.c:458
 msgid "Key ID"
 msgstr "ID da chave"
 
-#: src/plugins/pgpcore/select-keys.c:475
+#: src/plugins/pgpcore/select-keys.c:476
 msgid "Trust"
 msgstr "Confiar"
 
-#: src/plugins/pgpcore/select-keys.c:494
+#: src/plugins/pgpcore/select-keys.c:495
 msgid "_Other"
 msgstr "_Outro"
 
-#: src/plugins/pgpcore/select-keys.c:495
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "Do_n't encrypt"
 msgstr "_Não criptografar"
 
-#: src/plugins/pgpcore/select-keys.c:676
+#: src/plugins/pgpcore/select-keys.c:677
 msgid "Add key"
 msgstr "Adicionar chave"
 
-#: src/plugins/pgpcore/select-keys.c:677
+#: src/plugins/pgpcore/select-keys.c:678
 msgid "Enter another user or key ID:"
 msgstr "Informe outro usuário ou ID da chave:"
 
-#: src/plugins/pgpcore/select-keys.c:699
+#: src/plugins/pgpcore/select-keys.c:700
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Criptografar como %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:700
+#: src/plugins/pgpcore/select-keys.c:701
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -12419,7 +12721,7 @@ msgid ""
 "Do you want to create a new key pair now?"
 msgstr ""
 "O Claws Mail não encontrou nenhuma chave PGP secreta, o que significa que "
-"você não poderá assinar suas mensagens ou receber e-mails criptografados.\n"
+"você não poderá assinar suas mensagens ou receber emails criptografados.\n"
 "Deseja criar um novo par de chaves agora?"
 
 #: src/plugins/pgpcore/sgpgme.c:984 src/plugins/pgpcore/sgpgme.c:1006
@@ -12568,7 +12870,7 @@ msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
 msgstr ""
-"Por favor, perceba que os anexos e os cabeçalhos do e-mail (como o Assunto) "
+"Por favor, perceba que os anexos e os cabeçalhos do email (como o Assunto) "
 "não são criptografados pelo sistema PGP/Inline."
 
 #: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
@@ -12641,7 +12943,7 @@ msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
-"Por favor, perceba que os cabeçalhos do e-mail (como o Assunto) não são "
+"Por favor, perceba que os cabeçalhos do email (como o Assunto) não são "
 "criptografados pelo sistema PGP/Mime."
 
 #: src/plugins/pgpmime/pgpmime.c:798
@@ -12691,8 +12993,8 @@ msgstr "Exibir o console Python..."
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:2730
-#: src/prefs_account.c:2758 src/prefs_account.c:3195 src/wizard.c:1206
+#: 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
 msgid "Browse"
 msgstr "Navegar"
@@ -12881,7 +13183,7 @@ msgstr "Assinar a fonte"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
-msgstr "Digite a URL da fonte de notícias que você deseja assinar:"
+msgstr "Digite a URL da fonte de notícias à qual você deseja assinar:"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:99
 #, c-format
@@ -13022,7 +13324,7 @@ msgstr "Buscar comentários em publicações mais recentes que"
 
 #: 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:1608 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
+#: src/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dias"
 
@@ -13177,8 +13479,8 @@ msgid "401 (Authorisation required)"
 msgstr "401 (Requer autorização)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:110
-#: src/plugins/vcalendar/vcal_folder.c:1627
-msgid "403 (Unauthorised)"
+#| msgid "403 (Unauthorised)"
+msgid "403 (Forbidden)"
 msgstr "403 (Não autorizado)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
@@ -13314,7 +13616,7 @@ msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
 msgstr ""
-"Por favor, perceba que os cabeçalhos do e-mail (como o Assunto) não são "
+"Por favor, perceba que os cabeçalhos do email, como o Assunto, não são "
 "criptografados pelo sistema S/MIME."
 
 #: src/plugins/spam_report/spam_report.c:307
@@ -13364,7 +13666,7 @@ msgid "Password:"
 msgstr "Senha:"
 
 #: src/plugins/spamassassin/spamassassin.c:78
-#: src/plugins/spamassassin/spamassassin_gtk.c:671
+#: src/plugins/spamassassin/spamassassin_gtk.c:674
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -13437,68 +13739,68 @@ msgstr ""
 "As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
 "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Localhost"
 msgstr "Localhost"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:95
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:94
+#: src/plugins/spamassassin/spamassassin_gtk.c:97
 msgid "Unix Socket"
 msgstr "Socket Unix"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:122
+#: src/plugins/spamassassin/spamassassin_gtk.c:125
 msgid "Select folder to save spam to"
 msgstr "Selecione a pasta para armazenamento dos spams"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:274
+#: src/plugins/spamassassin/spamassassin_gtk.c:277
 msgid "Enable SpamAssassin plugin"
 msgstr "Habilitar o plugin do SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:278
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Transport"
 msgstr "Transportar"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:286
+#: src/plugins/spamassassin/spamassassin_gtk.c:289
 msgid "Type of transport"
 msgstr "Tipo de transporte"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:307
+#: src/plugins/spamassassin/spamassassin_gtk.c:310
 msgid "User"
 msgstr "Usuário"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:320
+#: src/plugins/spamassassin/spamassassin_gtk.c:323
 msgid "User to use with spamd server"
 msgstr "Usuário a ser utilizado para o servidor spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:322
+#: src/plugins/spamassassin/spamassassin_gtk.c:325
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:340
+#: src/plugins/spamassassin/spamassassin_gtk.c:343
 msgid "Hostname or IP address of spamd server"
 msgstr "Endereço ou endereço IP do servidor spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:354
 msgid "Port of spamd server"
 msgstr "Porta do servidor spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:360
 msgid "Path of Unix socket"
 msgstr "Caminho do socket Unix"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Use compression"
 msgstr "Usar compressão"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:368
+#: src/plugins/spamassassin/spamassassin_gtk.c:371
 msgid "Enable compression if spamd uses it, otherwise disable it."
 msgstr ""
 "Habilitar compressão caso o spamd utilize isso, do contrário, desabilite."
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:403
+#: src/plugins/spamassassin/spamassassin_gtk.c:406
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13691,9 +13993,9 @@ msgstr ""
 "Para criar uma reunião clique com o botão direito do mouse nas pastas "
 "vCalendar ou Reuniões e escolha \"Nova reunião...\".\n"
 "\n"
-"Você também estará apto a inscrever-se em fontes Webcal remotas, exportar "
-"suas reuniões e agendas, publicar sua informação de livre/ocupado e "
-"recuperar essa informação dos outros."
+"Você também estará apto a assinar fontes Webcal remotas, exportar suas "
+"reuniões e agendas, publicar sua informação de livre/ocupado e recuperar "
+"essa informação dos outros."
 
 #: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
@@ -13729,45 +14031,45 @@ msgstr "Aceitar provisioriamente"
 msgid "Decline"
 msgstr "Recusar"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr "Você tem uma tarefa."
 
-#: 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:718
 msgid "Details follow:"
 msgstr "Detalhes a seguir:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "Você criou uma reunião."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr "Você foi convidado para uma reunião."
 
-#: 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 "Uma reunião para a qual você foi convidado foi cancelada."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr "Foi remetido um compromisso para você."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr "(esse evento é recorrente)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr "(esse evento é parte de um evento repetitivo)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Você recebeu uma resposta para uma proposta de reunião desconhecida."
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13776,35 +14078,35 @@ msgstr ""
 "Você recebeu uma resposta para uma proposta de reunião.\n"
 "%s %s o convite, que tem os seguintes detalhes:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr "Erro - não foi possível obter a parte MIME da agenda."
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr "Erro - não foi encontrada nenhuma parte de agenda."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr "Erro - tipo de componente de agenda desconhecido."
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
 msgstr "Enviar uma notificação aos participantes"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr "Cancelar reunião"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Deseja realmente cancelar essa reunião?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr "Não foi encontrada nenhuma conta"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13812,68 +14114,68 @@ msgstr ""
 "Você não possui nenhuma conta correspondente a nenhum dos participantes.\n"
 "Deseja responder mesmo assim?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr "Responder mesmo assim"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr "Responder"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr "Editar reunião..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr "Cancelar reunião..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr "Abrir site da Web"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr "Você já está ocupado nesse horário."
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Evento:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Localização:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr "Início:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr "Término:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Participantes:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr "Ação:"
 
@@ -13887,7 +14189,7 @@ msgstr "_Exportar agenda..."
 
 #: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Subscribe to Webcal..."
-msgstr "_Inscrever-se no Webcal..."
+msgstr "_Assinar o Webcal..."
 
 #: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Rename..."
@@ -13895,7 +14197,7 @@ msgstr "_Renomear..."
 
 #: src/plugins/vcalendar/vcal_folder.c:173
 msgid "U_pdate subscriptions"
-msgstr "_Atualizar inscrições"
+msgstr "_Atualizar assinaturas"
 
 #: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_List view"
@@ -13947,6 +14249,10 @@ msgstr ""
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Tempo esgotado (%d segundos) ao tentar conectar com %s\n"
 
+#: src/plugins/vcalendar/vcal_folder.c:1627
+msgid "403 (Unauthorised)"
+msgstr "403 (Não autorizado)"
+
 #: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
@@ -13997,11 +14303,11 @@ msgstr "nova assinatura"
 
 #: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Claws Mail needs network access in order to update the subscription."
-msgstr "O Claws Mail necessita de acesso à rede para atualizar a inscrição."
+msgstr "O Claws Mail necessita de acesso à rede para atualizar a assinatura."
 
 #: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Subscribe to Webcal"
-msgstr "Inscrever-se no Webcal"
+msgstr "Assinar o Webcal"
 
 #: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Enter the Webcal URL:"
@@ -14013,11 +14319,11 @@ msgstr "Não foi possível analisar a URL."
 
 #: src/plugins/vcalendar/vcal_folder.c:1995
 msgid "Do you really want to unsubscribe?"
-msgstr "Deseja realmente desinscrever-se?"
+msgstr "Deseja realmente cancelar a assinatura?"
 
 #: src/plugins/vcalendar/vcal_folder.c:1996
 msgid "Delete subscription"
-msgstr "Excluir a inscrição"
+msgstr "Excluir a assinatura"
 
 #: src/plugins/vcalendar/vcal_manager.c:111
 msgid "accepted"
@@ -14292,7 +14598,7 @@ msgid "Starts at:"
 msgstr "Início:"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:767
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:771
 msgid "on:"
 msgstr "em:"
 
@@ -14419,7 +14725,7 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcal_prefs.c:413
 msgid "Include Webcal subscriptions in export"
-msgstr "Incluir as inscrições de Webcal na exportação"
+msgstr "Incluir as assinaturas de Webcal na exportação"
 
 #: src/plugins/vcalendar/vcal_prefs.c:423
 msgid "Command to run after calendar export"
@@ -14474,7 +14780,7 @@ msgid ""
 "left part of the email address, %d for the domain"
 msgstr ""
 "Especifique um arquivo local ou uma URL (http://servidor/caminho/arquivo."
-"ifb). Use %u para a parte esquerda do endereço de e-mail, %d para o domínio"
+"ifb). Use %u para a parte esquerda do endereço de email, %d para o domínio"
 
 #: src/plugins/vcalendar/vcal_prefs.c:581
 msgid "SSL/TLS options"
@@ -14492,95 +14798,95 @@ msgstr "Erro de sintaxe na marca de hora durante a saudação\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Erro de sintaxe na marca de hora durante a saudação (não é ASCII)\n"
 
-#: src/pop.c:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "Erro do protocolo POP\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "resposta UIDL inválida: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Excluindo a mensagem expirada %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Ignorando mensagem %d [%s] (%d bytes)\n"
 
-#: src/pop.c:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "a caixa postal está travada\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "Tempo da sessão esgotado\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "comando não suportado\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "ocorreu um erro na sessão POP\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "Comando TOP não suportado\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1582 src/prefs_account.c:2658
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1695 src/prefs_account.c:2673
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Arquivo mbox local"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr "Nenhum (somente SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr "Nome da conta"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
 msgstr "Definir como padrão"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr "Informações pessoais"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
-msgstr "Endereço de e-mail"
+msgstr "Endereço de email"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Configuração automática"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14588,77 +14894,83 @@ msgstr ""
 "Aviso: essa versão do Claws Mail\n"
 "foi compilada sem suporte a IMAP e Newsgroups."
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr "Autenticar ao conectar"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr "Servidor de news"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr "Servidor para recebimento"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr "Caixa postal local"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr "Utilizar comando mail ao invés do servidor SMTP"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr "comando para enviar mensagens"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 
-#: src/prefs_account.c:1556
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1562 src/prefs_account.c:1651
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr "Caixa de Entrada padrão"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1576 src/prefs_account.c:1658
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Mensagens não filtradas serão armazenadas nessa pasta"
 
-#: src/prefs_account.c:1584
-msgid "Use secure authentication (APOP)"
-msgstr "Usar autenticação de segurança (APOP)"
+#: src/prefs_account.c:1634
+#| msgid "Authenticate on connect"
+msgid "Authenticate before POP connection"
+msgstr "Autenticar antes da conexão POP"
 
-#: src/prefs_account.c:1587
+#: src/prefs_account.c:1658 src/prefs_account.c:2259
+#| msgid "_Select"
+msgid "Select"
+msgstr "Selecionar"
+
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr "Eliminar as mensagens do servidor após recebê-las"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr "Remover após"
 
-#: src/prefs_account.c:1605 src/prefs_account.c:1615
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dia e 0 hora: excluir imediatamente"
 
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr "Tamanho limite do recebimento"
 
-#: src/prefs_account.c:1631
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14666,94 +14978,94 @@ msgstr ""
 "Mensagens acima desse limite serão recebidas parcialmente. Ao selecioná-las, "
 "você poderá obtê-las por inteiro ou exclui-las."
 
-#: src/prefs_account.c:1671 src/prefs_account.c:2688
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1678
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos a receber"
 
-#: src/prefs_account.c:1688
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr "ilimitado se for especificado 0"
 
-#: src/prefs_account.c:1713
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr "Texto puro"
 
-#: src/prefs_account.c:1726
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr "Diretório do servidor IMAP"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr "(geralmente vazio)"
 
-#: src/prefs_account.c:1744
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
-msgstr "Mostrar apenas pastas assinadas"
+msgstr "Mostrar apenas pastas inscritas"
 
-#: src/prefs_account.c:1751
+#: src/prefs_account.c:1831
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Módulo de eficiência de banda (impede a recuperação de etiquetas remotas)"
 
-#: src/prefs_account.c:1753
+#: src/prefs_account.c:1833
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Esse modo usa menos banda, mas pode ser mais lento com alguns servidores."
 
-#: src/prefs_account.c:1760 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Verificação automática"
 
-#: src/prefs_account.c:1763
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr "Usar as configurações globais"
 
-#: src/prefs_account.c:1769 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Verificar por novas mensagens a cada"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account.c:1824
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permite filtrar usando plugins, durante o recebimento"
 
-#: src/prefs_account.c:1828
+#: src/prefs_account.c:1908
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 
-#: src/prefs_account.c:1917 src/prefs_customheader.c:209
-#: src/prefs_matcher.c:633 src/prefs_matcher.c:2010 src/prefs_matcher.c:2038
+#: 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
 msgid "Header"
 msgstr "Cabeçalho"
 
-#: src/prefs_account.c:1919
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account.c:1922
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
-msgstr "Enviar o endereço de e-mail da conta na Message-ID"
+msgstr "Enviar o endereço de email da conta na Message-ID"
 
-#: src/prefs_account.c:1925
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr "Adicionar cabeçalho user agent"
 
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho definido pelo usuário"
 
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2045
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14761,174 +15073,227 @@ msgstr ""
 "Deixe estes campos em branco, para utilizar os mesmos usuário e senha de "
 "recebimento."
 
-#: src/prefs_account.c:2056
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr "Autenticar via POP antes de enviar"
 
-#: src/prefs_account.c:2071
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr "Tempo esgotado para autenticação POP"
 
-#: src/prefs_account.c:2159 src/prefs_account.c:2205
+#: src/prefs_account.c:2233
+#| msgid "Authentication"
+msgid "Authorization"
+msgstr "Autorização"
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr "Selecione o provedor de serviço de email OAuth2"
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr "ID do cliente"
+
+#: src/prefs_account.c:2296
+#| msgid "Client certificates"
+msgid "Client secret"
+msgstr "Segredo do cliente"
+
+#: src/prefs_account.c:2328
+#| msgid "GData plugin: Authorization successful\n"
+msgid "Obtain authorization code"
+msgstr "Obter código de autorização"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr "Abrir o navegador padrão ao requisitar"
+
+#: src/prefs_account.c:2338
+#| msgid "Copy Link"
+msgid "Copy link"
+msgstr "Copiar o link"
+
+#: src/prefs_account.c:2350
+#| msgid "Authentication method"
+msgid "Authorization code"
+msgstr "Código de autorização"
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr ""
+"Colar a URL completa do navegador ou o token de autenticação "
+"fornecido"
+
+#: src/prefs_account.c:2364
+#| msgid "No authentication"
+msgid "Complete authorization"
+msgstr "Autorização completa"
+
+#: src/prefs_account.c:2368
+#| msgid "Author"
+msgid "Authorize"
+msgstr "Autorizar"
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/prefs_account.c:2162
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
 msgstr "Inserir a assinatura automaticamente"
 
-#: src/prefs_account.c:2167
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_account.c:2192
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr "Saída do comando"
 
-#: src/prefs_account.c:2225
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
-#: src/prefs_account.c:2277
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr "Dicionários de checagem ortográfica"
 
-#: src/prefs_account.c:2287 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Dicionário padrão"
 
-#: src/prefs_account.c:2300 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Dicionário alternativo padrão"
 
-#: src/prefs_account.c:2386 src/prefs_account.c:3799
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/prefs_account.c:2401 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2416 src/prefs_filtering_action.c:185
+#: 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
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/prefs_account.c:2463
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr "Sistema de privacidade padrão"
 
-#: src/prefs_account.c:2492 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Sempre assinar as mensagens"
 
-#: src/prefs_account.c:2494 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Sempre criptografar as mensagens"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2792
 msgid "Always sign messages when replying to a signed message"
 msgstr "Sempre assinar as mensagens em resposta a mensagens assinadas"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2795
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Sempre criptografar as mensagens em resposta a mensagens criptografadas"
 
-#: src/prefs_account.c:2502
+#: src/prefs_account.c:2798
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Criptografar as mensagens enviadas com sua própria chave além da dos "
 "destinatários"
 
-#: src/prefs_account.c:2504
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvar mensagens criptografadas enviadas como texto simples"
 
-#: src/prefs_account.c:2662 src/prefs_account.c:2677 src/prefs_account.c:2691
+#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
 msgid "Don't use SSL/TLS"
 msgstr "Não usar SSL/TLS"
 
-#: src/prefs_account.c:2665 src/prefs_account.c:2680 src/prefs_account.c:2700
-#: src/prefs_account.c:2711
+#: 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 "Usar SSL/TLS"
 
-#: src/prefs_account.c:2668 src/prefs_account.c:2683 src/prefs_account.c:2714
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Usar o comando STARTTLS para iniciar sessão criptografada"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2708
+#: src/prefs_account.c:3004
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Não usar SSL/TLS (mas, se necessário, usar STARTTLS)"
 
-#: src/prefs_account.c:2719
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr "Certificados do cliente"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr "Certificado para recebimento"
 
-#: src/prefs_account.c:2732 src/prefs_account.c:2734 src/prefs_account.c:2760
-#: src/prefs_account.c:2762
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado do cliente como um arquivo PKCS12 ou PEM"
 
-#: src/prefs_account.c:2755
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr "Certificado para envio"
 
-#: src/prefs_account.c:2795
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Aceitar automaticamente certificados SSL/TLS válidos"
 
-#: src/prefs_account.c:2798
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr "Utilizar SSL/TLS não bloqueador"
 
-#: src/prefs_account.c:2810
+#: src/prefs_account.c:3106
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Desligue essa opção caso você tenha problemas de conexão via SSL/TLS"
 
-#: src/prefs_account.c:2902 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Usar um servidor proxy"
 
-#: src/prefs_account.c:2911
+#: src/prefs_account.c:3207
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Utilizar as configurações padrão"
 
-#: src/prefs_account.c:2913
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
 msgstr "Usar as configurações de servidor proxy do sistema"
 
-#: src/prefs_account.c:2950 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Usar autenticação"
 
-#: src/prefs_account.c:2955 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: src/prefs_account.c:2989
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
 msgstr "Usar o servidor proxy para envio"
 
-#: src/prefs_account.c:2991
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14937,27 +15302,27 @@ msgstr ""
 "com o servidor de envios configurado, ignorando qualquer servidor proxy "
 "configurado."
 
-#: src/prefs_account.c:3102
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr "Porta SMTP"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr "Porta POP"
 
-#: src/prefs_account.c:3116
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr "Porta IMAP"
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr "Porta NNTP"
 
-#: src/prefs_account.c:3129
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14965,238 +15330,243 @@ msgstr ""
 "O nome do domínio será utilizado na Message-ID gerada e durante a conexão "
 "com os servidores SMTP."
 
-#: src/prefs_account.c:3146
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr "Utilizar comando para comunicar com o servidor"
 
-#: src/prefs_account.c:3155
+#: src/prefs_account.c:3451
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar mensagens de cross-posting como lidas e com a cor:"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr "Colocar as mensagens enviadas em"
 
-#: src/prefs_account.c:3210
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr "Colocar as mensagens a serem enviadas em"
 
-#: src/prefs_account.c:3212
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr "Colocar os rascunhos das mensagens em"
 
-#: src/prefs_account.c:3214
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr "Colocar as mensagens excluídas em"
 
-#: src/prefs_account.c:3271
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr "O nome da conta não foi informado."
 
-#: src/prefs_account.c:3275
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
-msgstr "O endereço de e-mail não foi informado."
+msgstr "O endereço de email não foi informado."
 
-#: src/prefs_account.c:3283
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr "O servidor SMTP não foi informado."
 
-#: src/prefs_account.c:3288
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr "A ID do usuário não foi informada."
 
-#: src/prefs_account.c:3293
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr "O servidor POP não foi informado."
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr "A pasta padrão da Caixa de Entrada não existe."
 
-#: src/prefs_account.c:3319
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr "O servidor IMAP não foi informado."
 
-#: src/prefs_account.c:3324
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr "O servidor NNTP não foi informado."
 
-#: src/prefs_account.c:3330
+#: src/prefs_account.c:3626
 msgid "local mailbox filename is not entered."
 msgstr "o nome do arquivo da caixa postal local não informado."
 
-#: src/prefs_account.c:3336
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
-msgstr "o comando de e-mail não foi informado."
+msgstr "o comando de email não foi informado."
 
-#: src/prefs_account.c:3346
+#: src/prefs_account.c:3642
 msgid "User ID cannot contain a newline character."
 msgstr "O ID do usuário não pode conter o caractere de quebra de linha."
 
-#: src/prefs_account.c:3351
+#: src/prefs_account.c:3647
 msgid "Password cannot contain a newline character."
 msgstr "A senha não pode conter um caractere de quebra de linha."
 
-#: src/prefs_account.c:3379
+#: src/prefs_account.c:3678
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "O ID do usuário SMTP não pode conter o caractere de quebra de linha."
 
-#: src/prefs_account.c:3384
+#: src/prefs_account.c:3683
 msgid "SMTP password cannot contain a newline character."
 msgstr "A senha do SMTP não pode conter um caractere de quebra de linha."
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr "o domínio não está especificado."
 
-#: src/prefs_account.c:3465
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr "a pasta Enviados não está selecionada."
 
-#: src/prefs_account.c:3470
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr "a pasta Fila de Saída não está selecionada."
 
-#: src/prefs_account.c:3475
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr "a pasta Rascunhos não está selecionada."
 
-#: src/prefs_account.c:3480
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "a pasta Lixeira não está selecionada."
 
-#: src/prefs_account.c:3763
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account.c:3817 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+#| msgid "Author"
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modelos"
 
-#: src/prefs_account.c:3835
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/prefs_account.c:3965
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/prefs_account.c:4314
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr "Preferências da nova conta"
 
-#: src/prefs_account.c:4316
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferências da conta"
 
-#: src/prefs_account.c:4435 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Falha (endereço errado)"
 
-#: src/prefs_account.c:4520
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr "Selecione o arquivo de assinatura"
 
-#: src/prefs_account.c:4538 src/prefs_account.c:4555 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Selecione o arquivo do certificado"
 
-#: src/prefs_account.c:4651
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:4822
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin não carregado)"
 
-#: src/prefs_actions.c:224
+#: src/prefs_actions.c:225
 msgid "Actions configuration"
 msgstr "Configuração de ações"
 
-#: src/prefs_actions.c:251
+#: src/prefs_actions.c:252
 msgid "Menu name"
 msgstr "Nome do menu"
 
-#: src/prefs_actions.c:284
+#: src/prefs_actions.c:285
 msgid "Shell command"
 msgstr "Comando do shell"
 
-#: src/prefs_actions.c:294
+#: src/prefs_actions.c:295
 msgid "Filter action"
 msgstr "Ação de filtragem"
 
-#: src/prefs_actions.c:300
+#: src/prefs_actions.c:301
 msgid "Edit filter action"
 msgstr "Editar ação de filtragem"
 
-#: src/prefs_actions.c:328
+#: src/prefs_actions.c:329
 msgid "Append the new action above to the list"
 msgstr "Adiciona a nova ação definida acima à lista"
 
-#: src/prefs_actions.c:336
+#: src/prefs_actions.c:337
 msgid "Replace the selected action in list with the action above"
 msgstr "Substitui a ação selecionada na lista pela definida acima"
 
-#: src/prefs_actions.c:338 src/prefs_filtering_action.c:588
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:800 src/prefs_template.c:319
+#: src/prefs_actions.c:339 src/prefs_filtering_action.c:589
+#: src/prefs_filtering.c:487 src/prefs_matcher.c:804 src/prefs_template.c:320
 #: src/prefs_toolbar.c:1024
 msgid "D_elete"
 msgstr "E_xcluir"
 
-#: src/prefs_actions.c:346
+#: src/prefs_actions.c:347
 msgid "Delete the selected action from the list"
 msgstr "Exclui a ação selecionada da lista"
 
-#: src/prefs_actions.c:356 src/prefs_filtering.c:503 src/prefs_template.c:337
+#: src/prefs_actions.c:357 src/prefs_filtering.c:504 src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Limpa todos os campos da janela"
 
-#: src/prefs_actions.c:364
+#: src/prefs_actions.c:365
 msgid "Show information on configuring actions"
 msgstr "Mostra informações sobre a configuração de ações"
 
-#: src/prefs_actions.c:395
+#: src/prefs_actions.c:396
 msgid "Move the selected action up"
 msgstr "Move a ação selecionada para cima"
 
-#: src/prefs_actions.c:403
+#: src/prefs_actions.c:404
 msgid "Move selected action down"
 msgstr "Move a ação selecionada para baixo"
 
-#: src/prefs_actions.c:536 src/prefs_filtering_action.c:677
-#: src/prefs_filtering.c:838 src/prefs_filtering.c:840
-#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:918
-#: src/prefs_template.c:471
+#: src/prefs_actions.c:537 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:841
+#: src/prefs_filtering.c:842 src/prefs_filtering.c:952 src/prefs_matcher.c:922
+#: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Novo)"
 
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:602
 msgid "Menu name is not set."
 msgstr "O nome do menu não foi definido."
 
-#: src/prefs_actions.c:606
+#: src/prefs_actions.c:607
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Não é permitida a barra '/' no nome do menu."
 
-#: src/prefs_actions.c:611
+#: src/prefs_actions.c:612
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Não é permitido o sinal dois pontos ':' no nome do menu."
 
-#: src/prefs_actions.c:630
+#: src/prefs_actions.c:631
 msgid "Menu name is too long."
 msgstr "O nome do menu é muito longo."
 
-#: src/prefs_actions.c:639
+#: src/prefs_actions.c:640
 msgid "Command-line not set."
 msgstr "O comando não foi definido."
 
-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:645
 msgid "Menu name and command are too long."
 msgstr "O nome do menu e o comando são muito longos."
 
-#: src/prefs_actions.c:650
+#: src/prefs_actions.c:651
 #, c-format
 msgid ""
 "The command\n"
@@ -15207,139 +15577,139 @@ msgstr ""
 "%s\n"
 "possui um erro de sintaxe."
 
-#: src/prefs_actions.c:708
+#: src/prefs_actions.c:709
 msgid "Delete action"
 msgstr "Excluir ação"
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:710
 msgid "Do you really want to delete this action?"
 msgstr "Deseja realmente deseja excluir essa ação?"
 
-#: src/prefs_actions.c:729
+#: src/prefs_actions.c:730
 msgid "Delete all actions"
 msgstr "Excluir todas as ações"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:731
 msgid "Do you really want to delete all the actions?"
 msgstr "Deseja realmente deseja excluir todas as ações?"
 
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1503
-#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2161 src/prefs_template.c:571
-#: src/prefs_template.c:596
+#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
+#: src/prefs_filtering.c:1526 src/prefs_matcher.c:2165 src/prefs_template.c:572
+#: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "A entrada não foi salva"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
-#: src/prefs_filtering.c:1526 src/prefs_template.c:572 src/prefs_template.c:597
+#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1505
+#: src/prefs_filtering.c:1527 src/prefs_template.c:573 src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "A entrada não foi salva. Fechar mesmo assim?"
 
-#: src/prefs_actions.c:895 src/prefs_actions.c:900 src/prefs_actions.c:926
-#: src/prefs_filtering.c:1483 src/prefs_filtering.c:1505
-#: src/prefs_filtering.c:1527 src/prefs_matcher.c:2164 src/prefs_template.c:573
-#: src/prefs_template.c:598 src/prefs_template.c:603
+#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
+#: src/prefs_filtering.c:1484 src/prefs_filtering.c:1506
+#: src/prefs_filtering.c:1528 src/prefs_matcher.c:2168 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "Con_tinuar editando"
 
-#: src/prefs_actions.c:898
+#: src/prefs_actions.c:899
 msgid "Actions list not saved"
 msgstr "A lista de ações não foi salva"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:900
 msgid "The actions list has been modified. Close anyway?"
 msgstr "A lista de ações foi modificada. Fechar mesmo assim?"
 
-#: src/prefs_actions.c:969
+#: src/prefs_actions.c:970
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nome do menu:</span>"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:971
 msgid "Use / in menu name to make submenus."
 msgstr "Use / no nome do menu para criar sub-menus."
 
-#: src/prefs_actions.c:972
+#: src/prefs_actions.c:973
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Comando:</span>"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Começar com:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:975
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "para enviar o corpo da mensagem ou a seleção para a entrada padrão do comando"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:976
 msgid "to send user provided text to command's standard input"
 msgstr ""
 "para enviar o texto fornecido pelo usuário para a entrada padrão do comando"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:977
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "para enviar o texto escondido fornecido pelo usuário para a entrada padrão "
 "do comando"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Terminar com:</span>"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:979
 msgid "to replace message body or selection with command's standard output"
 msgstr "para substituir o corpo da mensagem ou a seleção pela saída do comando"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:980
 msgid "to insert command's standard output without replacing old text"
 msgstr "para inserir a saída do comando sem substituir o texto antigo"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:981
 msgid "to run command asynchronously"
 msgstr "para executar o comando em modo assíncrono"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Usar:</span>"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:983
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "para o arquivo da mensagem selecionada no formato RFC822/2822 "
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:984
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "para a lista dos arquivos das mensagens selecionadas no formato RFC822/2822"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:985
 msgid "for the file of the selected decoded message MIME part"
 msgstr "para o arquivo da parte MIME da mensagem decodificada selecionada"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:986
 msgid "for a user provided argument"
 msgstr "para um argumento fornecido pelo usuário"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:987
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "para um argumento escondido fornecido pelo usuário (ex. senha)"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:988
 msgid "for the text selection"
 msgstr "para a seleção de texto"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:989
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplica as ações de filtragem entre {} nas mensagens selecionadas"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:990
 msgid "for a literal %"
 msgstr "para um % literal"
 
-#: src/prefs_actions.c:999 src/prefs_themes.c:1090
+#: src/prefs_actions.c:1000 src/prefs_themes.c:1090
 msgid "Actions"
 msgstr "Ações"
 
-#: src/prefs_actions.c:1000
+#: src/prefs_actions.c:1001
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -15347,17 +15717,17 @@ msgstr ""
 "O recurso Ações é uma forma do usuário executar comandos externos para "
 "processar um arquivo completo de mensagens ou somente uma de suas partes."
 
-#: src/prefs_actions.c:1087 src/prefs_filtering.c:1701
-#: src/prefs_template.c:1113
+#: src/prefs_actions.c:1088 src/prefs_filtering.c:1702
+#: src/prefs_template.c:1114
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: src/prefs_actions.c:1207
+#: src/prefs_actions.c:1208
 msgid "Current actions"
 msgstr "Ações atuais"
 
-#: src/prefs_actions.c:1306 src/prefs_filtering.c:1078
-#: src/prefs_filtering.c:1136
+#: src/prefs_actions.c:1307 src/prefs_filtering.c:1079
+#: src/prefs_filtering.c:1137
 msgid "Action string is not valid."
 msgstr "A especificação da ação não é válida."
 
@@ -15378,7 +15748,7 @@ msgstr ""
 "\\n}?t{Para: %t\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Assunto: %s\\n}\\n\\n"
 "%M"
 
-#: src/prefs_common.c:451
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15475,106 +15845,106 @@ msgstr "Anexo"
 msgid "Writing"
 msgstr "Escrita"
 
-#: src/prefs_customheader.c:184
+#: src/prefs_customheader.c:185
 msgid "Custom header configuration"
 msgstr "Configuração de cabeçalhos personalizados"
 
-#: src/prefs_customheader.c:503 src/prefs_display_header.c:588
-#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1648
+#: src/prefs_customheader.c:504 src/prefs_display_header.c:589
+#: src/prefs_matcher.c:1637 src/prefs_matcher.c:1652
 msgid "Header name is not set."
 msgstr "O nome do cabeçalho não foi definido."
 
-#: src/prefs_customheader.c:513
+#: src/prefs_customheader.c:514
 msgid "This Header name is not allowed as a custom header."
 msgstr "Esse nome não é permitido para um cabeçalho personalizado."
 
-#: src/prefs_customheader.c:560
+#: src/prefs_customheader.c:561
 msgid "Choose a PNG file"
 msgstr "Selecione um arquivo PNG"
 
-#: src/prefs_customheader.c:562
+#: src/prefs_customheader.c:563
 msgid "Choose an XBM file"
 msgstr "Selecione um arquivo XBM"
 
-#: src/prefs_customheader.c:564
+#: src/prefs_customheader.c:565
 msgid "Choose a text file"
 msgstr "Selecione um arquivo de texto"
 
-#: src/prefs_customheader.c:577
+#: src/prefs_customheader.c:578
 msgid "This file isn't an image."
 msgstr "Esse arquivo não é uma imagem."
 
-#: src/prefs_customheader.c:582
+#: src/prefs_customheader.c:583
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "A imagem selecionada não possui o tamanho correto (48x48)."
 
-#: src/prefs_customheader.c:588
+#: src/prefs_customheader.c:589
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "A imagem é muito grande; ela deve possuir, no máximo, 725 bytes."
 
-#: src/prefs_customheader.c:593
+#: src/prefs_customheader.c:594
 msgid "The image isn't in the correct format (PNG)."
 msgstr "A imagem não está no formato correto (PNG)."
 
-#: src/prefs_customheader.c:602
+#: src/prefs_customheader.c:603
 msgid "The image isn't in the correct format (XBM)."
 msgstr "A imagem não está no formato correto (XBM)."
 
-#: src/prefs_customheader.c:611
+#: src/prefs_customheader.c:612
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "Não foi possível executar o `compface`. Certifique-se que ele esteja no seu "
 "$PATH."
 
-#: src/prefs_customheader.c:617
+#: src/prefs_customheader.c:618
 #, c-format
 msgid "Compface error: %s"
 msgstr "Erro no compface: %s"
 
-#: src/prefs_customheader.c:670
+#: src/prefs_customheader.c:671
 msgid "This file contains newlines."
 msgstr "Esse arquivo possui quebras de linhas."
 
-#: src/prefs_customheader.c:700
+#: src/prefs_customheader.c:701
 msgid "Delete header"
 msgstr "Excluir cabeçalho"
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:702
 msgid "Do you really want to delete this header?"
 msgstr "Deseja realmente excluir esse cabeçalho?"
 
-#: src/prefs_customheader.c:874
+#: src/prefs_customheader.c:875
 msgid "Current custom headers"
 msgstr "Cabeçalhos personalizados atuais"
 
-#: src/prefs_display_header.c:253
+#: src/prefs_display_header.c:254
 msgid "Displayed header configuration"
 msgstr "Configuração do cabeçalho exibido"
 
-#: src/prefs_display_header.c:277
+#: src/prefs_display_header.c:278
 msgid "Header name"
 msgstr "Nome do cabeçalho"
 
-#: src/prefs_display_header.c:312
+#: src/prefs_display_header.c:313
 msgid "Hidden headers"
 msgstr "Cabeçalhos ocultos"
 
-#: src/prefs_display_header.c:353
+#: src/prefs_display_header.c:354
 msgid "Displayed Headers"
 msgstr "Cabeçalhos exibidos"
 
-#: src/prefs_display_header.c:398
+#: src/prefs_display_header.c:399
 msgid "Show all unspecified headers"
 msgstr "Mostrar todos os cabeçalhos não especificados"
 
-#: src/prefs_display_header.c:598
+#: src/prefs_display_header.c:599
 msgid "This header is already in the list."
 msgstr "Esse cabeçalho já está na lista."
 
 #: src/prefs_ext_prog.c:102
 #, c-format
 msgid "%s will be replaced with file name / URI"
-msgstr "%s será substituído pelo nome do arquivo/URL"
+msgstr "%s será substituído pelo nome do arquivo/URI"
 
 #: src/prefs_ext_prog.c:110
 msgid "For the text editor, %w will be replaced with GtkSocket ID"
@@ -15604,8 +15974,8 @@ msgstr ""
 "Essa opção habilita a exibição de partes MIME na visualização da mensagem "
 "através de um script, ao usar o item do menu de contexto 'Mostrar como texto'"
 
-#: 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:180
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Visualização da mensagem"
 
@@ -15628,8 +15998,8 @@ msgstr "Esconder"
 msgid "Message flags"
 msgstr "Marcas da mensagem"
 
-#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:620
-#: src/prefs_summary_column.c:77 src/summaryview.c:2908 src/toolbar.c:505
+#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:641
+#: src/prefs_summary_column.c:77 src/summaryview.c:2888 src/toolbar.c:505
 msgid "Mark"
 msgstr "Marcar"
 
@@ -15649,12 +16019,12 @@ msgstr "Marcar como _spam"
 msgid "Mark as ham"
 msgstr "Marcar como _não-spam"
 
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1394
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1395
 #: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
 msgid "Execute"
 msgstr "Executar"
 
-#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:618
+#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:639
 msgid "Color label"
 msgstr "Rótulo colorido"
 
@@ -15668,9 +16038,9 @@ msgid "Redirect"
 msgstr "Redirecionar"
 
 #: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
-#: src/prefs_filtering_action.c:1398 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:623 src/prefs_summary_column.c:86
-#: src/summaryview.c:472
+#: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:640
+#: src/prefs_summaries.c:644 src/prefs_summary_column.c:86
+#: src/summaryview.c:474
 msgid "Score"
 msgstr "Pontuação"
 
@@ -15683,8 +16053,8 @@ msgid "Set score"
 msgstr "Configurar a pontuação"
 
 #: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
-#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:643
-#: src/prefs_summary_column.c:88 src/summaryview.c:474
+#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:644
+#: src/prefs_summary_column.c:88 src/summaryview.c:476
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -15708,78 +16078,78 @@ msgstr "Discussões"
 msgid "Stop filter"
 msgstr "Parar a filtragem"
 
-#: src/prefs_filtering_action.c:400
+#: src/prefs_filtering_action.c:401
 msgid "Action configuration"
 msgstr "Configuração da ação"
 
-#: src/prefs_filtering_action.c:417 src/prefs_filtering.c:1894
-#: src/prefs_matcher.c:596
+#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1895
+#: src/prefs_matcher.c:597
 msgid "Rule"
 msgstr "Regra"
 
-#: src/prefs_filtering_action.c:430 src/prefs_filtering.c:433
+#: src/prefs_filtering_action.c:431 src/prefs_filtering.c:434
 msgid "Action"
 msgstr "Ação"
 
-#: src/prefs_filtering_action.c:906
+#: src/prefs_filtering_action.c:907
 msgid "Command-line not set"
 msgstr "O comando não foi definido"
 
-#: src/prefs_filtering_action.c:907
+#: src/prefs_filtering_action.c:908
 msgid "Destination is not set."
 msgstr "O destino não foi especificado."
 
-#: src/prefs_filtering_action.c:918
+#: src/prefs_filtering_action.c:919
 msgid "Recipient is not set."
 msgstr "O destinatário não foi especificado."
 
-#: src/prefs_filtering_action.c:934
+#: src/prefs_filtering_action.c:935
 msgid "Score is not set"
 msgstr "A pontuação não foi definida"
 
-#: src/prefs_filtering_action.c:942
+#: src/prefs_filtering_action.c:943
 msgid "Header is not set."
 msgstr "O cabeçalho não foi definido."
 
-#: src/prefs_filtering_action.c:949
+#: src/prefs_filtering_action.c:950
 msgid "Target addressbook/folder is not set."
 msgstr "O Livro de Endereços/pasta de destino não foi definido."
 
-#: src/prefs_filtering_action.c:959
+#: src/prefs_filtering_action.c:960
 msgid "Tag name is empty."
 msgstr "O nome da etiqueta não foi definido."
 
-#: src/prefs_filtering_action.c:1181
+#: src/prefs_filtering_action.c:1182
 msgid "No action was defined."
 msgstr "Não foi definida nenhuma ação."
 
-#: src/prefs_filtering_action.c:1219 src/prefs_matcher.c:2208
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2212
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "% literal"
 
-#: src/prefs_filtering_action.c:1228 src/prefs_matcher.c:2217
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2221
 msgid "filename (should not be modified)"
 msgstr "nome do arquivo (não deve ser modificado)"
 
-#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2218
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2222
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "quebra de linha"
 
-#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2219
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2223
 msgid "escape character for quotes"
 msgstr "caractere de escape para as aspas"
 
-#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2220
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2224
 msgid "quote character"
 msgstr "aspas"
 
-#: src/prefs_filtering_action.c:1240
+#: src/prefs_filtering_action.c:1241
 msgid "Filtering Action: 'Execute'"
 msgstr "Ação da filtragem: 'Executar'"
 
-#: src/prefs_filtering_action.c:1241
+#: src/prefs_filtering_action.c:1242
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -15789,145 +16159,145 @@ msgstr ""
 "para um programa ou script externo.\n"
 "Os seguinte símbolos podem ser utilizados:"
 
-#: src/prefs_filtering_action.c:1380
+#: src/prefs_filtering_action.c:1381
 msgid "Recipient"
 msgstr "Destinatário"
 
-#: src/prefs_filtering_action.c:1384
+#: src/prefs_filtering_action.c:1385
 msgid "Book/Folder"
 msgstr "Livro/Pasta"
 
-#: src/prefs_filtering_action.c:1388
+#: src/prefs_filtering_action.c:1389
 msgid "Destination"
 msgstr "Destino"
 
-#: src/prefs_filtering_action.c:1391
+#: src/prefs_filtering_action.c:1392
 msgid "Color"
 msgstr "Colorir"
 
-#: src/prefs_filtering_action.c:1476
+#: src/prefs_filtering_action.c:1477
 msgid "Current action list"
 msgstr "Lista das ações atuais"
 
-#: src/prefs_filtering.c:197 src/prefs_filtering.c:359
+#: src/prefs_filtering.c:197 src/prefs_filtering.c:360
 msgid "Filtering/Processing configuration"
 msgstr "Configuração da filtragem/processamento"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:869
-#: src/prefs_filtering.c:985
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:870
+#: src/prefs_filtering.c:986
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Todas"
 
-#: src/prefs_filtering.c:411
+#: src/prefs_filtering.c:412
 msgid "Condition"
 msgstr "Condição"
 
-#: src/prefs_filtering.c:424
+#: src/prefs_filtering.c:425
 msgid " Def_ine... "
 msgstr " _Definir... "
 
-#: src/prefs_filtering.c:446
+#: src/prefs_filtering.c:447
 msgid " De_fine... "
 msgstr " De_finir... "
 
-#: src/prefs_filtering.c:475
+#: src/prefs_filtering.c:476
 msgid "Append the new rule above to the list"
 msgstr "Adiciona a nova regra definida acima à lista"
 
-#: src/prefs_filtering.c:484
+#: src/prefs_filtering.c:485
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Substitui a regra selecionada na lista pela definida acima"
 
-#: src/prefs_filtering.c:493
+#: src/prefs_filtering.c:494
 msgid "Delete the selected rule from the list"
 msgstr "Exclui a regra selecionada da lista"
 
-#: src/prefs_filtering.c:534
+#: src/prefs_filtering.c:535
 msgid "Move the selected rule to the top"
 msgstr "Move a regra selecionada para o início"
 
-#: src/prefs_filtering.c:537
+#: src/prefs_filtering.c:538
 msgid "Page u_p"
 msgstr "Página a_cima"
 
-#: src/prefs_filtering.c:545
+#: src/prefs_filtering.c:546
 msgid "Move the selected rule one page up"
 msgstr "Move a regra selecionada uma página acima"
 
-#: src/prefs_filtering.c:554
+#: src/prefs_filtering.c:555
 msgid "Move the selected rule up"
 msgstr "Move a regra selecionada para cima"
 
-#: src/prefs_filtering.c:562
+#: src/prefs_filtering.c:563
 msgid "Move the selected rule down"
 msgstr "Move a regra selecionada para baixo"
 
-#: src/prefs_filtering.c:565
+#: src/prefs_filtering.c:566
 msgid "Page dow_n"
 msgstr "Página a_baixo"
 
-#: src/prefs_filtering.c:573
+#: src/prefs_filtering.c:574
 msgid "Move the selected rule one page down"
 msgstr "Move a regra selecionada uma página abaixo"
 
-#: src/prefs_filtering.c:582
+#: src/prefs_filtering.c:583
 msgid "Move the selected rule to the bottom"
 msgstr "Move a regra selecionada para o final"
 
-#: src/prefs_filtering.c:1042 src/prefs_filtering.c:1128
+#: src/prefs_filtering.c:1043 src/prefs_filtering.c:1129
 msgid "Condition string is not valid."
 msgstr "A especificação da condição não é válida."
 
-#: src/prefs_filtering.c:1115
+#: src/prefs_filtering.c:1116
 msgid "Condition string is empty."
 msgstr "A especificação da condição está em branco."
 
-#: src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1122
 msgid "Action string is empty."
 msgstr "A especificação da ação está em branco."
 
-#: src/prefs_filtering.c:1210
+#: src/prefs_filtering.c:1211
 msgid "Delete rule"
 msgstr "Excluir regra"
 
-#: src/prefs_filtering.c:1211
+#: src/prefs_filtering.c:1212
 msgid "Do you really want to delete this rule?"
 msgstr "Deseja realmente excluir essa regra?"
 
-#: src/prefs_filtering.c:1229
+#: src/prefs_filtering.c:1230
 msgid "Delete all rules"
 msgstr "Excluir todas as regras"
 
-#: src/prefs_filtering.c:1230
+#: src/prefs_filtering.c:1231
 msgid "Do you really want to delete all the rules?"
 msgstr "Deseja realmente excluir todas as regras?"
 
-#: src/prefs_filtering.c:1481
+#: src/prefs_filtering.c:1482
 msgid "Filtering rules not saved"
 msgstr "As regras de filtragem não foram salvas"
 
-#: src/prefs_filtering.c:1482
+#: src/prefs_filtering.c:1483
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "A lista de regras de filtros foram modificadas. Fechar mesmo assim?"
 
-#: src/prefs_filtering.c:1704
+#: src/prefs_filtering.c:1705
 msgid "Move one page up"
 msgstr "Move uma página acima"
 
-#: src/prefs_filtering.c:1705
+#: src/prefs_filtering.c:1706
 msgid "Move one page down"
 msgstr "Move uma página abaixo"
 
-#: src/prefs_filtering.c:1862
+#: src/prefs_filtering.c:1863
 msgid "Enable"
 msgstr "Habilitar"
 
-#: src/prefs_folder_column.c:211
+#: src/prefs_folder_column.c:212
 msgid "Folder list columns configuration"
 msgstr "Configuração das colunas da lista de pastas"
 
-#: src/prefs_folder_column.c:228
+#: src/prefs_folder_column.c:229
 msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -15935,17 +16305,17 @@ msgstr ""
 "Selecione as colunas a serem exibidas na lista de pastas. Você pode\n"
 "modificar a ordem utilizando os botões acima/abaixo ou arrastando os itens."
 
-#: src/prefs_folder_column.c:258 src/prefs_summary_column.c:272
+#: src/prefs_folder_column.c:259 src/prefs_summary_column.c:273
 msgid "Hidden columns"
 msgstr "Colunas ocultas"
 
-#: src/prefs_folder_column.c:299 src/prefs_summaries.c:383
-#: src/prefs_summaries.c:448 src/prefs_summary_column.c:313
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:386
+#: src/prefs_summaries.c:451 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Colunas exibidas"
 
-#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:425
-#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1032
+#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:464
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1032
 msgid " Use default "
 msgstr " Utilizar o padrão "
 
@@ -16107,7 +16477,7 @@ msgstr "Propriedades da pasta %s"
 msgid "Folder and Message Lists"
 msgstr "Listas de pastas e mensagens"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2082
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2086
 msgid "Message"
 msgstr "Mensagem"
 
@@ -16133,7 +16503,7 @@ msgstr "Usar uma fonte diferente para imprimir"
 msgid "Message Printing"
 msgstr "Impressão da mensagem"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:842
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:776 src/prefs_summaries.c:869
 #: src/prefs_themes.c:422
 msgid "Display"
 msgstr "Exibir"
@@ -16146,27 +16516,45 @@ msgstr "Fontes"
 msgid "Preferences"
 msgstr "Preferências"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Exibir imagens em anexo automaticamente"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr "Redimensionar as imagens anexadas por padrão"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
-msgstr "Clicar na imagem ativa/desativa a escala"
+msgstr "Clicar na imagem alterna a escala"
+
+#: src/prefs_image_viewer.c:96
+#| msgid "Fit Page"
+msgid "Fit image"
+msgstr "Ajustar a imagem"
+
+#: src/prefs_image_viewer.c:99
+#| msgid "Clicking image toggles scaling"
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "Clicar na imagem alterna o ajuste de altura/largura"
+
+#: src/prefs_image_viewer.c:102
+msgid "Height"
+msgstr "Altura"
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr "Largura"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr "Exibir imagens na mensagem"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr "Imprimir imagens"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr "Visualizador de imagens"
 
@@ -16287,7 +16675,7 @@ msgstr "Mensagens de erro"
 msgid "Status messages for filtering/processing log"
 msgstr "Mensagens de status para o relatório de filtragem/processamento"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:814
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:153 src/prefs_other.c:815
 msgid "Other"
 msgstr "Outro"
 
@@ -16371,11 +16759,11 @@ msgstr "trecho do corpo"
 msgid "whole message"
 msgstr "toda a mensagem"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6579
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr "Marcada"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6577
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr "Excluída"
 
@@ -16383,11 +16771,11 @@ msgstr "Excluída"
 msgid "Replied"
 msgstr "Respondida"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6571
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr "Encaminhada"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6561 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Spam"
@@ -16396,7 +16784,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Possui anexo"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6597
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr "Assinada"
 
@@ -16456,98 +16844,106 @@ msgstr "0 (Passou)"
 msgid "non-0 (Failed)"
 msgstr "não-0 (Falhou)"
 
-#: src/prefs_matcher.c:579
+#: src/prefs_matcher.c:580
 msgid "Condition configuration"
 msgstr "Configuração da condição"
 
-#: src/prefs_matcher.c:623
+#: src/prefs_matcher.c:624
 msgid "Match criteria"
 msgstr "Corresponder ao critério"
 
-#: src/prefs_matcher.c:632
+#: src/prefs_matcher.c:633
 msgid "All messages"
 msgstr "Todas as mensagens"
 
-#: src/prefs_matcher.c:634
+#: src/prefs_matcher.c:635
 msgid "Age"
 msgstr "Idade"
 
-#: src/prefs_matcher.c:635
+#: src/prefs_matcher.c:636
 msgid "Phrase"
 msgstr "Frase"
 
-#: src/prefs_matcher.c:636
+#: src/prefs_matcher.c:637
 msgid "Flags"
 msgstr "Marcas"
 
-#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:341
+#: src/prefs_matcher.c:638 src/prefs_msg_colors.c:380
 msgid "Color labels"
 msgstr "Rótulos coloridos"
 
-#: src/prefs_matcher.c:638
+#: src/prefs_matcher.c:639
 msgid "Thread"
 msgstr "Discussão"
 
-#: src/prefs_matcher.c:641
+#: src/prefs_matcher.c:642
 msgid "Partially downloaded"
 msgstr "Transferido parcialmente"
 
-#: src/prefs_matcher.c:644
+#: src/prefs_matcher.c:645
 msgid "External program test"
 msgstr "Teste por programa externo"
 
-#: src/prefs_matcher.c:715 src/prefs_matcher.c:1654 src/prefs_matcher.c:1669
-#: src/prefs_matcher.c:2579
+#: src/prefs_matcher.c:674
+msgid ""
+"Use selector on the right to pick the header name. Type the name of the "
+"header if not available in the list."
+msgstr ""
+"Use o seletor à direita para escolher o nome do cabeçalho. Digite o nome "
+"do cabeçalho, caso ele não esteja disponível na lista."
+
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
+#: src/prefs_matcher.c:2583
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Todas"
 
-#: src/prefs_matcher.c:749
+#: src/prefs_matcher.c:753
 msgid "Use regexp"
 msgstr "Usar expressão regular"
 
-#: src/prefs_matcher.c:840
+#: src/prefs_matcher.c:844
 msgid "Message must match"
 msgstr "A mensagem deve corresponder a"
 
-#: src/prefs_matcher.c:844
+#: src/prefs_matcher.c:848
 msgid "at least one"
 msgstr "pelo menos uma das"
 
-#: src/prefs_matcher.c:845
+#: src/prefs_matcher.c:849
 msgid "all"
 msgstr "todas as"
 
-#: src/prefs_matcher.c:848
+#: src/prefs_matcher.c:852
 msgid "of above rules"
 msgstr "regras acima"
 
-#: src/prefs_matcher.c:1560 src/prefs_matcher.c:1638
+#: src/prefs_matcher.c:1564 src/prefs_matcher.c:1642
 msgid "Search pattern is not set."
 msgstr "O padrão da pesquisa não foi definido."
 
-#: src/prefs_matcher.c:1574
+#: src/prefs_matcher.c:1578
 msgid "Invalid hour."
 msgstr "Hora inválida."
 
-#: src/prefs_matcher.c:1583
+#: src/prefs_matcher.c:1587
 msgid "Test command is not set."
 msgstr "O comando de teste não foi definido."
 
-#: src/prefs_matcher.c:1655
+#: src/prefs_matcher.c:1659
 msgid "all addresses in all headers"
 msgstr "todos os endereços em todos os cabeçalhos"
 
-#: src/prefs_matcher.c:1658
+#: src/prefs_matcher.c:1662
 msgid "any address in any header"
 msgstr "qualquer endereço em qualquer cabeçalho"
 
-#: src/prefs_matcher.c:1660
+#: src/prefs_matcher.c:1664
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "o(s) endereço(s) no cabeçalho '%s'"
 
-#: src/prefs_matcher.c:1661
+#: src/prefs_matcher.c:1665
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16560,87 +16956,87 @@ msgstr ""
 "Se você deseja procurar a correspondência de %s por todo o livro de "
 "endereços, deve selecionar '%s' da caixa de seleção do livro/pasta."
 
-#: src/prefs_matcher.c:1880
+#: src/prefs_matcher.c:1884
 msgid "Headers part"
 msgstr "Trecho do cabeçalho"
 
-#: src/prefs_matcher.c:1884
+#: src/prefs_matcher.c:1888
 msgid "Headers values"
 msgstr "Valores dos cabeçalhos"
 
-#: src/prefs_matcher.c:1888
+#: src/prefs_matcher.c:1892
 msgid "Body part"
 msgstr "Trecho do texto"
 
-#: src/prefs_matcher.c:1892
+#: src/prefs_matcher.c:1896
 msgid "Whole message"
 msgstr "Toda a mensagem"
 
-#: src/prefs_matcher.c:2009 src/prefs_matcher.c:2055
+#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
 msgid "in"
 msgstr "em"
 
-#: src/prefs_matcher.c:2011
+#: src/prefs_matcher.c:2015
 msgid "content is"
 msgstr "conteúdo é"
 
-#: src/prefs_matcher.c:2015
+#: src/prefs_matcher.c:2019
 msgid "Date is"
 msgstr "A data é"
 
-#: src/prefs_matcher.c:2026
+#: src/prefs_matcher.c:2030
 msgid "Age is"
 msgstr "Idade é"
 
-#: src/prefs_matcher.c:2031
+#: src/prefs_matcher.c:2035
 msgid "Flag"
 msgstr "Marca"
 
-#: src/prefs_matcher.c:2032 src/prefs_matcher.c:2046
+#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
 msgid "is"
 msgstr "é"
 
-#: src/prefs_matcher.c:2037
+#: src/prefs_matcher.c:2041
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/prefs_matcher.c:2045
+#: src/prefs_matcher.c:2049
 msgid "Label"
 msgstr "Rótulo"
 
-#: src/prefs_matcher.c:2050
+#: src/prefs_matcher.c:2054
 msgid "Value:"
 msgstr "Valor:"
 
-#: src/prefs_matcher.c:2065
+#: src/prefs_matcher.c:2069
 msgid "Score is"
 msgstr "A pontuação é"
 
-#: src/prefs_matcher.c:2066
+#: src/prefs_matcher.c:2070
 msgid "points"
 msgstr "pontos"
 
-#: src/prefs_matcher.c:2076
+#: src/prefs_matcher.c:2080
 msgid "Size is"
 msgstr "O tamanho é"
 
-#: src/prefs_matcher.c:2081
+#: src/prefs_matcher.c:2085
 msgid "Scope:"
 msgstr "Alcance:"
 
-#: src/prefs_matcher.c:2083
+#: src/prefs_matcher.c:2087
 msgid "tags"
 msgstr "etiquetas"
 
-#: src/prefs_matcher.c:2088
+#: src/prefs_matcher.c:2092
 msgid "type is"
 msgstr "o tipo é"
 
-#: src/prefs_matcher.c:2092
+#: src/prefs_matcher.c:2096
 msgid "Program returns"
 msgstr "O programa retorna"
 
-#: src/prefs_matcher.c:2162
+#: src/prefs_matcher.c:2166
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16648,11 +17044,11 @@ msgstr ""
 "A entrada não foi salva.\n"
 "Fechar mesmo assim?"
 
-#: src/prefs_matcher.c:2229
+#: src/prefs_matcher.c:2233
 msgid "Match Type: 'Test'"
 msgstr "Correspondência: 'Testar'"
 
-#: src/prefs_matcher.c:2230
+#: src/prefs_matcher.c:2234
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16664,87 +17060,96 @@ msgstr ""
 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 
-#: src/prefs_matcher.c:2329
+#: src/prefs_matcher.c:2333
 msgid "Current condition rules"
 msgstr "Regras de condição atuais"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Cabeçalho"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "Exibir o cabeçalho acima da mensagem"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr "Exibir (X-)Face na visualização das mensagens"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "Salvar o (X)Face no livro de endereços, se for possível"
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr "Exibir Face na visualização das mensagens"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+#| msgid "Find address book email duplicates"
+msgid "Save Face in address book if possible"
+msgstr "Salvar o Face no livro de endereços, se for possível"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "Exibir cabeçalhos na visualização da mensagem"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "Mensagens em HTML"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "Renderizar as mensagens em HTML como texto"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Renderizar mensagens somente em HTML com o plugin, se possível"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Seleciona a parte HTML das mensagens multipartes/alternativas"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Espaçamento entre linhas"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "pixels"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Rolagem"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Meia página"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Rolagem suave"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Mostrar descrições dos anexos (melhor que os nomes)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Citação"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Recolher o texto citado com duplo clique"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Tratar estes caracteres como marcas de citação"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Opções do texto"
 
@@ -16773,96 +17178,141 @@ msgstr ""
 msgid "Configuration warning"
 msgstr "Aviso de configuração"
 
-#: src/prefs_msg_colors.c:153
+#: src/prefs_msg_colors.c:155
 msgid "Message view"
 msgstr "Visualização da mensagem"
 
-#: src/prefs_msg_colors.c:160
+#: src/prefs_msg_colors.c:162
 msgid "Enable coloration of message text"
 msgstr "Habilitar coloração do texto da mensagem"
 
-#: src/prefs_msg_colors.c:168
+#: src/prefs_msg_colors.c:170
 msgid "Quote"
 msgstr "Citar"
 
-#: src/prefs_msg_colors.c:180
+#: src/prefs_msg_colors.c:182
 msgid "Cycle quote colors"
 msgstr "Ciclar as cores das citações"
 
-#: src/prefs_msg_colors.c:184
+#: src/prefs_msg_colors.c:186
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "Se existirem mais de 3 níveis de citações, as cores serão reutilizadas"
 
-#: src/prefs_msg_colors.c:190
+#: src/prefs_msg_colors.c:192
 msgid "1st Level"
 msgstr "1º nível"
 
-#: src/prefs_msg_colors.c:196 src/prefs_msg_colors.c:214
-#: src/prefs_msg_colors.c:232
+#: src/prefs_msg_colors.c:198 src/prefs_msg_colors.c:216
+#: src/prefs_msg_colors.c:234
 msgid "Text"
 msgstr "Texto"
 
-#: src/prefs_msg_colors.c:200
+#: src/prefs_msg_colors.c:202
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Selecione a cor para o texto do 1º nível"
 
-#: src/prefs_msg_colors.c:208
+#: src/prefs_msg_colors.c:210
 msgid "2nd Level"
 msgstr "2º nível"
 
-#: src/prefs_msg_colors.c:218
+#: src/prefs_msg_colors.c:220
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Selecione a cor para o texto do 2º nível"
 
-#: src/prefs_msg_colors.c:226
+#: src/prefs_msg_colors.c:228
 msgid "3rd Level"
 msgstr "3º nível"
 
-#: src/prefs_msg_colors.c:236
+#: src/prefs_msg_colors.c:238
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Selecione a cor para o texto do 3º nível"
 
-#: src/prefs_msg_colors.c:245
+#: src/prefs_msg_colors.c:247
 msgid "Enable coloration of text background"
 msgstr "Habilitar coloração do fundo do texto"
 
-#: src/prefs_msg_colors.c:254
+#: 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"
 
-#: src/prefs_msg_colors.c:267
+#: 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"
 
-#: src/prefs_msg_colors.c:280
+#: 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"
 
-#: src/prefs_msg_colors.c:292
+#: src/prefs_msg_colors.c:294
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "Selecione a cor para os links"
 
-#: src/prefs_msg_colors.c:296
+#: src/prefs_msg_colors.c:298
 msgid "URI link"
 msgstr "Links URI"
 
-#: src/prefs_msg_colors.c:304
+#: src/prefs_msg_colors.c:306
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Selecione a cor para as assinaturas"
 
-#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:377
+#. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
+#. versions of the same text file
+#: src/prefs_msg_colors.c:316
+#| msgid "Message has attachment(s)"
+msgid "Patch messages and attachments"
+msgstr "Mensagens de patch e anexos"
+
+#: src/prefs_msg_colors.c:324
+#| msgctxt "Tooltip"
+#| msgid "Pick color for links"
+msgctxt "Tooltip"
+msgid "Pick color for inserted lines"
+msgstr "Selecione a cor para linhas inseridas"
+
+#: src/prefs_msg_colors.c:326
+#| msgid "Insert file"
+msgid "Inserted lines"
+msgstr "Linhas inseridas"
+
+#: src/prefs_msg_colors.c:333
+#| msgctxt "Tooltip"
+#| msgid "Pick color for links"
+msgctxt "Tooltip"
+msgid "Pick color for removed lines"
+msgstr "Selecione a cor para as linhas removidas"
+
+#: src/prefs_msg_colors.c:336
+#| msgid "Remove tree"
+msgid "Removed lines"
+msgstr "Linhas removidas"
+
+#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
+#: src/prefs_msg_colors.c:344
+#| msgctxt "Tooltip"
+#| msgid "Pick color for links"
+msgctxt "Tooltip."
+msgid "Pick color for hunk lines"
+msgstr "Selecione a cor para as linhas de diferenças"
+
+#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
+#: src/prefs_msg_colors.c:348
+#| msgid "new line"
+msgid "Hunk lines"
+msgstr "Linhas de diferenças"
+
+#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:380
 msgid "Folder list"
 msgstr "Lista de pastas"
 
-#: src/prefs_msg_colors.c:318
+#: src/prefs_msg_colors.c:357
 msgctxt "Tooltip"
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
@@ -16872,22 +17322,22 @@ msgstr ""
 "quando a opção 'Executar imediatamente ao mover ou excluir mensagens' está "
 "desativada"
 
-#: src/prefs_msg_colors.c:323
+#: src/prefs_msg_colors.c:362
 msgid "Target folder"
 msgstr "Pasta de destino"
 
-#: src/prefs_msg_colors.c:330
+#: 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"
 
-#: src/prefs_msg_colors.c:334
+#: src/prefs_msg_colors.c:373
 msgid "Folder containing new messages"
 msgstr "Pasta contendo novas mensagens"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:359 src/prefs_msg_colors.c:391
+#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:430
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -16895,70 +17345,91 @@ msgstr "Selecione a cor para 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:363 src/prefs_msg_colors.c:395
+#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:434
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Defina o rótulo para 'color %d'"
 
-#: src/prefs_msg_colors.c:490
+#: src/prefs_msg_colors.c:529
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "Seleção de cor para o texto do 1º nível"
 
-#: src/prefs_msg_colors.c:492
+#: src/prefs_msg_colors.c:531
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "Seleção de cor para o texto do 2º nível"
 
-#: src/prefs_msg_colors.c:494
+#: src/prefs_msg_colors.c:533
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
 msgstr "Seleção de cor para o texto do 3º nível"
 
-#: src/prefs_msg_colors.c:496
+#: src/prefs_msg_colors.c:535
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Seleção de cor para o fundo do texto do 1º nível"
 
-#: src/prefs_msg_colors.c:498
+#: src/prefs_msg_colors.c:537
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Seleção de cor para o fundo do texto do 2º nível"
 
-#: src/prefs_msg_colors.c:500
+#: src/prefs_msg_colors.c:539
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Seleção de cor para o fundo do texto do 3º nível"
 
-#: src/prefs_msg_colors.c:502
+#: src/prefs_msg_colors.c:541
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "Seleção de cor para os links"
 
-#: src/prefs_msg_colors.c:504
+#: src/prefs_msg_colors.c:543
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "Seleção de cor para pasta de destino"
 
-#: src/prefs_msg_colors.c:506
+#: src/prefs_msg_colors.c:545
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
 msgstr "Seleção de cor para as assinaturas"
 
-#: src/prefs_msg_colors.c:508
+#: src/prefs_msg_colors.c:547
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "Seleção de cor para as pastas"
 
+#: src/prefs_msg_colors.c:549
+#| msgctxt "Dialog title"
+#| msgid "Pick color for links"
+msgctxt "Dialog title"
+msgid "Pick color for inserted lines"
+msgstr "Seleção de cor para as linhas inseridas"
+
+#: src/prefs_msg_colors.c:551
+#| msgctxt "Dialog title"
+#| msgid "Pick color for links"
+msgctxt "Dialog title"
+msgid "Pick color for removed lines"
+msgstr "Seleção de cor para as linhas removidas"
+
+#: src/prefs_msg_colors.c:553
+#| msgctxt "Dialog title"
+#| msgid "Pick color for links"
+msgctxt "Dialog title"
+msgid "Pick color for hunk lines"
+msgstr "Seleção de cor para as linhas de diferenças"
+
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:531
+#: src/prefs_msg_colors.c:576
 #, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
 msgstr "Seleção de cor para 'color %d'"
 
-#: src/prefs_msg_colors.c:732
+#: src/prefs_msg_colors.c:777
 msgid "Colors"
 msgstr "Cores"
 
@@ -16966,11 +17437,11 @@ msgstr "Cores"
 msgid "Choose preset keyboard shortcuts"
 msgstr "Escolha entre atalhos de teclado pré-definidos"
 
-#: src/prefs_other.c:123
+#: src/prefs_other.c:124
 msgid "Select preset:"
 msgstr "Selecionar pré-definido:"
 
-#: src/prefs_other.c:138
+#: 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."
@@ -16978,39 +17449,39 @@ msgstr ""
 "Você também pode modificar os atalhos de menu pressionando\n"
 "a(s) tecla(s) ao colocar o ponteiro do mouse sobre o item."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:497
 msgid "Add address to destination when double-clicked"
 msgstr "Adicionar o endereço ao destinatário ao fazer um duplo-clique"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:500
 msgid "On exit"
 msgstr "Ao sair"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:503
 msgid "Confirm on exit"
 msgstr "Confirmar ao sair"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:510
 msgid "Empty trash on exit"
 msgstr "Esvaziar a Lixeira ao sair"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:513
 msgid "Warn if there are queued messages"
 msgstr "Alertar se houver mensagens na Fila de Saída"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:515
 msgid "Keyboard shortcuts"
 msgstr "Atalhos de teclado"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:518
 msgid "Enable keyboard shortcuts"
 msgstr "Habilitar atalhos do teclado"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:521
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Habilitar a personalização de atalhos do teclado"
 
-#: src/prefs_other.c:523
+#: src/prefs_other.c:524
 msgid ""
 "If checked, you can change the keyboard shortcuts of most of the menu items "
 "by focusing on the menu item and pressing a key combination.\n"
@@ -17021,15 +17492,15 @@ msgstr ""
 "combinação de teclas.\n"
 "Desmarque essa opção caso você deseje travar todos os atalhos de teclado."
 
-#: src/prefs_other.c:530
+#: src/prefs_other.c:531
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Escolha entre atalhos de teclado pré-definidos... "
 
-#: src/prefs_other.c:540
+#: src/prefs_other.c:541
 msgid "Metadata handling"
 msgstr "Manipulação dos metadados"
 
-#: src/prefs_other.c:541
+#: src/prefs_other.c:542
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -17037,23 +17508,23 @@ msgstr ""
 "O modo seguro solicita ao SO a escrita imediata dos metadados no disco;\n"
 "isso evita perda de dados após uma falha, mas pode consumir algum tempo."
 
-#: src/prefs_other.c:545
+#: src/prefs_other.c:546
 msgid "Safer"
 msgstr "Mais seguro"
 
-#: src/prefs_other.c:547
+#: src/prefs_other.c:548
 msgid "Faster"
 msgstr "Mais rápido"
 
-#: src/prefs_other.c:565
+#: src/prefs_other.c:566
 msgid "Socket I/O timeout"
 msgstr "Tempo limite para o socket E/S"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:587
 msgid "Translate header names"
 msgstr "Traduzir os nomes do cabeçalho"
 
-#: src/prefs_other.c:588
+#: src/prefs_other.c:589
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
@@ -17061,21 +17532,21 @@ msgstr ""
 "A exibição dos cabeçalhos padrão (como 'From:', 'Subject:') será traduzida "
 "para o seu idioma."
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:592
 msgid "Ask before emptying trash"
 msgstr "Pergunte antes de esvaziar a lixeira"
 
-#: src/prefs_other.c:593
+#: src/prefs_other.c:594
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Pergunte sobre regras de filtragem específicas da conta ao fazer a filtragem "
 "manual"
 
-#: src/prefs_other.c:598
+#: src/prefs_other.c:599
 msgid "Use secure file deletion if possible"
 msgstr "Use a exclusão segura do arquivo, se possível"
 
-#: src/prefs_other.c:602
+#: src/prefs_other.c:603
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -17083,7 +17554,7 @@ msgstr ""
 "Use a exclusão segura de arquivo, se possível\n"
 "(o programa 'shred' não está disponível)"
 
-#: src/prefs_other.c:607
+#: src/prefs_other.c:608
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
@@ -17092,19 +17563,19 @@ msgstr ""
 "antes de exclui-los. Isso tornar a exclusão mais lenta. Certifique-se de ler "
 "a página de manual do shred para eventuais advertências."
 
-#: src/prefs_other.c:611
+#: src/prefs_other.c:612
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronize as pastas off-line assim que possível"
 
-#: src/prefs_other.c:614
+#: src/prefs_other.c:615
 msgid "Master passphrase"
 msgstr "Senha mestra"
 
-#: src/prefs_other.c:617
+#: src/prefs_other.c:618
 msgid "Use a master passphrase"
 msgstr "Usar uma senha mestra"
 
-#: src/prefs_other.c:620
+#: 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."
@@ -17112,11 +17583,11 @@ msgstr ""
 "Se selecionado, suas senha salvas serão protegidas por uma senha mestra. "
 "Caso não exista uma senha mestra, será solicitada uma a você."
 
-#: src/prefs_other.c:625
+#: src/prefs_other.c:626
 msgid "Change master passphrase"
 msgstr "Alterar a senha mestra"
 
-#: src/prefs_other.c:815
+#: src/prefs_other.c:816
 msgid "Miscellaneous"
 msgstr "Miscelânea"
 
@@ -17362,8 +17833,8 @@ msgstr ""
 "Encoding) a ser utilizada quando o corpo da mensagem possuir caracteres não-"
 "ASCII"
 
-#: 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:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "Envio"
 
@@ -17416,197 +17887,207 @@ msgstr ""
 msgid "Spell Checking"
 msgstr "Verificador ortográfico"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:167
 msgid "the abbreviated weekday name"
 msgstr "o nome abreviado do dia da semana"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:168
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:169
 msgid "the abbreviated month name"
 msgstr "o nome abreviado do mês"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:170
 msgid "the full month name"
 msgstr "o nome completo do mês"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:171
 msgid "the preferred date and time for the current locale"
 msgstr "a data e as horas preferidas para o locale atual"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:172
 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:173
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:174
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "as horas no formato 24 horas"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:175
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "as horas no formato 12 horas"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:176
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:177
 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:178
 msgid "the minute as a decimal number"
 msgstr "os minutos"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:179
 msgid "either AM or PM"
 msgstr "usar AM ou PM"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:180
 msgid "the second as a decimal number"
 msgstr "os segundos"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:181
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:182
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para o locale atual"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:183
 msgid "the last two digits of a year"
 msgstr "os dois últimos dígitos do ano"
 
-#: src/prefs_summaries.c:183
+#: src/prefs_summaries.c:184
 msgid "the year as a decimal number"
 msgstr "o ano"
 
-#: src/prefs_summaries.c:184
+#: src/prefs_summaries.c:185
 msgid "the time zone or name or abbreviation"
 msgstr "o fuso horário, o nome ou a abreviação"
 
-#: src/prefs_summaries.c:205 src/prefs_summaries.c:253
-#: src/prefs_summaries.c:465
+#: src/prefs_summaries.c:206 src/prefs_summaries.c:255
+#: src/prefs_summaries.c:486
 msgid "Date format"
 msgstr "Formato da data"
 
-#: src/prefs_summaries.c:229
+#: src/prefs_summaries.c:231
 msgid "Specifier"
 msgstr "Código"
 
-#: src/prefs_summaries.c:271
+#: src/prefs_summaries.c:273
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_summaries.c:397
+#: src/prefs_summaries.c:400
 msgid "Display message count next to folder name"
 msgstr "Exibir número de mensagens ao lado do nome da pasta"
 
-#: src/prefs_summaries.c:407
+#: src/prefs_summaries.c:410
 msgid "Unread messages"
 msgstr "Mensagens não lidas"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:411
 msgid "Unread and Total messages"
 msgstr "Mensagens não lidas e totais"
 
-#: src/prefs_summaries.c:414
+#: src/prefs_summaries.c:417
 msgid "Open last opened folder at start-up"
 msgstr "Abrir a última pasta aberta, ao iniciar"
 
-#: src/prefs_summaries.c:421
+#: src/prefs_summaries.c:424
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nomes de newsgroup maiores que"
 
-#: src/prefs_summaries.c:434
+#: src/prefs_summaries.c:437
 msgid "letters"
 msgstr "letras"
 
-#: src/prefs_summaries.c:442
+#: src/prefs_summaries.c:445
 msgid "Message list"
 msgstr "Lista de mensagens"
 
-#: src/prefs_summaries.c:459
+#: src/prefs_summaries.c:462
 msgid "Lock column headers"
 msgstr "Travar cabeçalhos das colunas"
 
-#: src/prefs_summaries.c:484
+#: src/prefs_summaries.c:468
+#| msgid "Displayed columns"
+msgid "Displayed in From column"
+msgstr "Exibidos na coluna De"
+
+#: src/prefs_summaries.c:479
+#| msgid "New _Address"
+msgid "Name and Address"
+msgstr "Nome e endereço"
+
+#: src/prefs_summaries.c:505
 msgid "Date format help"
 msgstr "Ajuda do formato da data"
 
-#: src/prefs_summaries.c:490
+#: src/prefs_summaries.c:511
 msgid "Set message selection when entering a folder"
 msgstr "Defina a seleção de mensagem ao entrar em uma pasta"
 
-#: src/prefs_summaries.c:499
+#: src/prefs_summaries.c:520
 msgid "Open message when selected"
 msgstr "Abrir a mensagem ao selecioná-la"
 
-#: src/prefs_summaries.c:504
+#: src/prefs_summaries.c:525
 msgid "When opening a folder"
 msgstr "Ao abrir uma pasta"
 
-#: src/prefs_summaries.c:506
+#: src/prefs_summaries.c:527
 msgid "When displaying search results"
 msgstr "Ao exibir os resultados da pesquisa"
 
-#: src/prefs_summaries.c:508
+#: src/prefs_summaries.c:529
 msgid "When selecting next or previous message using shortcuts"
 msgstr ""
 "Ao selecionar a mensagem anterior ou posterior usando atalhos de teclado"
 
-#: src/prefs_summaries.c:510
+#: src/prefs_summaries.c:531
 msgid "When deleting or moving messages"
 msgstr "Ao excluir ou mover mensagens"
 
-#: src/prefs_summaries.c:512
+#: src/prefs_summaries.c:533
 msgid "When using directional keys"
 msgstr "Ao usar teclas direcionais"
 
-#: src/prefs_summaries.c:514
+#: src/prefs_summaries.c:535
 msgid "Mark message as read"
 msgstr "Marcar a mensagem como lida"
 
-#: src/prefs_summaries.c:517
+#: src/prefs_summaries.c:538
 msgid "when selected, after"
 msgstr "quando selecionada, após"
 
-#: src/prefs_summaries.c:536
+#: src/prefs_summaries.c:557
 msgid "only when opened in a new window, or replied to"
 msgstr "apenas quando aberta em uma nova janela ou respondida"
 
-#: src/prefs_summaries.c:546
+#: src/prefs_summaries.c:567
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Exibir o aviso \"nenhuma mensagem não lida (ou nova)\""
 
-#: src/prefs_summaries.c:556
+#: src/prefs_summaries.c:577
 msgid "Assume 'Yes'"
 msgstr "Assumir 'Sim'"
 
-#: src/prefs_summaries.c:557
+#: src/prefs_summaries.c:578
 msgid "Assume 'No'"
 msgstr "Assumir 'Não'"
 
-#: src/prefs_summaries.c:563
+#: src/prefs_summaries.c:584
 msgid "Display sender using address book"
 msgstr "Nomear o remetente utilizando o Livro de Endereços"
 
-#: src/prefs_summaries.c:567
+#: src/prefs_summaries.c:588
 msgid "Thread using subject in addition to standard headers"
 msgstr "Agrupar discussão utilizando o assunto além dos cabeçalhos padrão"
 
-#: src/prefs_summaries.c:571
+#: src/prefs_summaries.c:592
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar imediatamente ao mover ou excluir mensagens"
 
-#: src/prefs_summaries.c:573
+#: src/prefs_summaries.c:594
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -17614,63 +18095,63 @@ msgstr ""
 "Se estiver desmarcado, a movimentação, cópia ou exclusão as mensagens será "
 "adiata até que se selecione 'Ferramentas/Executar'"
 
-#: src/prefs_summaries.c:578
+#: src/prefs_summaries.c:599
 msgid "Confirm when marking all messages as read or unread"
 msgstr "Confirmar ao marcar todas as mensagens como lidas ou não lidas"
 
-#: src/prefs_summaries.c:581
+#: src/prefs_summaries.c:602
 msgid "Confirm when changing color labels"
 msgstr "Confirmar ao alterar rótulos de cor"
 
-#: src/prefs_summaries.c:585
+#: src/prefs_summaries.c:606
 msgid "Show tooltips"
 msgstr "Exibir dicas"
 
-#: src/prefs_summaries.c:595 src/quote_fmt.c:539
+#: src/prefs_summaries.c:616 src/quote_fmt.c:539
 msgid "Defaults"
 msgstr "Padrões"
 
-#: src/prefs_summaries.c:597
+#: src/prefs_summaries.c:618
 msgid "New folders"
 msgstr "Novas pastas"
 
-#: src/prefs_summaries.c:603
+#: src/prefs_summaries.c:624
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: src/prefs_summaries.c:611 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:632 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Número"
 
-#: src/prefs_summaries.c:614
+#: src/prefs_summaries.c:635
 msgid "Thread date"
 msgstr "Data da discussão"
 
-#: src/prefs_summaries.c:625
+#: src/prefs_summaries.c:646
 msgid "Don't sort"
 msgstr "Não ordenar"
 
-#: src/prefs_summaries.c:640
+#: src/prefs_summaries.c:661
 msgid "Thread view"
 msgstr "Visão da discussão"
 
-#: src/prefs_summaries.c:643
+#: src/prefs_summaries.c:664
 msgid "Collapse all threads"
 msgstr "Recolher todas as discussões"
 
-#: src/prefs_summaries.c:649
+#: src/prefs_summaries.c:670
 msgid "Hide read messages"
 msgstr "Ocultar mensagens lidas"
 
-#: src/prefs_summaries.c:843
+#: src/prefs_summaries.c:870
 msgid "Summaries"
 msgstr "Sumários"
 
-#: src/prefs_summary_column.c:225
+#: src/prefs_summary_column.c:226
 msgid "Message list columns configuration"
 msgstr "Configuração das colunas na lista de mensagens"
 
-#: src/prefs_summary_column.c:242
+#: src/prefs_summary_column.c:243
 msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -17714,15 +18195,15 @@ msgstr "nova mensagem mais recente"
 msgid "newest unread email"
 msgstr "mensagem não lida mais recente"
 
-#: src/prefs_summary_open.c:188
+#: src/prefs_summary_open.c:189
 msgid "Message selection when entering a folder"
 msgstr "Seleção da mensagem ao entrar em uma pasta"
 
-#: src/prefs_summary_open.c:233
+#: src/prefs_summary_open.c:234
 msgid "Available selections"
 msgstr "Seleções disponíveis"
 
-#: src/prefs_summary_open.c:268
+#: src/prefs_summary_open.c:269
 msgid "Current selections"
 msgstr "Seleções atuais"
 
@@ -17738,101 +18219,101 @@ msgstr ""
 "Sobrepor o cabeçalho De da conta de composição. Isso não muda a conta de "
 "composição."
 
-#: src/prefs_template.c:308
+#: src/prefs_template.c:309
 msgid "Append the new template above to the list"
 msgstr "Adiciona o novo modelo definido acima à lista"
 
-#: src/prefs_template.c:317
+#: src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr "Substitui o modelo selecionado na lista pelo definido acima"
 
-#: src/prefs_template.c:327
+#: src/prefs_template.c:328
 msgid "Delete the selected template from the list"
 msgstr "Exclui o modelo selecionado da lista"
 
-#: src/prefs_template.c:345
+#: src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr "Mostra informações sobre a configuração de modelos"
 
-#: src/prefs_template.c:369
+#: src/prefs_template.c:370
 msgid "Move the selected template to the top"
 msgstr "Move o modelo selecionado para o início"
 
-#: src/prefs_template.c:379
+#: src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "Move o modelo selecionado para cima"
 
-#: src/prefs_template.c:387
+#: src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "Move o modelo selecionado para baixo"
 
-#: src/prefs_template.c:397
+#: src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
 msgstr "Move o modelo selecionado para o fim"
 
-#: src/prefs_template.c:413
+#: src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "Configuração dos modelos"
 
-#: src/prefs_template.c:601
+#: src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "A lista de modelos não foi salva"
 
-#: src/prefs_template.c:602
+#: src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
 msgstr "A lista de modelos foi modificada. Fechar mesmo assim?"
 
-#: src/prefs_template.c:759
+#: src/prefs_template.c:760
 msgid "The template's name is not set."
 msgstr "O nome do modelo não foi definido."
 
-#: src/prefs_template.c:802
+#: src/prefs_template.c:803
 msgid "The \"From\" field of the template contains an invalid email address."
-msgstr "O campo \"De\" do modelo possui um endereço de e-mail inválido."
+msgstr "O campo \"De\" do modelo possui um endereço de email inválido."
 
-#: src/prefs_template.c:808
+#: src/prefs_template.c:809
 msgid "The \"To\" field of the template contains an invalid email address."
-msgstr "O campo \"Para\" do modelo possui um endereço de e-mail inválido."
+msgstr "O campo \"Para\" do modelo possui um endereço de email inválido."
 
-#: src/prefs_template.c:814
+#: src/prefs_template.c:815
 msgid "The \"Cc\" field of the template contains an invalid email address."
-msgstr "O campo \"Cc\" do modelo possui um endereço de e-mail inválido."
+msgstr "O campo \"Cc\" do modelo possui um endereço de email inválido."
 
-#: src/prefs_template.c:820
+#: src/prefs_template.c:821
 msgid "The \"Bcc\" field of the template contains an invalid email address."
-msgstr "O campo \"Cco\" do modelo possui um endereço de e-mail inválido."
+msgstr "O campo \"Cco\" do modelo possui um endereço de email inválido."
 
-#: src/prefs_template.c:826
+#: src/prefs_template.c:827
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr ""
-"O campo \"Responder para\" do modelo possui um endereço de e-mail inválido."
+"O campo \"Responder para\" do modelo possui um endereço de email inválido."
 
-#: src/prefs_template.c:832
+#: src/prefs_template.c:833
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "O campo \"Assunto\" do modelo é inválido."
 
-#: src/prefs_template.c:903
+#: src/prefs_template.c:904
 msgid "Delete template"
 msgstr "Excluir modelo"
 
-#: src/prefs_template.c:904
+#: src/prefs_template.c:905
 msgid "Do you really want to delete this template?"
 msgstr "Deseja realmente excluir esse modelo?"
 
-#: src/prefs_template.c:916
+#: src/prefs_template.c:917
 msgid "Delete all templates"
 msgstr "Excluir todos os modelos"
 
-#: src/prefs_template.c:917
+#: src/prefs_template.c:918
 msgid "Do you really want to delete all the templates?"
 msgstr "Deseja realmente excluir todos os modelos?"
 
-#: src/prefs_template.c:1233
+#: src/prefs_template.c:1234
 msgid "Current templates"
 msgstr "Modelos atuais"
 
-#: src/prefs_template.c:1261
+#: src/prefs_template.c:1262
 msgid "Template"
 msgstr "Modelo"
 
@@ -18110,35 +18591,35 @@ msgstr "Quebrar o texto em"
 msgid "Wrapping"
 msgstr "Quebra de linhas"
 
-#: src/printing.c:430
+#: src/printing.c:431
 msgid "Print preview"
 msgstr "Visualização da impressão"
 
-#: src/printing.c:473
+#: src/printing.c:474
 msgid "First page"
 msgstr "Primeira página"
 
-#: src/printing.c:483
+#: src/printing.c:484
 msgid "Last page"
 msgstr "Última página"
 
-#: src/printing.c:489
+#: src/printing.c:490
 msgid "Zoom 100%"
 msgstr "Zoom 100%"
 
-#: src/printing.c:491
+#: src/printing.c:492
 msgid "Zoom fit"
 msgstr "Ajustar zoom"
 
-#: src/printing.c:493
+#: src/printing.c:494
 msgid "Zoom in"
 msgstr "Aumentar o zoom"
 
-#: src/printing.c:495
+#: src/printing.c:496
 msgid "Zoom out"
 msgstr "Reduzir o zoom"
 
-#: src/printing.c:675
+#: src/printing.c:676
 #, c-format
 msgid "Page %d"
 msgstr "Página %d"
@@ -18155,28 +18636,28 @@ msgstr "Não foi definida nenhuma chave de destinatário."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erro ao decodificar BASE64]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr "Não foi possível decodificar parte da mensagem"
 
-#: src/procmsg.c:935 src/procmsg.c:938
+#: src/procmsg.c:936 src/procmsg.c:939
 msgid "Already trying to send."
 msgstr "Ainda tentando envia."
 
-#: src/procmsg.c:1562 src/procmsg.c:1623
+#: src/procmsg.c:1563 src/procmsg.c:1624
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
-#: src/procmsg.c:1633
+#: src/procmsg.c:1634
 msgid "Queued message header is broken."
 msgstr "O cabeçalho da mensagem na Fila de Saída está com problema."
 
-#: src/procmsg.c:1653
+#: src/procmsg.c:1654
 msgid "An error happened during SMTP session."
 msgstr "Ocorreu um erro durante a seção SMTP."
 
-#: src/procmsg.c:1667
+#: src/procmsg.c:1668
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -18184,7 +18665,7 @@ msgstr ""
 "Não foi encontrada nenhuma conta específica para o envio e ocorreu um erro "
 "durante a seção SMTP."
 
-#: src/procmsg.c:1675
+#: src/procmsg.c:1676
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -18192,20 +18673,20 @@ msgstr ""
 "Não foi possível determinar as informações de envio. Talvez essa mensagem "
 "não tenha sido gerada pelo Claws Mail."
 
-#: src/procmsg.c:1698
+#: src/procmsg.c:1699
 msgid "Couldn't create temporary file for news sending."
 msgstr "Não foi possível criar o arquivo temporário para envio do artigo."
 
-#: src/procmsg.c:1711
+#: src/procmsg.c:1712
 msgid "Error when writing temporary file for news sending."
 msgstr "Erro ao gravar no arquivo temporário para envio do artigo."
 
-#: src/procmsg.c:1725
+#: src/procmsg.c:1726
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocorreu um erro durante o envio da mensagem para %s."
 
-#: src/procmsg.c:2285
+#: src/procmsg.c:2286
 msgid "Filtering messages...\n"
 msgstr "Filtrando as mensagens...\n"
 
@@ -18219,7 +18700,7 @@ msgstr "formato de data personalizado (veja 'man strftime')"
 
 #: src/quote_fmt.c:51
 msgid "email address of sender"
-msgstr "endereço de e-mail do remetente"
+msgstr "endereço de email do remetente"
 
 #: src/quote_fmt.c:52
 msgid "full name of sender"
@@ -18271,7 +18752,7 @@ msgstr "propriedade da conta: seu nome"
 
 #: src/quote_fmt.c:70
 msgid "account property: your email address"
-msgstr "propriedade da conta: seu endereço de e-mail"
+msgstr "propriedade da conta: seu endereço de email"
 
 #: src/quote_fmt.c:71
 msgid "account property: account name"
@@ -18493,7 +18974,7 @@ msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
 msgstr ""
-"O campo \"De\" do modelo \"Nova mensagem\" possui um endereço de e-mail "
+"O campo \"De\" do modelo \"Nova mensagem\" possui um endereço de email "
 "inválido."
 
 #: src/quote_fmt.c:560
@@ -18517,88 +18998,88 @@ msgstr "Digite o texto para substituir '%s'"
 msgid "Enter variable"
 msgstr "Digite a variável"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando a mensagem usando o comando: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Não foi possível executar o comando: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ocorreu um erro na execução do comando: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "Executando verificação POP antes do SMTP..."
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "POP antes do SMTP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor SMTP: %s:%d..."
 
-#: src/send_message.c:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "A mensagem foi enviada com sucesso."
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "Enviando a mensagem..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "Enviando MENSAGEM..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando a mensagem (%d / %d bytes)"
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "Enviando a mensagem"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro durante o envio da mensagem."
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18627,7 +19108,7 @@ msgstr ""
 msgid "Source of the message"
 msgstr "Código-fonte da mensagem"
 
-#: src/sourcewindow.c:160
+#: src/sourcewindow.c:161
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Código-fonte"
@@ -18640,11 +19121,11 @@ msgstr "Expiração"
 msgid "Saved SSL/TLS certificates"
 msgstr "Certificados SSL/TLS salvos"
 
-#: src/ssl_manager.c:444
+#: src/ssl_manager.c:445
 msgid "Delete certificate"
 msgstr "Excluir certificado"
 
-#: src/ssl_manager.c:445
+#: src/ssl_manager.c:446
 msgid "Do you really want to delete this certificate?"
 msgstr "Deseja realmente excluir esse certificado?"
 
@@ -18652,56 +19133,61 @@ msgstr "Deseja realmente excluir esse certificado?"
 msgid "Search messages"
 msgstr "Pesquisar mensagens"
 
-#: src/summary_search.c:312
+#: src/summary_search.c:313
 msgid "Match any of the following"
 msgstr "Correspondente a qualquer um dos seguintes"
 
-#: src/summary_search.c:314
+#: src/summary_search.c:315
 msgid "Match all of the following"
 msgstr "Corresponder a todos os seguintes"
 
-#: src/summary_search.c:435
+#: src/summary_search.c:436
 msgid "Body:"
 msgstr "Corpo:"
 
-#: src/summary_search.c:442
+#: src/summary_search.c:443
 msgid "Condition:"
 msgstr "Condição:"
 
-#: src/summary_search.c:476
+#: src/summary_search.c:477
 msgid "Find _all"
 msgstr "Localizar _todas"
 
-#: src/summary_search.c:691 src/summaryview.c:1148 src/summaryview.c:1411
+#: src/summary_search.c:692 src/summaryview.c:1148 src/summaryview.c:1411
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Pesquisando em %s... \n"
 
-#: src/summary_search.c:786
+#: src/summary_search.c:787
 msgid "Beginning of list reached; continue from end?"
 msgstr "O início da lista foi atingido; continuar a partir do final?"
 
-#: src/summary_search.c:788
+#: src/summary_search.c:789
 msgid "End of list reached; continue from beginning?"
 msgstr "O final da lista foi atingido; continuar a partir do início?"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:430
+#| msgid "Re-_edit"
+msgid "Re-edit"
+msgstr "Reeditar"
+
+#: src/summaryview.c:443
 msgid "Create _filter rule"
 msgstr "Criar regra de _filtragem"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "_Set displayed columns"
 msgstr "Definir colu_nas visíveis"
 
-#: src/summaryview.c:459
+#: src/summaryview.c:461
 msgid "_Lock column headers"
 msgstr "Travar _cabeçalhos das colunas"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:598
 msgid "Toggle quick search bar"
 msgstr "Alternar a exibição da barra de pesquisa rápida"
 
-#: src/summaryview.c:633
+#: src/summaryview.c:635
 msgid "Toggle multiple selection"
 msgstr "Alternar a múltipla seleção"
 
@@ -18718,242 +19204,242 @@ msgstr "Foram deixadas algumas marcas. Processá-las?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
-#: src/summaryview.c:1971 src/summaryview.c:2019
+#: src/summaryview.c:1950 src/summaryview.c:1998
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não-lidas"
 
-#: src/summaryview.c:1972
+#: src/summaryview.c:1951
 msgid "No unread message found. Search from the end?"
 msgstr "Não foram encontradas mensagens não lidas. Pesquisar a partir do fim?"
 
-#: src/summaryview.c:1984 src/summaryview.c:2032 src/summaryview.c:2069
-#: src/summaryview.c:2117 src/summaryview.c:2184
+#: src/summaryview.c:1963 src/summaryview.c:2011 src/summaryview.c:2048
+#: src/summaryview.c:2096 src/summaryview.c:2163
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Erro interno: valor não esperado para prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1996
+#: src/summaryview.c:1975
 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 
-#: src/summaryview.c:2020
+#: src/summaryview.c:1999
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:2056 src/summaryview.c:2104
+#: src/summaryview.c:2035 src/summaryview.c:2083
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
-#: src/summaryview.c:2057
+#: src/summaryview.c:2036
 msgid "No new message found. Search from the end?"
 msgstr "Não foram encontradas mensagens novas. Pesquisar a partir do fim?"
 
-#: src/summaryview.c:2081
+#: src/summaryview.c:2060
 msgid "No new messages."
 msgstr "Não há mensagens novas."
 
-#: src/summaryview.c:2105
+#: src/summaryview.c:2084
 msgid "No new message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:2138 src/summaryview.c:2171
+#: src/summaryview.c:2117 src/summaryview.c:2150
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
-#: src/summaryview.c:2139
+#: src/summaryview.c:2118
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Pesquisar desde o fim?"
 
-#: src/summaryview.c:2148
+#: src/summaryview.c:2127
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas."
 
-#: src/summaryview.c:2172
+#: src/summaryview.c:2151
 msgid "No marked message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens marcadas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:2205 src/summaryview.c:2234
+#: src/summaryview.c:2184 src/summaryview.c:2213
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens rotuladas"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2185
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens rotuladas. Pesquisar desde o fim?"
 
-#: src/summaryview.c:2215 src/summaryview.c:2248
+#: src/summaryview.c:2194 src/summaryview.c:2227
 msgid "No labeled messages."
 msgstr "Não há mensagens rotuladas."
 
-#: src/summaryview.c:2235
+#: src/summaryview.c:2214
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens rotuladas. Pesquisar desde o início?"
 
-#: src/summaryview.c:2557
+#: src/summaryview.c:2537
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens pelo assunto..."
 
-#: src/summaryview.c:2742
+#: src/summaryview.c:2722
 #, c-format
 msgid "%d deleted"
 msgstr "%d excluída"
 
-#: src/summaryview.c:2746
+#: src/summaryview.c:2726
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movida"
 
-#: src/summaryview.c:2747 src/summaryview.c:2754
+#: src/summaryview.c:2727 src/summaryview.c:2734
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2732
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiada"
 
-#: src/summaryview.c:2766
+#: src/summaryview.c:2746
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " item selecionado"
 msgstr[1] " itens selecionados"
 
-#: src/summaryview.c:2784 src/summaryview.c:2829
+#: src/summaryview.c:2764 src/summaryview.c:2809
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nova(s), %d não lida(s), %d no total (%s)"
 
-#: src/summaryview.c:2804
+#: src/summaryview.c:2784
 msgid "Message summary"
 msgstr "Sumário das mensagens"
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2785
 msgid "New:"
 msgstr "Novas:"
 
-#: src/summaryview.c:2806
+#: src/summaryview.c:2786
 msgid "Unread:"
 msgstr "Não lidas:"
 
-#: src/summaryview.c:2807
+#: src/summaryview.c:2787
 msgid "Total:"
 msgstr "Total:"
 
-#: src/summaryview.c:2809
+#: src/summaryview.c:2789
 msgid "Marked:"
 msgstr "Marcadas:"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2790
 msgid "Replied:"
 msgstr "Respondidas:"
 
-#: src/summaryview.c:2811
+#: src/summaryview.c:2791
 msgid "Forwarded:"
 msgstr "Encaminhadas:"
 
-#: src/summaryview.c:2812
+#: src/summaryview.c:2792
 msgid "Locked:"
 msgstr "Travadas:"
 
-#: src/summaryview.c:2813
+#: src/summaryview.c:2793
 msgid "Ignored:"
 msgstr "Ignoradas:"
 
-#: src/summaryview.c:2814
+#: src/summaryview.c:2794
 msgid "Watched:"
 msgstr "Observadas:"
 
-#: src/summaryview.c:2824
+#: src/summaryview.c:2804
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d selecionada(s) (%s/%s), %d não lida(s)"
 
-#: src/summaryview.c:3117
+#: src/summaryview.c:3097
 msgid "Sorting summary..."
 msgstr "Ordenando o sumário..."
 
-#: src/summaryview.c:3285
+#: src/summaryview.c:3265
 msgid "Setting summary from message data..."
 msgstr "Estruturando o sumário a partir dos dados das mensagens..."
 
-#: src/summaryview.c:3491
+#: src/summaryview.c:3471
 msgid "(No Date)"
 msgstr "(Sem data)"
 
-#: src/summaryview.c:3548
+#: src/summaryview.c:3528
 msgid "(No Recipient)"
 msgstr "(Sem destinatário)"
 
-#: src/summaryview.c:3596
+#: src/summaryview.c:3576
 #, c-format
 msgid "From: %s, on %s"
 msgstr "De: %s, em %s"
 
-#: src/summaryview.c:3605
+#: src/summaryview.c:3585
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Para: %s, em %s"
 
-#: src/summaryview.c:4501
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr "Você não é o autor do artigo."
 
-#: src/summaryview.c:4591
+#: src/summaryview.c:4574
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Deseja realmente excluir a mensagem selecionada?"
 msgstr[1] "Deseja realmente excluir as %d mensagens selecionadas?"
 
-#: src/summaryview.c:4594
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Excluir a mensagem"
 msgstr[1] "Excluir as mensagens"
 
-#: src/summaryview.c:4758
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr "As pastas de destino e a atual são a mesma."
 
-#: src/summaryview.c:4813
+#: src/summaryview.c:4796
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Selecione a pasta para onde a mensagem selecionada será movida"
 msgstr[1] "Selecione a pasta para onde as mensagens selecionadas serão movidas"
 
-#: src/summaryview.c:4864
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr "Você está tentando copiar para a mesma pasta."
 
-#: src/summaryview.c:4898
+#: src/summaryview.c:4881
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Selecione a pasta para onde a mensagem selecionada será copiada"
 msgstr[1] ""
 "Selecione a pasta para onde as mensagens selecionadas serão copiadas"
 
-#: src/summaryview.c:5056
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr "Acrescentar ou sobrescrever"
 
-#: src/summaryview.c:5057
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr "Acrescentar ao arquivo ou sobrescrevê-lo?"
 
-#: src/summaryview.c:5058
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr "_Acrescentar"
 
-#: src/summaryview.c:5058
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr "_Sobrescrever"
 
-#: src/summaryview.c:5069 src/summaryview.c:5072 src/summaryview.c:5087
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Não foi possível salvar o arquivo '%s'."
 
-#: src/summaryview.c:5106
+#: src/summaryview.c:5090
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
@@ -18961,27 +19447,27 @@ msgstr ""
 "Você esta prestes a imprimir %d mensagens, uma a uma. Deseja realmente "
 "continuar?"
 
-#: src/summaryview.c:5564
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr "Agrupando discussões..."
 
-#: src/summaryview.c:5812
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr "Ignorar estas regras"
 
-#: src/summaryview.c:5815
+#: src/summaryview.c:5799
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplicar estas regras independente da conta à qual elas pertençam"
 
-#: src/summaryview.c:5818
+#: src/summaryview.c:5802
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar estas regras caso elas refiram-se à conta atual"
 
-#: src/summaryview.c:5847
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr "Filtragem"
 
-#: src/summaryview.c:5848
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18989,75 +19475,75 @@ msgstr ""
 "Existem algumas regras de filtragem que pertencem a uma conta.\n"
 "Por favor, escolha o que fazer com estas regras:"
 
-#: src/summaryview.c:5880
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:5963
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr "Configuração do processamento"
 
-#: src/summaryview.c:6111
+#: src/summaryview.c:6095
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Deseja realmente reiniciar o rótulo de cor de todas as mensagens "
 "selecionadas?"
 
-#: src/summaryview.c:6113
+#: src/summaryview.c:6097
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Deseja realmente aplicar esse rótulo de cor a todas as mensagens "
 "selecionadas?"
 
-#: src/summaryview.c:6114
+#: src/summaryview.c:6098
 msgid "Reset color label"
 msgstr "Reiniciar rótulo de cor"
 
-#: src/summaryview.c:6114
+#: src/summaryview.c:6098
 msgid "Set color label"
 msgstr "Definir rótulo de cor"
 
-#: src/summaryview.c:6557
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr "Discussão ignorada"
 
-#: src/summaryview.c:6559
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr "Discussão observada"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Respondida, mas também encaminhada - clique para ver a resposta"
 
-#: src/summaryview.c:6569
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr "Respondida - clique para ver a resposta"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr "A ser movida"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr "A ser copiada"
 
-#: src/summaryview.c:6595
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr "Assinada, possui anexo(s)"
 
-#: src/summaryview.c:6599
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr "Criptografada, possui anexo(s)"
 
-#: src/summaryview.c:6601
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr "Criptografada"
 
-#: src/summaryview.c:6603
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr "Possui anexo(s)"
 
-#: src/summaryview.c:8317
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19066,11 +19552,11 @@ msgstr ""
 "Erro na expressão regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8420
+#: src/summaryview.c:8402
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Voltar à lista de pastas (se você tiver mensagens não lidas)"
 
-#: src/summaryview.c:8425
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr "Voltar à lista de pastas"
 
@@ -19104,7 +19590,7 @@ msgstr "[%s  %s (%d bytes)]"
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
-#: src/textview.c:876
+#: src/textview.c:875
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19118,63 +19604,63 @@ msgstr ""
 "\n"
 "  Use "
 
-#: src/textview.c:881
+#: src/textview.c:880
 msgid "'Network Log'"
 msgstr "'Relatório da rede'"
 
-#: src/textview.c:882
+#: src/textview.c:881
 msgid " in the Tools menu for more information."
 msgstr " no menu Ferramentas para mais informações."
 
-#: src/textview.c:948
+#: src/textview.c:947
 msgid "  The following can be performed on this part\n"
 msgstr "  Pode-se efetuar o seguinte nessa parte\n"
 
-#: src/textview.c:950
+#: src/textview.c:949
 msgid "  by right-clicking the icon or list item:"
 msgstr "  clicando com o botão direito no ícone ou item da lista:"
 
-#: src/textview.c:954
+#: src/textview.c:953
 msgid "     - To save, select "
 msgstr "     - Para salvar, selecione  "
 
-#: src/textview.c:955
+#: src/textview.c:954
 msgid "'Save as...'"
 msgstr "'Salvar como...'"
 
-#: src/textview.c:957 src/textview.c:969 src/textview.c:981 src/textview.c:991
+#: src/textview.c:956 src/textview.c:968 src/textview.c:980 src/textview.c:990
 msgid " (Shortcut key: '"
 msgstr " (Tecla de atalho: '"
 
-#: src/textview.c:965
+#: src/textview.c:964
 msgid "     - To display as text, select "
 msgstr "     - Para exibir como texto, selecione "
 
-#: src/textview.c:966
+#: src/textview.c:965
 msgid "'Display as text'"
 msgstr "'Mostrar como texto'"
 
-#: src/textview.c:977
+#: src/textview.c:976
 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir com um programa externo, selecione "
 
-#: src/textview.c:978
+#: src/textview.c:977
 msgid "'Open'"
 msgstr "'Abrir'"
 
-#: src/textview.c:986
+#: src/textview.c:985
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente, dê um duplo clique ou clique com o "
 
-#: src/textview.c:987
+#: src/textview.c:986
 msgid "mouse button)\n"
 msgstr "botão do meio do mouse)\n"
 
-#: src/textview.c:989
+#: src/textview.c:988
 msgid "     - Or use "
 msgstr "     - Ou use "
 
-#: src/textview.c:990
+#: src/textview.c:989
 msgid "'Open with...'"
 msgstr "'Abrir com...'"
 
@@ -19189,31 +19675,31 @@ msgstr ""
 "    %s\n"
 "Código de saída %d\n"
 
-#: src/textview.c:2187
+#: src/textview.c:2195
 msgid "Tags: "
 msgstr "Etiquetas: "
 
-#: src/textview.c:2906
+#: src/textview.c:2914
 msgid "The real URL is different from the displayed URL."
 msgstr "A URL real é diferente da exibida."
 
-#: src/textview.c:2907
+#: src/textview.c:2915
 msgid "Displayed URL:"
 msgstr "URL exibida:"
 
-#: src/textview.c:2908
+#: src/textview.c:2916
 msgid "Real URL:"
 msgstr "URL real:"
 
-#: src/textview.c:2909
+#: src/textview.c:2917
 msgid "Open it anyway?"
 msgstr "Deseja abrir mesmo assim?"
 
-#: src/textview.c:2910
+#: src/textview.c:2918
 msgid "Phishing attempt warning"
 msgstr "Aviso de tentativa de fraude por phishing"
 
-#: src/textview.c:2911
+#: src/textview.c:2919
 msgid "_Open URL"
 msgstr "_Abrir URL"
 
@@ -19231,7 +19717,7 @@ msgstr "Enviar mensagens da Fila de Saída"
 
 #: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
 msgid "Compose Email"
-msgstr "Escrever e-mail"
+msgstr "Escrever email"
 
 #: src/toolbar.c:228
 msgid "Compose News"
@@ -19255,7 +19741,7 @@ msgstr "Responder à lista de discussão"
 
 #: src/toolbar.c:233 src/toolbar.c:2315
 msgid "Open email"
-msgstr "Abrir e-mail"
+msgstr "Abrir email"
 
 #: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
 msgid "Forward Message"
@@ -19601,11 +20087,11 @@ msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "Abrir URLs"
 
-#: src/uri_opener.c:216
+#: src/uri_opener.c:217
 msgid "Please select the URL to open."
 msgstr "Por favor, selecione a URL a ser aberta."
 
-#: src/uri_opener.c:224
+#: src/uri_opener.c:225
 msgid "Select All"
 msgstr "Selecionar tudo"
 
@@ -19711,7 +20197,7 @@ msgstr "Por favor, digite o nome da caixa postal."
 
 #: src/wizard.c:649
 msgid "Please enter your name and email address."
-msgstr "Por favor, digite o seu nome e endereço de e-mail."
+msgstr "Por favor, digite o seu nome e endereço de email."
 
 #: src/wizard.c:660
 msgid "Please enter your receiving server and username."
@@ -19737,7 +20223,7 @@ msgstr "Seu nome:"
 
 #: src/wizard.c:987
 msgid "Your email address:"
-msgstr "Seu endereço de e-mail:"
+msgstr "Seu endereço de email:"
 
 #: src/wizard.c:998
 msgid "Your organization:"
@@ -19825,7 +20311,7 @@ msgstr "Diretório do servidor IMAP:"
 
 #: src/wizard.c:1663
 msgid "Show only subscribed folders"
-msgstr "Mostrar apenas pastas assinadas"
+msgstr "Mostrar apenas pastas inscritas"
 
 #: src/wizard.c:1671
 msgid ""
@@ -19854,7 +20340,7 @@ msgstr ""
 "Bem-vindo(a) ao assistente de configuração do Claws Mail.\n"
 "\n"
 "Começaremos definindo algumas informações básicas sobre você e suas opções "
-"mais comuns de e-mail. Assim, você poderá iniciar a utilização do Claws Mail "
+"mais comuns de email. Assim, você poderá iniciar a utilização do Claws Mail "
 "em menos de cinco minutos."
 
 #: src/wizard.c:1842
@@ -19888,3 +20374,14 @@ msgid ""
 msgstr ""
 "O Claws Mail está pronto.\n"
 "Clique em Salvar para iniciar."
+
+#, c-format
+#~ msgid ""
+#~ "The pasted image has been attached as: \n"
+#~ "%s"
+#~ msgstr ""
+#~ "A imagem colada foi anexada como: \n"
+#~ "%s"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Usar autenticação de segurança (APOP)"
diff --git a/po/ro.po b/po/ro.po
index 9bb6cf5e9..f0aed2388 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.17.3\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2020-09-13 17:40+0100\n"
-"PO-Revision-Date: 2020-09-26 03:25+0300\n"
+"POT-Creation-Date: 2021-07-03 09:16+0100\n"
+"PO-Revision-Date: 2021-07-10 01:04+0300\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: Gnome Romanian Team <gnomero-list at lists.sourceforge.net>\n"
 "Language: ro\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 2.4.3\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -59,48 +59,48 @@ msgstr "Conturile cu dosare aflate la distanță nu pot fi copiate."
 msgid "Copy of %s"
 msgstr "%s - copie"
 
-#: src/account.c:1125
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Chiar vreți să ștergeți contul „%s”?"
 
-#: src/account.c:1127
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr "(neintitulat)"
 
-#: src/account.c:1128
+#: src/account.c:1129
 msgid "Delete account"
 msgstr "Ștergere cont"
 
-#: src/account.c:1602
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1608
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "„Verifică tot” preia mesaje de la conturile selectate"
 
-#: 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/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
 #: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: 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
 msgid "Name"
 msgstr "Nume"
 
-#: src/account.c:1623 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -154,7 +154,8 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5277 src/compose.c:5282 src/ldaputil.c:333
+#: 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/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -290,7 +291,7 @@ msgstr "Chiar vreți să ștergeți acest nume de atribut?"
 
 #: src/addrcustomattr.c:196
 msgid "Reset to default"
-msgstr "Resetează la implicit"
+msgstr "Restabilește la implicit"
 
 #: src/addrcustomattr.c:197
 msgid ""
@@ -314,7 +315,7 @@ msgstr "Șterge _tot"
 
 #: src/addrcustomattr.c:219
 msgid "_Reset to default"
-msgstr "_Resetează la implicit"
+msgstr "_Restabilește la implicit"
 
 #: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
@@ -427,12 +428,12 @@ msgid "_Book"
 msgstr "_Agendă de contacte"
 
 #: 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/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Editare"
 
-#: src/addressbook.c:407 src/compose.c:619 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Unelte"
@@ -467,14 +468,14 @@ msgstr "_Editare agendă de contacte"
 msgid "_Delete book"
 msgstr "Șter_ge agenda de contacte"
 
-#: src/addressbook.c:426 src/compose.c:631
+#: src/addressbook.c:426 src/compose.c:632
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Salvează"
 
-#: src/addressbook.c:427 src/compose.c:635 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
@@ -489,13 +490,13 @@ msgid "C_ut"
 msgstr "_Taie"
 
 #: 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/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copiază"
 
 #: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "Li_pește"
 
@@ -817,7 +818,7 @@ msgid "Person"
 msgstr "Persoană"
 
 #: 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/folderview.c:449 src/prefs_account.c:3468 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Dosar"
 
@@ -941,18 +942,18 @@ msgstr "Actualizare adresă (sau adrese)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Actualizarea a eșuat. Modificările nu au fost scrise în director."
 
-#: src/alertpanel.c:144 src/compose.c:9810
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr "Notificare"
 
-#: 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/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:5091
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5808 src/inc.c:726
+#: 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
 msgid "Error"
 msgstr "Eroare"
@@ -1074,36 +1075,36 @@ msgstr ""
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Versiunea Claws Mail pe care o aveți este prea veche pentru plugin."
 
-#: src/common/session.c:201 src/imap.c:1238
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "Procedeul handshake SSL/TLS a eșuat\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "Nu este disponibilă nicio metodă SMTP AUTH\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Metoda SMTP AUTH selectată nu este dispnibilă\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "răspuns greșit SMTP\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "a apărut o eroare la sesiunea SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "a apărut o eroare la autentificare\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Mesajul este prea mare (mărimea maximă este %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "nu s-a putut porni sesiunea STARTTLS\n"
 
@@ -1241,217 +1242,217 @@ msgstr "%d.%02dMiB"
 msgid "%.2fGB"
 msgstr "%.2fGiB"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Duminică"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Luni"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Marți"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Joi"
 
-#: src/common/utils.c:4056
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Vineri"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Ianuarie"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Februarie"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Martie"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Aprilie"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Iunie"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Iulie"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septembrie"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octombrie"
 
-#: src/common/utils.c:4069
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Noiembrie"
 
-#: src/common/utils.c:4070
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Decembrie"
 
-#: src/common/utils.c:4072
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dum"
 
-#: src/common/utils.c:4073
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4074
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4075
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mie"
 
-#: src/common/utils.c:4076
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Joi"
 
-#: src/common/utils.c:4077
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Vin"
 
-#: src/common/utils.c:4078
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sâm"
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Ian"
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Febr"
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mart"
 
-#: src/common/utils.c:4083
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:4084
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4085
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Iun"
 
-#: src/common/utils.c:4086
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Iul"
 
-#: src/common/utils.c:4087
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:4088
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sept"
 
-#: src/common/utils.c:4089
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4090
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4091
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dec"
 
-#: src/common/utils.c:4102
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4103
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4104
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4105
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:195
+#: src/compose.c:198
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1463,377 +1464,377 @@ msgstr ""
 "\n"
 "Semnarea și criptarea au fost dezactivate pentru acest mesaj."
 
-#: src/compose.c:603
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Adaugă..."
 
-#: src/compose.c:604 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Elimină"
 
-#: src/compose.c:606 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Proprietăți..."
 
-#: src/compose.c:613 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "_Mesaj"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "_Verificare ortografică"
 
-#: src/compose.c:618 src/compose.c:685
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Opțiuni"
 
-#: src/compose.c:620 src/mainwindow.c:528 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: src/compose.c:622
+#: src/compose.c:623
 msgid "S_end"
 msgstr "Trimit_e"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "Trimite mai târ_ziu"
 
-#: src/compose.c:626
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "_Atașează un fișier"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "_Inserează un fișier"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Inserea_ză semnătura"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "Înlocuiește semnătu_ra"
 
-#: src/compose.c:633
+#: src/compose.c:634
 msgid "_Print"
 msgstr "Ti_părește"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "An_ulează"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Refă"
 
-#: src/compose.c:642 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Taie"
 
-#: src/compose.c:646
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "Lipește _special"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Ca ci_tare"
 
 # hm ?
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "_Cu despărțire la capăt de rând"
 
 # hm ?
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "_Fără despărțire la capăt de rând"
 
-#: src/compose.c:651 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Selecte_ază tot"
 
-#: src/compose.c:653
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "A_vansat"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Mută un caracter înapoi"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Mută un caracter înainte"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Mută un cuvânt înapoi"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Mută un cuvânt înainte"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Mută la începutul liniei"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Mută la sfârșitul liniei"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Mută la linia precedentă"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Mută la linia următoare"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Șterge un caracter înapoi"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Șterge un caracter înainte"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Șterge un cuvânt înapoi"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Șterge un cuvânt înainte"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Șterge linia"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Șterge până la sfârșitul liniei"
 
-#: src/compose.c:670 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Caută"
 
-#: src/compose.c:673
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "_Desparte paragraful curent"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Desparte toate _liniile lungi"
 
-#: src/compose.c:676
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Editează cu un editor e_xtern"
 
-#: src/compose.c:679
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "Verifi_că tot sau verifică selecția"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "_Evidențiază toate cuvintele greșite"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "Verifică îna_poi cuvântul greșit"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "Înainte la _următorul cuvânt greșit"
 
-#: src/compose.c:689
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "_Mod de răspuns"
 
-#: src/compose.c:691
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "_Sistem de confidențialitate"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "_Prioritate"
 
-#: src/compose.c:697 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "Codare de caract_ere"
 
-#: src/compose.c:702 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Vest Europeană"
 
-#: src/compose.c:703 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Baltică"
 
-#: src/compose.c:704 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Ebraică"
 
-#: src/compose.c:705 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arabă"
 
-#: src/compose.c:706 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Chirilică"
 
-#: src/compose.c:707 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japoneză"
 
-#: src/compose.c:708 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Chineză"
 
-#: src/compose.c:709 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Coreeană"
 
-#: src/compose.c:710 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Tailandeză"
 
-#: src/compose.c:713 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Agendă de contacte"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "_Template"
 msgstr "Șa_blon"
 
-#: src/compose.c:717 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "Acțiu_ni"
 
-#: src/compose.c:721 src/mainwindow.c:825 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
 msgid "_About"
 msgstr "_Despre"
 
-#: src/compose.c:726
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Desparte liniile aut_omat"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "_Indentează automat"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "Semnea_ză"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "Cript_ează"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "Solicită o confi_rmare de primire"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "Elimină re_ferințele"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "Arată _rigla"
 
-#: src/compose.c:737 src/compose.c:747
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Normală"
 
 # continuare de meniu la Răspunde
-#: src/compose.c:738 src/mainwindow.c:674 src/messageview.c:305
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
 #: src/summaryview.c:433
 msgid "_All"
 msgstr "_Tuturor"
 
 # continuare de meniu la Răspunde
-#: src/compose.c:739 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_Sender"
 msgstr "E_xpeditorului"
 
-#: src/compose.c:740
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "_Listei de discuții"
 
-#: src/compose.c:745
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "_Maximă"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "M_are"
 
-#: src/compose.c:748
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "_Scăzută"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "Mi_nimă"
 
-#: src/compose.c:754 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automat"
 
-#: src/compose.c:755 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:756 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:760 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Central Europeană (ISO-8859-_2)"
 
-#: src/compose.c:763 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Greacă (ISO-8859-_7)"
 
-#: src/compose.c:768 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turcă (ISO-8859-_9)"
 
-#: src/compose.c:1055
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr "Eroare de format al mesajului nou la câmpul De la."
 
-#: src/compose.c:1148
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr "Eroare de format al mesajului nou la câmpul Subiect."
 
-#: src/compose.c:1180 src/quote_fmt.c:563
+#: src/compose.c:1181 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Corpul șablonului „Mesaj nou” are o eroare la linia %d."
 
-#: src/compose.c:1449
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Nu se poate răspunde. Probabil că e-mailul original nu există."
 
-#: src/compose.c:1634 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "Câmpul „De la” al șablonului „Răspunde” conține o adresă de e-mail nevalidă."
 
-#: src/compose.c:1683 src/quote_fmt.c:583
+#: src/compose.c:1684 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Corpul șablonului „Răspunde” are o eroare la linia %d."
 
-#: src/compose.c:1824 src/compose.c:2025 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1841,57 +1842,57 @@ msgstr ""
 "Câmpul „De la” al șablonului „Înaintează” conține o adresă de e-mail "
 "nevalidă."
 
-#: src/compose.c:1885 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Corpul șablonului „Înaintează” are o eroare la linia %d."
 
-#: src/compose.c:2068
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
 msgstr "Fw: e-mailuri multiple"
 
-#: src/compose.c:2577
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Corpul șablonului „Redirecționare” are o eroare la linia %d."
 
-#: src/compose.c:2648 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2651 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2654 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Răspuns-către:"
 
-#: src/compose.c:2657 src/compose.c:5026 src/compose.c:5028
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grupuri de știri:"
 
 # hm ?
-#: src/compose.c:2660 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Urmare-către:"
 
 # hm ?
-#: src/compose.c:2663 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Ca-răspuns-către:"
 
-#: src/compose.c:2667 src/compose.c:5023 src/compose.c:5031
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Către:"
 
-#: src/compose.c:2857
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nu s-a putut atașa un fișier (conversia setului de caractere a eșuat)."
 
-#: src/compose.c:2863
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1909,16 +1910,16 @@ msgstr[2] ""
 "Au fost atașate următoarele fișiere:\n"
 "%s"
 
-#: src/compose.c:3143
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Semnul din șablon pentru \"ghilimele\" nu este valid."
 
-#: src/compose.c:3672
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nu s-a putut obține mărimea fișierului „%s”."
 
-#: src/compose.c:3690
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1927,58 +1928,58 @@ msgstr ""
 "Sunteți pe cale să inserați un fișier de %s în corpul mesajului. Sigur vreți "
 "să faceți acest lucru?"
 
-#: src/compose.c:3693
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr "Sigur?"
 
-#: src/compose.c:3694 src/compose.c:10859 src/compose.c:11753
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr "_Inserează"
 
-#: src/compose.c:3819
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
 
-#: src/compose.c:3820
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr "Fișier gol"
 
-#: src/compose.c:3821
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr "_Atașează oricum"
 
-#: src/compose.c:3830
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr "Nu se poate citi %s."
 
-#: src/compose.c:3857
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:4867 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Editat]"
 
-#: src/compose.c:4874 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compunere mesaj%s"
 
-#: src/compose.c:4877 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[fără subiect] - Compunere mesaj%s"
 
-#: src/compose.c:4879 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Compune un mesaj"
 
 # hm ? a fost corespondență în ambele locuri cu mail
-#: src/compose.c:4906 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1986,61 +1987,61 @@ msgstr ""
 "Contul pentru trimiterea mesajelor nu este specificat.\n"
 "Selectați un cont de corespondență înainte de a trimite."
 
-#: src/compose.c:5123 src/compose.c:5160
+#: src/compose.c:5126 src/compose.c:5163
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "Singurul destinatar este adresa „%s” implicită. Trimiteți oricum?"
 
 # comun și pentru butonul de pe toolbar și pentru tabul din common preferences și edit accounts
-#: 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: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
 msgid "Send"
 msgstr "Trimite"
 
 # butonul de la confirmarea cui se trimite
-#: 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/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
 msgid "_Send"
 msgstr "_Trimite"
 
-#: src/compose.c:5181
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu este specificat."
 
-#: src/compose.c:5196
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Subiectul este gol. %s"
 
-#: src/compose.c:5197 src/compose.c:5240
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Trimiteți mesajul oricum?"
 
-#: src/compose.c:5198 src/compose.c:5241
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Puneți mesajul la coadă oricum?"
 
-#: src/compose.c:5200 src/compose.c:5243 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr "Trimite mai târziu"
 
-#: src/compose.c:5201 src/compose.c:5244
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr "_Coadă"
 
-#: src/compose.c:5239
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Trimitere la %d destinatari. %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5271
 msgid "Could not queue message."
 msgstr "Nu s-a putut pune mesajul la coadă."
 
-#: src/compose.c:5271
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2051,7 +2052,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5275
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2062,7 +2063,7 @@ msgstr ""
 "\n"
 "Semnătura a eșuat: %s"
 
-#: src/compose.c:5280
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2073,7 +2074,7 @@ msgstr ""
 "\n"
 "Criptarea a eșuat: %s"
 
-#: src/compose.c:5285
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2083,7 +2084,7 @@ msgstr ""
 "\n"
 "Conversia setului de caractere a eșuat."
 
-#: src/compose.c:5289
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2093,7 +2094,7 @@ msgstr ""
 "\n"
 "Nu s-a putut obține cheia de criptare a destinatarului."
 
-#: src/compose.c:5352 src/compose.c:5412
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2102,7 +2103,7 @@ msgstr ""
 "Folosiți comanda „Trimite mesajele de la coadă” din fereastra principală "
 "pentru a reîncerca."
 
-#: src/compose.c:5408
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
@@ -2112,7 +2113,7 @@ msgstr ""
 "Folosiți comanda „Trimite mesajele de la coadă” din fereastra principală "
 "pentru a reîncerca."
 
-#: src/compose.c:5805
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2123,7 +2124,7 @@ msgstr ""
 "în setul de caractere %s specificat.\n"
 "Îl trimiteți ca %s?"
 
-#: src/compose.c:5867
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2136,67 +2137,67 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum?"
 
-#: src/compose.c:6102
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr "Avertisment de criptare"
 
-#: src/compose.c:6103
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr "C_ontinuă"
 
-#: src/compose.c:6152
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr "Nu este disponibil nici un cont pentru trimiterea e-mailurilor !"
 
-#: src/compose.c:6161
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Contul selectat nu este NNTP. Postarea este imposibilă."
 
-#: src/compose.c:6415
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Fișierul %s pentru atașare nu mai există. Ignorați?"
 
-#: src/compose.c:6417 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Anulează trimiterea"
 
-#: src/compose.c:6417
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr "Ignoră atașarea"
 
-#: src/compose.c:6473
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr "Partea %s originală"
 
-#: src/compose.c:7073
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr "Adaugă în a_genda de contacte"
 
-#: src/compose.c:7240
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr "Șterge conținutul intrării"
 
-#: src/compose.c:7244 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Folosiți tasta <tab> pentru a completa automat din agenda de contacte"
 
-#: src/compose.c:7476
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr "Tip MIME"
 
-#: src/compose.c:7482 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: 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
 msgid "Size"
 msgstr "Mărime"
 
-#: src/compose.c:7544
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr "Salvează mesajul în "
 
-#: src/compose.c:7575 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
@@ -2207,27 +2208,27 @@ msgstr "Salvează mesajul în "
 msgid "_Browse"
 msgstr "_Răsfoiește"
 
-#: src/compose.c:7591
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr "Selectați dosarul în care să fie mutat mesajul"
 
-#: src/compose.c:8048
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "_Antet"
 
-#: src/compose.c:8053
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "Fișiere _atașate"
 
-#: src/compose.c:8067
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "_Altele"
 
-#: src/compose.c:8082
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "S_ubiect:"
 
-#: src/compose.c:8306
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2236,21 +2237,21 @@ msgstr ""
 "Verificarea ortografică nu a putut fi pornită.\n"
 "%s"
 
-#: src/compose.c:8453
+#: src/compose.c:8456
 msgid "_From:"
 msgstr "_De la:"
 
 # tooltip
-#: src/compose.c:8470
+#: src/compose.c:8473
 msgid "Account to use for this email"
 msgstr "Contul de folosit pentru acest e-mail"
 
 # tooltip
-#: src/compose.c:8472
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr "Adresa de folosit pentru expeditor"
 
-#: src/compose.c:8654
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2259,75 +2260,92 @@ msgstr ""
 "Sistemul de confidențialitate „%s” nu poate fi încărcat. Nu veți putea semna "
 "sau cripta acest mesaj."
 
-#: src/compose.c:8765 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "_Niciunul"
 
-#: src/compose.c:8866 src/prefs_template.c:752
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Corpul șablonului are o eroare la linia %d."
 
 # hm ? sau Eroare în formatul șablonului „%s” ?
-#: src/compose.c:8963
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Eroare de format în șablonul „%s”."
 
-#: src/compose.c:9387
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr "Tipul MIME nu este valid."
 
-#: src/compose.c:9402
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:9476
+#: src/compose.c:9479
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:9494
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr "Tip MIME"
 
-#: src/compose.c:9527
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:9547
+#: src/compose.c:9550
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:9548
+#: src/compose.c:9551
 msgid "File name"
 msgstr "Nume de fișier"
 
-#: src/compose.c:9807
+#: src/compose.c:9646
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+
+#: src/compose.c:9704
+#, c-format
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#: src/compose.c:9743
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr ""
+
+#: src/compose.c:9817
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
-"Editorul extern este încă în funcțiune.\n"
-"Forțați terminarea procesului?\n"
-"ID-ul grupului de proces: %d"
 
-#: src/compose.c:10280 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Pentru a putea trimite acest e-mail, Claws Mail necesită acces la rețea."
 
-#: src/compose.c:10473
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr "Nu s-a putut salva ciorna."
 
-#: src/compose.c:10477
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr "Nu s-a putut salva ciorna"
 
-#: src/compose.c:10478
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2335,24 +2353,24 @@ msgstr ""
 "Nu s-a putut salva ciorna.\n"
 "Vreți să anulați ieșirea sau abandonați acest e-mail?"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr "Anulează _ieșirea"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr "Aban_donează e-mailul"
 
-#: src/compose.c:10669 src/compose.c:10683
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:10697
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Fișierul „%s” nu a putut fi citit."
 
-#: src/compose.c:10699
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2362,53 +2380,53 @@ msgstr ""
 "pentru codarea curentă, inserția poate fi incorectă."
 
 # titlu pe bară și în fereastră
-#: src/compose.c:10778
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr "Abandonare mesaj"
 
-#: src/compose.c:10779
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr "Acest mesaj a fost modificat. Îl abandonați?"
 
-#: src/compose.c:10780 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "Aban_donează"
 
-#: src/compose.c:10780 src/compose.c:10785
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr "_Salvează la ciorne"
 
 # titlu pe bară și în fereastră
 # încă ceva (?)
-#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Salvare modificări"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:10784
+#: src/compose.c:10734
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Acest mesaj a fost modificat. Salvați ultimele modificări?"
 
-#: src/compose.c:10785
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr "_Nu salva"
 
-#: src/compose.c:10856
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vreți să aplicați șablonul „%s”?"
 
-#: src/compose.c:10858
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr "Aplică un șablon"
 
-#: src/compose.c:10859 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
 #: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:11746
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2426,20 +2444,20 @@ msgstr[2] ""
 "Vreți să inserați conținutul celor %d de fișiere în corpul mesajului sau să "
 "le atașați la e-mail?"
 
-#: src/compose.c:11752
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr "Inserați sau atașați?"
 
-#: src/compose.c:11753
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr "_Atașează"
 
-#: src/compose.c:11971
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Eroare de formatare a citatului la linia %d."
 
-#: src/compose.c:12267
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2641,7 +2659,7 @@ msgid " Check File "
 msgstr " Verifică fișierul "
 
 #: 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/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Fișier"
@@ -2730,13 +2748,13 @@ msgstr "Adaugă o înregistrare JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editare LDAP - selectare bază de căutare"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Nume de gazdă"
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2795,7 +2813,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2869,6 +2887,7 @@ msgid "Max Query Age (secs)"
 msgstr ""
 
 #: src/editldap.c:614
+#, fuzzy
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2881,6 +2900,30 @@ msgid ""
 "This is useful for servers that have slow response times at the expense of "
 "more memory to cache results."
 msgstr ""
+"Aceasta definește perioada maximă de timp (în secunde) în care un rezultat "
+"al căutării de adrese este valid în scopul completării adresei. Rezultatele "
+"căutării sunt stocate într-un cache până la trecerea acestei perioade de "
+"timp și apoi retrase. Acest lucru va îmbunătăți timpul de răspuns atunci "
+"când încercați să căutați același nume sau adresă la solicitările ulterioare "
+"de completare a adresei. Cache-ul va fi căutat, preferabil efectuării unei "
+"noi cereri de căutare a serverului. Valoarea implicită de 600 de secunde (10 "
+"minute) ar trebui să fie suficientă pentru majoritatea serverelor. O valoare "
+"mai mare va reduce timpul de căutare pentru căutările ulterioare. Acest "
+"lucru este util pentru serverele care au timpi de răspuns liniști în "
+"detrimentul mai multor memorii pentru a cache rezultatele.\n"
+"\n"
+"Aceasta definește perioada maximă de timp (în secunde) în care un rezultat "
+"al căutării adresei este valid pentru scopuri de finalizare a adresei. "
+"Rezultatele căutării sunt stocate într-un cache până când această perioadă "
+"de timp a trecut și apoi s-a retras. Acest lucru va îmbunătăți timpul de "
+"răspuns atunci când încercați să căutați același nume sau adresă la "
+"solicitările ulterioare de finalizare a adresei. Memoria cache va fi căutată "
+"în locul efectuării unei noi solicitări de căutare pe server. Valoarea "
+"implicită de 600 de secunde (10 minute), ar trebui să fie suficientă pentru "
+"majoritatea serverelor. O valoare mai mare va reduce timpul de căutare "
+"pentru căutările ulterioare. Acest lucru este util pentru serverele care au "
+"timpi de răspuns lenti in detrimentul mai multa memorie pentru a memora in "
+"cache rezultate."
 
 #: src/editldap.c:631
 msgid "Include server in dynamic search"
@@ -2925,8 +2968,8 @@ msgstr "Parola conexiunii"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 
-#: 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/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
 msgid "Show password"
 msgstr "Arată parola"
@@ -2948,11 +2991,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr "De bază"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "Extins"
 
@@ -3096,8 +3139,8 @@ msgstr ""
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
 #: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1040
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
+#: 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
 msgid "None"
 msgstr "Fără"
 
@@ -3315,7 +3358,7 @@ msgstr "Nume deosebit"
 
 # titlu pe bară
 # și încă ceva (?)
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr "Exportare în fișier mbox"
 
@@ -3380,17 +3423,17 @@ msgstr "Numele este prea lung."
 msgid "Not specified."
 msgstr "Nu este specificat."
 
-#: 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 "Fișierul %s lipsește! Vreți să folosiți fișierul de backup din %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 "Nu s-a putut copia %s la %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 "
@@ -3498,51 +3541,51 @@ msgstr "acțiunea nu a putut fi aplicată\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "nicio procesare ulterioară după acțiune [ %s ]\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "se procesează regula „%s” [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "se procesează regula <nedenumită> [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "regula dezactivată „%s” [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "regula dezactivată <nedenumită> [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "nedeterminat"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "încorporare"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "manual"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "procesare dosar"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "pre-procesare"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "post-procesare"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3559,11 +3602,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3598,35 +3641,35 @@ msgstr "Ciorne"
 msgid "Processing (%s)...\n"
 msgstr "Se procesează (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Se copiază %s la %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Se mută %s la %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Se actualizează cache-ul pentru %s..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "Se procesează mesajele..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Se sincronizează %s pentru utilizare offline...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Un nume de dosar nu poate începe sau sfârși cu un punct."
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "Un nume de dosar nu poate sfârși cu un spațiu."
 
@@ -3705,18 +3748,18 @@ msgstr "_Trimite mesajele de la coadă..."
 
 #: src/folderview.c:264
 msgid "Set Displayed columns"
-msgstr "Setează coloanele afișate"
+msgstr "Stabilește coloanele afișate"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr "Nou"
 
 # comun și când search și în dropdown-ul din fereastra principală
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Necitit"
@@ -3733,10 +3776,10 @@ msgstr "#"
 
 #: src/folderview.c:783
 msgid "Setting folder info..."
-msgstr "Se setează informațiile dosarului..."
+msgstr "Se stabilesc informațiile dosarului..."
 
 # titlu pe bară și de fereastră
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr "Marcare ca fiind citit"
 
@@ -3746,13 +3789,13 @@ msgid ""
 "read?"
 msgstr ""
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:871 src/summaryview.c:4292
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Chiar vreți ca tot conținutul acestui dosar să fie marcat ca fiind citit?"
 
 # titlu pe bară și de fereastră
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr "Marcare ca fiind necitit"
 
@@ -3762,17 +3805,17 @@ msgid ""
 "unread?"
 msgstr ""
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:877 src/summaryview.c:4338
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 "Chiar vreți ca tot conținutul acestui dosar să fie marcat ca fiind necitit?"
 
-#: src/folderview.c:1067 src/imap.c:4675
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Se scanează dosarul %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4679 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Se scanează dosarul %s..."
@@ -3832,7 +3875,7 @@ msgstr "Ștergeți toate mesajele din coșul de gunoi?"
 msgid "_Empty trash"
 msgstr "Gol_ește gunoiul"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Avertisment de offline"
 
@@ -3852,7 +3895,7 @@ msgstr "Trimiteți toate mesajele de la coadă?"
 msgid "Some errors occurred while sending queued messages."
 msgstr "Au apărut unele erori în timpul trimiterii mesajelor de la coadă."
 
-#: src/folderview.c:2557 src/main.c:2891 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3921,7 +3964,7 @@ msgstr "Mutarea a eșuat !"
 msgid "Processing configuration for folder %s"
 msgstr "Configurare de procesare pentru dosarul %s"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Dosarul de destinație poate fi folosit numai pentru a stoca subdosare."
 
@@ -3972,7 +4015,7 @@ msgstr "necunoscut"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nu se poate prelua lista grupurilor de știri."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1848 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr "Gata."
 
@@ -4007,7 +4050,7 @@ msgstr ""
 
 #: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
@@ -4161,44 +4204,44 @@ msgstr ""
 "Ar trebui să fi primit o copie a Licenței Publice Generale GNU (GNU GPL) "
 "împreună cu acest program. Dacă nu, consultați "
 
-#: src/gtk/about.c:718 src/main.c:2715
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr "Statistici de sesiune\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2725 src/main.c:2728
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr "Pornit: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2734
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr "Trafic de intrare\n"
 
-#: src/gtk/about.c:741 src/main.c:2737
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mesaje primite: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2743
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr "Trafic de ieșire\n"
 
-#: src/gtk/about.c:751 src/main.c:2746
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Mesaje noi sau redirecționate: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2750
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Mesaje răspunse: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2754
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Mesaje înaintate: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2758
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total mesaje trimise: %d\n"
@@ -4413,20 +4456,20 @@ msgstr ""
 "%s"
 
 # hm ?
-#: src/gtk/gtkutils.c:1853
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "Eșuat: nu a fost găsită nicio înregistrare de serviciu."
 
-#: src/gtk/gtkutils.c:1856
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "Eșuat: eroare de rețea."
 
-#: src/gtk/gtkutils.c:1859
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Eșuat: eroare necunoscută (%d)."
 
-#: src/gtk/gtkutils.c:1929
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "Se configurează..."
 
@@ -4671,7 +4714,7 @@ msgstr "Agent utilizator:"
 msgid "Content-Type"
 msgstr "Tip-de-conținut"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr "Tip-de-conținut:"
 
@@ -4699,7 +4742,7 @@ msgstr ""
 msgid "Precedence:"
 msgstr ""
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "Organizație"
 
@@ -5022,7 +5065,7 @@ msgstr ""
 #: 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/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
@@ -5081,11 +5124,11 @@ msgid "_Hide"
 msgstr "_Ascunde"
 
 #: 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: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
 msgid "Account"
 msgstr "Cont"
 
@@ -5303,52 +5346,52 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr "De la/Către/Cc/Subiect/Etichetă"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Recursiv"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "Persistent"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "Tastare anticipată"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "Rulează la selecție"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "Golește căutarea curentă"
 
 # tooltip (cel puțin la căutarea sumară)
-#: 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 "Editează criteriile de căutare"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr "Informații despre simbolurile extinse"
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr "_Informații"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr "E_ditare"
 
-#: 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:349
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "_Golește"
@@ -5525,211 +5568,211 @@ msgstr "(Fără expeditor)"
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr "Eroare:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Nume de fișier:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr "Mărime de fișier:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr "Încarcă imaginea"
 
-#: src/imap.c:582
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr ""
 
-#: 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: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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr ""
 
-#: src/imap.c:627
+#: src/imap.c:628
 msgid "authenticated"
 msgstr "autentificat"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "neautentificat"
 
-#: src/imap.c:633
+#: src/imap.c:634
 msgid "bad state"
 msgstr "stare greșită"
 
-#: src/imap.c:636
+#: src/imap.c:637
 msgid "stream error"
 msgstr "eroare de flux"
 
-#: src/imap.c:639
+#: src/imap.c:640
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 
-#: src/imap.c:643
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "conexiune refuzată"
 
-#: src/imap.c:646
+#: src/imap.c:647
 msgid "memory error"
 msgstr ""
 
-#: src/imap.c:649
+#: src/imap.c:650
 msgid "fatal error"
 msgstr "eroare fatală"
 
-#: src/imap.c:652
+#: src/imap.c:653
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 
-#: src/imap.c:656
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr "conexiune neacceptată"
 
-#: src/imap.c:659
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr "eroare APPEND"
 
-#: src/imap.c:662
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr "eroare NOOP"
 
-#: src/imap.c:665
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr "eroare LOGOUT"
 
-#: src/imap.c:668
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr "eroare CAPABILITY"
 
-#: src/imap.c:671
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr "eroare CHECK"
 
-#: src/imap.c:674
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr "eroare CLOSE"
 
-#: src/imap.c:677
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr "eroare EXPUNGE"
 
-#: src/imap.c:680
+#: src/imap.c:681
 msgid "COPY error"
 msgstr "eroare COPY"
 
-#: src/imap.c:683
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr "eroare UID COPY"
 
-#: src/imap.c:686
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr "eroare CREATE"
 
-#: src/imap.c:689
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr "eroare DELETE"
 
-#: src/imap.c:692
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr "eroare EXAMINE"
 
-#: src/imap.c:695
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr "eroare FETCH"
 
-#: src/imap.c:698
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr "eroare UID FETCH"
 
-#: src/imap.c:701
+#: src/imap.c:702
 msgid "LIST error"
 msgstr "Eroare LIST"
 
-#: src/imap.c:704
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr "eroare LOGIN"
 
-#: src/imap.c:707
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr "Eroare LSUB"
 
-#: src/imap.c:710
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr "eroare RENAME"
 
-#: src/imap.c:713
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr "eroare SEARCH"
 
-#: src/imap.c:716
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr "eroare UID SEARCH"
 
-#: src/imap.c:719
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr "eroare SELECT"
 
-#: src/imap.c:722
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr "eroare STATUS"
 
-#: src/imap.c:725
+#: src/imap.c:726
 msgid "STORE error"
 msgstr "Eroare STORE"
 
-#: src/imap.c:728
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr "eroare UID STORE"
 
-#: src/imap.c:731
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr "eroare SUBSCRIBE"
 
-#: src/imap.c:734
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr "eroare UNSUBSCRIBE"
 
-#: src/imap.c:737
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr "eroare STARTTLS"
 
-#: src/imap.c:740
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr "eroare INVAL"
 
-#: src/imap.c:743
+#: src/imap.c:744
 msgid "EXTENSION error"
-msgstr "eroare EXTENSION"
+msgstr "Eroare EXTENSION"
 
-#: src/imap.c:746
+#: src/imap.c:747
 msgid "SASL error"
 msgstr "Eroare SASL"
 
-#: src/imap.c:750
+#: src/imap.c:751
 msgid "SSL/TLS error"
-msgstr "eroare SSL/TLS"
+msgstr "Eroare SSL/TLS"
 
-#: src/imap.c:754
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Eroare necunoscută [%d]"
 
-#: src/imap.c:960
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5737,7 +5780,7 @@ msgid ""
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:966
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5745,7 +5788,7 @@ msgid ""
 "and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:972
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5753,7 +5796,7 @@ msgid ""
 "and the SCRAM SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:978
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5761,7 +5804,7 @@ msgid ""
 "the PLAIN SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:984
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5769,37 +5812,37 @@ msgid ""
 "the LOGIN SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:991
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Conexiunea la %s a eșuat: autentificarea a fost refuzată.%s"
 
-#: src/imap.c:995
+#: src/imap.c:1003
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Conexiunea la %s a eșuat: autentificarea a fost refuzată.%s\n"
 
-#: src/imap.c:1013
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Conectarea la %s a eșuat"
 
-#: src/imap.c:1020 src/imap.c:1023
+#: src/imap.c:1028 src/imap.c:1031
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Conexiunea IMAP la %s a fost deconectată. Se reconectează...\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:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail necesită acces la rețea pentru a putea accesa serverul IMAP."
 
-#: src/imap.c:1163 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Conexiune nesigură"
 
-#: src/imap.c:1164 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5808,130 +5851,130 @@ msgid ""
 "not be secure."
 msgstr ""
 
-#: src/imap.c:1170 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "Con_tinuă conectarea"
 
-#: src/imap.c:1179
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Contul „%s”: Se conectează la serverul IMAP: %s:%d..."
 
-#: src/imap.c:1244
+#: src/imap.c:1252
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Conectare eșuată la serverul IMAP: %s:%d"
 
-#: src/imap.c:1247
+#: src/imap.c:1255
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Conectare eșuată la serverul IMAP: %s:%d\n"
 
-#: src/imap.c:1279 src/imap.c:4146
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nu se poate porni sesiunea STARTTLS.\n"
 
-#: src/imap.c:1348
+#: src/imap.c:1359
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nu s-a putut loga la serverul IMAP %s.\n"
 
-#: src/imap.c:1351
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nu s-a putut loga la serverul IMAP %s."
 
-#: src/imap.c:1779
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "Se adaugă mesajele..."
 
-#: src/imap.c:1984 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Se copiază mesajele..."
 
-#: src/imap.c:2510
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr ""
 
-#: src/imap.c:2594
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "nu se pot seta fanioanele șterse\n"
 
 # hm ?
-#: src/imap.c:2601 src/imap.c:5097
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "nu se poate elimina\n"
 
-#: src/imap.c:2976
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr ""
 
-#: src/imap.c:2979
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr ""
 
-#: src/imap.c:3267
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nu se poate crea căsuța poștală: LIST a eșuat.\n"
 
-#: src/imap.c:3280
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "nu se poate crea căsuța poștală\n"
 
-#: src/imap.c:3411
+#: src/imap.c:3422
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nu se poate redenumi căsuța poștală: %s în %s\n"
 
-#: src/imap.c:3524
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "nu se poate șterge căsuța poștală\n"
 
-#: src/imap.c:3803
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "LIST a eșuat\n"
 
-#: src/imap.c:3888
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr ""
 
-#: src/imap.c:3991
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nu se poate selecta dosarul: %s\n"
 
-#: src/imap.c:4143
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr ""
 
-#: src/imap.c:4153
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
-#: src/imap.c:4158
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
 "compiled without STARTTLS support.\n"
 msgstr ""
 
-#: src/imap.c:4166
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr ""
 
-#: src/imap.c:4389
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "Se preia mesajul..."
 
 # hm ? sau stabili ?
-#: src/imap.c:5090
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nu se pot seta fanioanele șterse: %d\n"
 
-#: src/imap.c:6125
+#: src/imap.c:6136
 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"
@@ -6322,32 +6365,32 @@ msgid "Import Pine file into Address Book"
 msgstr "Import de fișier Pine în agenda de contacte"
 
 # a fost: Claws Mail are nevoie de acces la rețea pentru a obține e-mailuri.
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail are nevoie de acces la rețea pentru obținerea mesajelor."
 
-#: src/inc.c:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "%s eșuate\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "Preluare mesaje noi"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "În așteptare"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "Anulat"
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Preluare"
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6355,28 +6398,28 @@ msgstr[0] "Gata (%d mesaj primit (%s))"
 msgstr[1] "Gata (%d mesaje primite (%s))"
 msgstr[2] "Gata (%d de mesaje primite (%s))"
 
-#: src/inc.c:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "Gata (nu există mesaje noi)"
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Autentificarea a eșuat"
 
-#: 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: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
 msgid "Locked"
 msgstr "Blocat"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:397
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr "Timp expirat"
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6384,66 +6427,66 @@ msgstr[0] "Terminat (%d mesaj(e) noi)"
 msgstr[1] "Finalizat (%d mesaje noi)"
 msgstr[2] "Finalizat (%d de mesaje noi)"
 
-#: src/inc.c:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "Terminat (nu sunt mesaje noi)"
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Preluare mesaje noi"
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Contul „%s”: Se conectează la serverul POP3: %s:%d..."
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Conectare eșuată la serverul POP3: %s:%d"
 
-#: src/inc.c:927
+#: src/inc.c:932
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Conectare eșuată la serverul POP3: %s:%d\n"
 
-#: src/inc.c:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Se autentifică..."
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Se preiau mesajele de la %s (%s)..."
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Se obține numărul de mesaje noi (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Se obține numărul de mesaje noi (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Se obține numărul de mesaje noi (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "Se obține mărimea mesajelor (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "Părăsire"
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Preluare mesaj (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6451,16 +6494,16 @@ msgstr[0] "Preluare (%d mesaj primit (%s))"
 msgstr[1] "Preluare (%d mesaje primite (%s))"
 msgstr[2] "Preluare (%d de mesaje primite (%s))"
 
-#: src/inc.c:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Conexiunea la %s:%d a eșuat."
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "A apărut o eroare în timpul procesării mesajelor."
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6469,38 +6512,38 @@ msgstr ""
 "A apărut o eroare în timpul procesării mesajelor.\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "Nu mai este spațiu pe disc."
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "Nu se poate scrie fișierul."
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "Eroare socket."
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Eroare de socket la conectarea la %s:%d."
 
 # hm ? sau gazdă ?
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "Conexiune închisă de serverul de la distanță."
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "Căsuța poștală este blocată."
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6509,11 +6552,11 @@ msgstr ""
 "Căsuța poștală este blocată:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "Autentificarea a eșuat."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6522,54 +6565,54 @@ msgstr ""
 "Autentificarea a eșuat:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
 
-#: src/inc.c:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr ""
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr "Încorporarea a fost anulată\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1766
+#: 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
 msgid "seconds"
 msgstr "secunde"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minute"
 msgstr[2] "de minute"
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "oră"
 msgstr[1] "ore"
 msgstr[2] "de ore"
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sLucrați în modul offline. Ignorați avertismentul pentru %d %s?"
 
-#: src/inc.c:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sLucrați în modul offline. Ignorați avertismentul?"
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "Numai _o dată"
 
@@ -6883,18 +6926,17 @@ msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         comută modul de depanare"
 
 #: src/main.c:2081
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h              afișează acest ajutor și ieșire din aplicație"
+msgid "  --help -h              display this help"
+msgstr ""
 
 #: src/main.c:2082
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           afișează versiunea și ieșire din aplicație"
+msgid "  --version -v           output version information"
+msgstr ""
 
 #: src/main.c:2083
 msgid ""
-"  --version-full -V      output version and built-in features information "
-"and exit"
-msgstr "  --version              afișează versiunea și ieșire din aplicație"
+"  --version-full -V      output version and built-in features information"
+msgstr ""
 
 #: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
@@ -6952,11 +6994,11 @@ msgstr ""
 "În coada de așteptare se află unul sau mai multe mesaje netrimise.\n"
 "Ieșiți acum?"
 
-#: src/main.c:3019
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr ""
 
-#: src/main.c:3025
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr ""
 
@@ -7049,7 +7091,7 @@ msgstr "Bara de unel_te"
 
 #: src/mainwindow.c:569
 msgid "Set displayed _columns"
-msgstr "Setează _coloanele afișate"
+msgstr "Stabilește _coloanele afișate"
 
 #: src/mainwindow.c:570
 msgid "In _folder list..."
@@ -7222,7 +7264,7 @@ msgstr "Obține pentru to_ate conturile"
 
 #: src/mainwindow.c:661
 msgid "Cancel receivin_g"
-msgstr "Oprește pri_mirea"
+msgstr "Anulează pri_mirea"
 
 #: src/mainwindow.c:664
 msgid "_Send queued messages"
@@ -7274,9 +7316,10 @@ msgstr "Redirecționea_ză"
 msgid "Mailing-_List"
 msgstr "_Listă de discuții"
 
+# hm ?
 #: src/mainwindow.c:685
 msgid "Post"
-msgstr ""
+msgstr "Postează"
 
 #: src/mainwindow.c:687
 msgid "Help"
@@ -7341,11 +7384,11 @@ msgstr "Marchează ca fiind n_ecitit"
 
 #: src/mainwindow.c:716
 msgid "Mark all read in folder"
-msgstr ""
+msgstr "Marchează totul ca fiind citit în dosar"
 
 #: src/mainwindow.c:717
 msgid "Mark all unread in folder"
-msgstr ""
+msgstr "Marchează totul ca fiind necitit în dosar"
 
 #: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
 #: src/toolbar.c:503
@@ -7481,7 +7524,7 @@ msgstr "E_xecută"
 
 #: src/mainwindow.c:782
 msgid "Exp_unge"
-msgstr ""
+msgstr "Șterge complet (Exp_unge)"
 
 #: src/mainwindow.c:785
 msgid "SSL/TLS cer_tificates"
@@ -7731,7 +7774,7 @@ msgstr "Descrescător"
 msgid "_Auto detect"
 msgstr "Detectare _automată"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr "Aplică etichetele..."
 
@@ -7800,8 +7843,8 @@ msgid ""
 msgstr ""
 "Introduceți locația căsuței poștale.\n"
 "Locația poate fi fie calea completă, fie relativă la\n"
-"directorul 'home'.Dacă este specificată locația unei căsuțe poștale "
-"existente,\n"
+"directorul 'home'.\n"
+"Dacă este specificată locația unei căsuțe poștale existente,\n"
 "aceasta va fi scanată automat."
 
 #: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:196
@@ -7901,7 +7944,7 @@ msgstr "Nu s-a găsit niciun mesaj duplicat în %d dosare.\n"
 msgid "Select folder to go to"
 msgstr "Selectați dosarul pentru a merge la el"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr "Reguli de procesare de aplicat înaintea regulilor de dosar"
 
@@ -7912,7 +7955,7 @@ msgstr "Reguli de procesare de aplicat după regulile de dosar"
 # titlu pe bară
 # încă ceva (?)
 # hm ? pare mai corect cu filtre în loc de filtrare
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr "Configurare filtre"
 
@@ -7938,15 +7981,15 @@ msgstr "Se scanează dosarul %s%c%s..."
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "A fost uitată %d parolă în %d conturi.\n"
+msgstr[1] "Au fost uitate %d parole în %d conturi.\n"
+msgstr[2] "Au fost uitate %d de parole în %d conturi.\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
 #, c-format
 msgid "%s header"
-msgstr ""
+msgstr "Antet %s"
 
 #: src/matcher.c:225
 msgid "header"
@@ -7989,7 +8032,7 @@ msgstr "mesajul nu se potrivește\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
 msgid "(none)"
-msgstr ""
+msgstr "(fără)"
 
 #: src/mbox.c:98
 #, c-format
@@ -8243,8 +8286,8 @@ msgstr ""
 "\n"
 "  Mesjul a fost șters sau mutat în alt dosar"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr "A apărut o eroare în timpul învățării.\n"
 
@@ -8360,7 +8403,7 @@ msgid "Go back to email"
 msgstr "Înapoi la e-mail"
 
 #: 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:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nu s-a putut salva partea mesajului multiparte: %s"
@@ -8376,18 +8419,20 @@ msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
 "operation or skip error and continue?"
 msgstr ""
+"A apărut o eroare în timpul salvării părții #%d a mesajului. Vreți să "
+"anulați operația, sau ignorați eroarea și continuați omițând această parte?"
 
 #: src/mimeview.c:1921
 msgid "Error saving all message parts"
-msgstr ""
+msgstr "Eroare la salvarea tuturor părților mesajului"
 
 #: src/mimeview.c:1922
 msgid "Skip"
-msgstr ""
+msgstr "Omite"
 
 #: src/mimeview.c:1922
 msgid "Skip all"
-msgstr ""
+msgstr "Omite tot"
 
 #: src/mimeview.c:1932
 #, c-format
@@ -8409,9 +8454,9 @@ msgstr[2] "Au fost salvate cu succes %d de fișiere"
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%s, %d fișier a eșuat."
+msgstr[1] "%s, %d fișiere au eșuat."
+msgstr[2] "%s, %d de fișiere au eșuat."
 
 #: src/mimeview.c:1978 src/plugins/archive/archiver_prefs.c:142
 #: src/prefs_filtering_action.c:1263
@@ -8421,10 +8466,10 @@ msgstr "Selectați dosarul de destinație"
 #: src/mimeview.c:1985 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
-msgstr ""
+msgstr "„%s” nu este un director."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr "Salvare ca"
 
@@ -8448,10 +8493,13 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Nu s-a putut converti la UTF-16 numele fișierului atașat:\n"
+"\n"
+"%s"
 
 #: src/mimeview.c:2343
 msgid "Execute untrusted binary?"
-msgstr ""
+msgstr "Permiteți rularea executabilului necunoscut?"
 
 #: src/mimeview.c:2344
 msgid ""
@@ -8460,10 +8508,14 @@ msgid ""
 "\n"
 "Do you want to run this file?"
 msgstr ""
+"Acest fișier atașat este un executabil. Rularea fișierelor executabile "
+"necunoscute este periculoasă și vă poate compromite calculatorul.\n"
+"\n"
+"Vreți să rulați acest fișier?"
 
 #: src/mimeview.c:2348
 msgid "Run binary"
-msgstr ""
+msgstr "Rulează executabilul"
 
 #: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
@@ -8474,7 +8526,7 @@ msgstr "Tip:"
 msgid "Size:"
 msgstr "Mărime:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: 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
 msgid "Description:"
@@ -8493,12 +8545,14 @@ msgstr "Contul „%s”: Se conectează la serverul NNTP: %s:%d...\n"
 #: src/news.c:372
 #, c-format
 msgid "Error logging in to %s:%d...\n"
-msgstr ""
+msgstr "Eroare de autentificare la %s:%d...\n"
 
 #: src/news.c:451
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
+"Libetpan nu acceptă codul de retur 480, așa că deocamdată am ales să "
+"continuăm\n"
 
 #: src/news.c:460
 msgid "Mode reader failed, continuing nevertheless\n"
@@ -8512,7 +8566,7 @@ msgstr "Eroare la crearea sesiunii cu %s:%d\n"
 #: src/news.c:479
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
-msgstr ""
+msgstr "Eroare de autentificare la %s:%d...\n"
 
 #: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
@@ -8584,6 +8638,75 @@ msgstr "Dezabonare de la grupul de știri"
 msgid "Rename newsgroup folder"
 msgstr "Redenumește dosarul grupurilor de știri"
 
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr ""
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr ""
+
+#: src/oauth2.c:253 src/oauth2.c:367
+msgid "OAuth2 SSL connection error\n"
+msgstr ""
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr ""
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr ""
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr ""
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr ""
+
+#: src/oauth2.c:452
+msgid "OAuth2 socket write error\n"
+msgstr ""
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr ""
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr ""
+
+#: src/oauth2.c:534
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr ""
+
+#: src/oauth2.c:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr ""
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr ""
+
+#: src/oauth2.c:583
+#, c-format
+msgid "OAuth2 original: %s\n"
+msgstr ""
+
+#: src/oauth2.c:584
+#, c-format
+msgid "OAuth2 encoded: %s\n"
+msgstr ""
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr ""
+
 # hm ?
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
@@ -8893,6 +9016,8 @@ msgid ""
 "Not a valid file name:\n"
 "%s."
 msgstr ""
+"Nu este un nume de fișier valid:\n"
+"%s."
 
 #: src/plugins/archive/archiver_gtk.c:592
 #, c-format
@@ -8900,6 +9025,8 @@ msgid ""
 "Not a valid Claws Mail folder:\n"
 "%s."
 msgstr ""
+"Nu este un dosar Claws Mail valid:\n"
+"%s,"
 
 #: src/plugins/archive/archiver_gtk.c:616
 #, c-format
@@ -8910,6 +9037,11 @@ msgid ""
 "\n"
 "Continue anyway?"
 msgstr ""
+"Adăugarea de fișiere în dosar a eșuat\n"
+"Fișiere în dosar: %d\n"
+"Fișiere în listă: %d\n"
+"\n"
+"Continuați oricum?"
 
 #: src/plugins/archive/archiver_gtk.c:633
 #, c-format
@@ -8917,10 +9049,12 @@ msgid ""
 "Archive creation error:\n"
 "%s"
 msgstr ""
+"Eroare de creare a arhivei:\n"
+"%s"
 
 #: src/plugins/archive/archiver_gtk.c:746
 msgid "Archive result"
-msgstr ""
+msgstr "Rezultat arhivă"
 
 #: src/plugins/archive/archiver_gtk.c:776
 msgid "Values"
@@ -8928,7 +9062,7 @@ msgstr "Valori"
 
 #: src/plugins/archive/archiver_gtk.c:786
 msgid "Archive"
-msgstr ""
+msgstr "Arhivă"
 
 #: src/plugins/archive/archiver_gtk.c:792
 msgid "Archive format"
@@ -8936,11 +9070,11 @@ msgstr "Format de arhivă"
 
 #: src/plugins/archive/archiver_gtk.c:799
 msgid "Compression method"
-msgstr ""
+msgstr "Metodă de compresie"
 
 #: src/plugins/archive/archiver_gtk.c:807
 msgid "Number of files"
-msgstr ""
+msgstr "Număr de fișiere"
 
 #: src/plugins/archive/archiver_gtk.c:815
 msgid "Archive Size"
@@ -8952,7 +9086,7 @@ msgstr "Mărime dosar"
 
 #: src/plugins/archive/archiver_gtk.c:832
 msgid "Compression level"
-msgstr ""
+msgstr "Nivel de compresie"
 
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
@@ -8986,48 +9120,49 @@ msgstr "Șterge fișierele selectate"
 #: src/plugins/archive/archiver_gtk.c:865
 #: src/plugins/archive/archiver_gtk.c:1330
 msgid "Select mails before"
-msgstr ""
+msgstr "Selectați corespondența înainte"
 
 #: src/plugins/archive/archiver_gtk.c:921
 msgid "Select folder to archive"
-msgstr ""
+msgstr "Selectați dosarul de arhivare"
 
 #: src/plugins/archive/archiver_gtk.c:942
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
-msgstr ""
+msgstr "Selectați numele de fișier pentru arhivă"
 
 #: src/plugins/archive/archiver_gtk.c:990
 #, c-format
 msgid "%ld of %ld"
-msgstr ""
+msgstr "%ld din %ld"
 
 #: src/plugins/archive/archiver_gtk.c:1043
 msgid "Create Archive"
-msgstr ""
+msgstr "Creează arhiva"
 
 #: src/plugins/archive/archiver_gtk.c:1058
 msgid "Enter Archiver arguments"
-msgstr ""
+msgstr "Introduceți argumentele de arhivă"
 
 #: src/plugins/archive/archiver_gtk.c:1072
 msgid "Folder to archive"
-msgstr ""
+msgstr "Dosar de arhivare"
 
 #: src/plugins/archive/archiver_gtk.c:1079
 msgid "Folder which is the root of the archive"
-msgstr ""
+msgstr "Dosarul care este rădăcina arhivei"
 
 #: src/plugins/archive/archiver_gtk.c:1084
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
+"Clic pe acest buton pentru a selecta dosarul care să fie rădăcina arhivei"
 
 #: src/plugins/archive/archiver_gtk.c:1090
 msgid "Name for archive"
-msgstr ""
+msgstr "Nume pentru arhivă"
 
 #: src/plugins/archive/archiver_gtk.c:1096
 msgid "Archive location and name"
-msgstr ""
+msgstr "Amplasarea și numele arhivei"
 
 #: src/plugins/archive/archiver_gtk.c:1098
 #: src/plugins/archive/archiver_prefs.c:225
@@ -9037,11 +9172,11 @@ msgstr "_Selectează"
 
 #: src/plugins/archive/archiver_gtk.c:1101
 msgid "Click this button to select a name and location for the archive"
-msgstr ""
+msgstr "Clic acest buton pentru a selecta numele și amplasarea pentru fișier"
 
 #: src/plugins/archive/archiver_gtk.c:1103
 msgid "Choose compression"
-msgstr ""
+msgstr "Alegeți compresia"
 
 #: src/plugins/archive/archiver_gtk.c:1115
 #: src/plugins/archive/archiver_gtk.c:1121
@@ -9056,7 +9191,7 @@ msgstr ""
 #: src/plugins/archive/archiver_gtk.c:1183
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
-msgstr ""
+msgstr "Alegeți această opțiune pentru a folosi compresia %s pentru arhivă"
 
 #: src/plugins/archive/archiver_gtk.c:1232
 msgid "Choose format"
@@ -9068,7 +9203,7 @@ msgstr "Alegeți formatul"
 #: src/plugins/archive/archiver_gtk.c:1262
 #, c-format
 msgid "Choose this to use %s as format for the archive"
-msgstr ""
+msgstr "Alegeți această opțiune pentru a folosi %s ca format pentru arhivă"
 
 #: src/plugins/archive/archiver_gtk.c:1282
 msgid "Miscellaneous options"
@@ -9076,15 +9211,15 @@ msgstr "Opțiuni diverse"
 
 #: src/plugins/archive/archiver_gtk.c:1291
 msgid "_Recursive"
-msgstr ""
+msgstr "_Recursiv"
 
 #: src/plugins/archive/archiver_gtk.c:1295
 msgid "Choose this option to include subfolders in the archive"
-msgstr ""
+msgstr "Alegeți această opțiune pentru a include subdosarele în arhivă"
 
 #: src/plugins/archive/archiver_gtk.c:1297
 msgid "_MD5sum"
-msgstr ""
+msgstr "Sumă de control _MD5"
 
 #: src/plugins/archive/archiver_gtk.c:1301
 msgid ""
@@ -9092,6 +9227,10 @@ msgid ""
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archive"
 msgstr ""
+"Alegeți această opțiune pentru a adăuga suma de control MD5 pentru fiecare "
+"fișier din arhivă.\n"
+"Aveți grijă, totuși, că acest lucru va crește timpul de creare a arhivei\n"
+"în mod dramatic."
 
 #: src/plugins/archive/archiver_gtk.c:1305
 msgid "R_ename"
@@ -9104,12 +9243,19 @@ msgid ""
 "The naming scheme: date_from at to@subject.\n"
 "Names will be truncated to max 96 characters"
 msgstr ""
+"Alegeți această opțiune pentru a folosi nume descriptive pentru fiecare "
+"fișier din arhivă.\n"
+"Schema de denumire: dată_dela at la@subiect.\n"
+"Numele vor fi trunchiate la maximum 96 de caractere."
 
 #: src/plugins/archive/archiver_gtk.c:1317
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
 msgstr ""
+"Alegeți această opțiune pentru a șterge mesajele de corespondență după "
+"arhivare\n"
+"În prezent tratează numai IMAP4, mbox local și POP3"
 
 #: src/plugins/archive/archiver_gtk.c:1321
 msgid "Selection options"
@@ -9120,6 +9266,8 @@ msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
 msgstr ""
+"Selectați e-mailuri înainte de o dată anume\n"
+"Data trebuie să fie conformă cu ISO-8601 [AAAA-LL-ZZ]"
 
 #: src/plugins/archive/archiver_prefs.c:217
 msgid "Default save folder"
@@ -9173,7 +9321,7 @@ msgstr ""
 
 #: src/plugins/archive/archiver_prefs.c:419
 msgid "MD5sum"
-msgstr ""
+msgstr "Sumă de control MD5"
 
 #: src/plugins/archive/archiver_prefs.c:421
 msgid ""
@@ -9394,11 +9542,11 @@ msgstr "Oricare"
 
 #: src/plugins/bogofilter/bogofilter.c:457
 msgid "Bogofilter: fetching bodies..."
-msgstr ""
+msgstr "Bogofilter: aducerea corpurilor..."
 
 #: src/plugins/bogofilter/bogofilter.c:470
 msgid "Bogofilter: filtering messages..."
-msgstr ""
+msgstr "Bogofilter: filtrare mesaje..."
 
 #: src/plugins/bogofilter/bogofilter.c:586
 msgid ""
@@ -9407,6 +9555,10 @@ msgid ""
 "Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter "
 "with a few hundred spam and ham messages."
 msgstr ""
+"Plugin-ul Bogofilter nu a putut filtra un mesaj. Cauza probabilă a erorii "
+"este că nu a învățat din niciun e-mail.\n"
+"Folosiți „/Marchează/Marchează ca spam” și „/Marchează/Marchează ca ham” "
+"pentru a instrui Bogofilter cu câteva sute de mesaje spam și ham."
 
 #: src/plugins/bogofilter/bogofilter.c:593
 #, c-format
@@ -9414,20 +9566,22 @@ msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
 msgstr ""
+"Plugin-ul Bogofilter nu a putut filtra un mesaj. Comanda '%s %s %s' nu a "
+"putut să ruleze."
 
 #: src/plugins/bogofilter/bogofilter.c:740
 msgid "Bogofilter: learning from message..."
-msgstr ""
+msgstr "Bogofilter: învățare din mesaj..."
 
 #: src/plugins/bogofilter/bogofilter.c:753
 #: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
-msgstr ""
+msgstr "Învățarea a eșuat: '%s' s-a întors cu starea %d."
 
 #: src/plugins/bogofilter/bogofilter.c:768
 msgid "Bogofilter: learning from messages..."
-msgstr ""
+msgstr "Bogofilter: învățare din mesaje..."
 
 #: src/plugins/bogofilter/bogofilter.c:856
 #, c-format
@@ -9435,6 +9589,8 @@ msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 "%s"
 msgstr ""
+"Învățarea a eșuat; '%s %s %s' s-a întors cu eroare::\n"
+"%s"
 
 #: src/plugins/bogofilter/bogofilter.c:984
 msgid ""
@@ -9451,6 +9607,18 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
+"Acest plugin poate verifica toate mesajele primite dintr-un cont IMAP, LOCAL "
+"sau POP pentru spam folosind Bogofilter. Veți avea nevoie de Bogofilter "
+"instalat local.\n"
+"\n"
+"Înainte ca Bogofilter să poată recunoaște mesajele spam, trebuie să îl "
+"instruiți marcând câteva sute de mesaje spam și ham prin folosirea „/"
+"Marchează/Marchează c spam” și „/Marchează/Marchează ca ham”.\n"
+"\n"
+"Atunci când un mesaj este identificat ca spam, acesta poate fi șters sau "
+"salvat într-un dosar special desemnat.\n"
+"\n"
+"Opțiunile pot fi găsite în /Configurare/Preferințe/Pluginuri/Bogofilter"
 
 #: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
 #: src/plugins/spamassassin/spamassassin.c:643
@@ -9466,7 +9634,7 @@ msgstr "Învățare de spam"
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
 #: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Process messages on receiving"
-msgstr ""
+msgstr "Procesează mesajele la primire"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
@@ -9478,11 +9646,11 @@ msgstr "Mărime maximă"
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
 #: src/plugins/spamassassin/spamassassin_gtk.c:386
 msgid "Messages larger than this will not be checked"
-msgstr ""
+msgstr "Mesajele mai mare de atât nu vor fi verificate"
 
 #: 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
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr "KiB"
 
@@ -9496,7 +9664,7 @@ msgstr "Salvează spam-ul în..."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:198
 msgid "Only mark as spam"
-msgstr ""
+msgstr "Doar marchează ca spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -9504,12 +9672,14 @@ msgstr ""
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
+"Dosar pentru stocarea spamului identificat. Lăsați gol pentru a folosi "
+"dosarul de gunoi."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
 #: src/plugins/spamassassin/spamassassin_gtk.c:441
 msgid "Click this button to select a folder for storing spam"
-msgstr ""
+msgstr "Clic pe acest buton pentru a selecta dosarul pentru stocarea spamului"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:226
 msgid "When unsure, move to"
@@ -9926,7 +10096,7 @@ msgstr ""
 msgid "Do nothing (remote content is disabled)"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Proxy"
@@ -9973,7 +10143,7 @@ msgstr ""
 #: 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:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Răsfoiește"
@@ -9982,89 +10152,89 @@ msgstr "_Răsfoiește"
 msgid "Select stylesheet"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr "Încarcă imaginile"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr "Activează Java"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
 msgstr "Deschide linkurile cu browser extern"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "A apărut o eroare: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr "Caută pe internet"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr "Deschide în browser"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr "Deschide imaginea"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
 msgstr "Copiază linkul"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
 msgstr "Descarcă linkul"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr "Salvează imaginea ca"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr "Copiază imaginea"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr "Importă fluxul"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10266,7 +10436,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr ""
 
 #: 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:2025
 msgid "Authentication"
 msgstr "Autentificare"
 
@@ -10314,7 +10484,7 @@ msgstr "Integrare GData"
 #: 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"
 
@@ -10417,8 +10587,8 @@ msgid "Cache refresh interval"
 msgstr "Interval de reîmprospătare cache"
 
 #: 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:323 src/prefs_account.c:1697
+#: src/prefs_account.c:1855 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "ore"
 
@@ -10496,48 +10666,48 @@ msgid ""
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:397
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:407
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr ""
 
-#: 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 ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr ""
 
 # preferabil fără ...ă(e)
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "secunde"
 
-#: 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."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:472
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Cache de pictograme"
 
-#: src/plugins/libravatar/libravatar_prefs.c:476
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:480
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Rețea"
 
@@ -10554,15 +10724,15 @@ msgstr ""
 
 #: src/plugins/litehtml_viewer/lh_prefs.c:148
 msgid "Default font"
-msgstr ""
+msgstr "Font implicit"
 
 #: src/plugins/litehtml_viewer/lh_widget.cpp:92
 msgid "Open Link"
-msgstr ""
+msgstr "Deschide linkul"
 
 #: src/plugins/litehtml_viewer/lh_widget.cpp:96
 msgid "Copy Link Location"
-msgstr ""
+msgstr "Copiază locația linkului"
 
 #: src/plugins/litehtml_viewer/plugin.c:50
 msgid "LiteHTML viewer"
@@ -10664,7 +10834,7 @@ msgstr ""
 msgid "sending error on Sieve session: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
 msgid "_Filter"
 msgstr "_Filtrează"
 
@@ -10675,7 +10845,7 @@ msgstr ""
 
 #: src/plugins/managesieve/sieve_editor.c:87
 msgid "Re_vert"
-msgstr "Ren_unțare"
+msgstr "_Restabilește"
 
 #: src/plugins/managesieve/sieve_editor.c:296
 #: src/plugins/managesieve/sieve_editor.c:724
@@ -10685,19 +10855,19 @@ msgstr "Nu se poate obține conținutul scriptului"
 
 #: src/plugins/managesieve/sieve_editor.c:325
 msgid "Reverting..."
-msgstr "Se renunță..."
+msgstr "Se restabilește..."
 
 #: src/plugins/managesieve/sieve_editor.c:334
 msgid "Revert script"
-msgstr "Renunțare la modificări"
+msgstr "Restabilire script"
 
 #: src/plugins/managesieve/sieve_editor.c:335
 msgid "This script has been modified. Revert the unsaved changes?"
-msgstr "Acest script a fost modificat. Renunțați la modificările nesalvate?"
+msgstr "Acest script a fost modificat. Restabiliți modificările nesalvate?"
 
 #: src/plugins/managesieve/sieve_editor.c:336
 msgid "_Revert"
-msgstr "_Renunțare"
+msgstr "_Restabilește"
 
 #: src/plugins/managesieve/sieve_editor.c:353
 msgid "Script saved successfully."
@@ -10721,7 +10891,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Filtru Sieve%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 "Se încarcă..."
 
@@ -10796,7 +10966,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Activează Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr "Informații despre server"
 
@@ -10847,28 +11017,28 @@ msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
-#: src/prefs_account.c:1967
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 msgid "User ID"
 msgstr "ID utilizator"
 
 #: 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/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
 msgid "Password"
 msgstr "Parolă"
 
-#: 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:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr "Metodă de autentificare"
 
-#: 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/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
 msgid "Automatic"
 msgstr "Automat"
@@ -11156,14 +11326,14 @@ msgstr "Setări globale de notificare"
 #: src/plugins/notification/notification_prefs.c:668
 msgid "Set window manager urgency hint when new messages exist"
 msgstr ""
-"Setează sugestia de urgență a gestionarului de ferestre atunci când există "
-"un mesaj nou"
+"Stabilește sugestia de urgență a gestionarului de ferestre atunci când "
+"există un mesaj nou"
 
 #: src/plugins/notification/notification_prefs.c:677
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr ""
-"Setează sugestia de urgență a gestionarului de ferestre atunci când există "
-"un mesaj necitit"
+"Stabilește sugestia de urgență a gestionarului de ferestre atunci când "
+"există un mesaj necitit"
 
 #: src/plugins/notification/notification_prefs.c:687
 msgid "Use sound theme"
@@ -11493,95 +11663,97 @@ msgstr "Format:"
 msgid "Optimized:"
 msgstr "Optimizat:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "Proprietăți PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "Introduceți parola"
 
-#: 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 ""
+"Acest document este blocat și necesită o parolă înainte de a putea fi "
+"deschis."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1387
 #, c-format
 msgid "%s Document"
-msgstr ""
+msgstr "Documentul %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
-msgstr ""
+msgstr "din %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 "Randarea PDF a eșuat dintr-un motiv necunoscut."
 
-#: 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 "Index document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "Prima pagină"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr "Pagina precedentă"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "Pagina următoare"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "Ultima pagină"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "Mărește"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "Micșorează"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "Potrivește la pagină"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "Potrivește la lățimea paginii"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "Rotește spre stânga"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "Rotește spre dreapta"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "Tipărește documentul"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "Informații despre document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "Numărul paginii"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "Factor de 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 "
@@ -11594,13 +11766,13 @@ msgstr ""
 "\n"
 "Orice feedback este bine-venit: 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 "Vizualizator PDF"
 
-#: 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 "
@@ -11618,7 +11790,7 @@ msgstr ""
 
 #: src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "Editare per regulă de filtrare (ext)..."
 
 #: src/plugins/pgpcore/autocompletion.c:133
 msgid "Failed to register PGP address autocompletion hook"
@@ -11652,19 +11824,30 @@ msgstr "Introduceți fraza-parolă pentru:"
 msgid "Bad passphrase.\n"
 msgstr "Frază-parolă greșită.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Import de cheie"
 
-#: 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 and import it?"
 msgstr ""
-"Această cheie nu se află pe inelul dumneavoastră de chei. Vreți ca Claws "
-"Mail să încerce să o importe de pe un server de chei?"
+"Această cheie nu se află în inelul dumneavoastră de chei. Vreți ca Claws "
+"mail să încerce să o importe?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "_No"
+msgstr "_Nu"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "de la serverul de chei"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr "de la 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 "
@@ -11672,15 +11855,15 @@ msgstr ""
 "\n"
 "  ID de cheie "
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid "   This key is not in your keyring.\n"
 msgstr "   Această cheie nu se află pe inelul dumneavoastră de chei.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   Ar trebui să fie posibil importul ei "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -11688,17 +11871,17 @@ msgstr ""
 "când se lucrează online,\n"
 "   sau "
 
-#: 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 ""
-"cu următoarea comandă: \n"
+"cu oricare dintre comenzile următoare:\n"
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -11706,30 +11889,28 @@ msgstr ""
 "\n"
 "  Import al ID-ului de cheie "
 
-#: 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 "   Această cheie a fost importată pe inelul dumneavoastră de chei.\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 ""
 "   Această cheie nu a putut fi importată pe inelul dumneavoastră de chei.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Serverele de chei sunt uneori lente.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Puteți încerca să o importați manual cu comanda:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
+msgstr "   Puteți încerca să o importați manual cu comanda:"
+
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr "sau"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   Această cheie se află pe inelul dumneavoastră de chei.\n"
 
@@ -11790,8 +11971,8 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Stabilirea valorii „0” va memora fraza-prolă pentru întreaga sesiune"
 
 #: 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:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minute"
 
@@ -12062,7 +12243,7 @@ msgstr ""
 
 #: src/plugins/pgpcore/sgpgme.c:413
 msgid "No key!"
-msgstr ""
+msgstr "Nicio cheie!"
 
 #: src/plugins/pgpcore/sgpgme.c:415
 msgid "Primary key fingerprint:"
@@ -12260,7 +12441,7 @@ msgstr "Nu s-a putut crea fișierul temporar, %s"
 #: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
 #, c-format
 msgid "Data signing failed, %s"
-msgstr ""
+msgstr "Semnarea datelor a eșuat, %s"
 
 #: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
 #, c-format
@@ -12405,8 +12586,8 @@ msgstr "Arată consola Python..."
 msgid "Refresh"
 msgstr "Reîmprospătează"
 
-#: 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/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
 msgid "Browse"
 msgstr "Răsfoiește"
@@ -12691,7 +12872,7 @@ msgstr ""
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1585 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
+#: src/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "zile"
 
@@ -13334,45 +13515,45 @@ msgstr "Acceptă provizoriu"
 msgid "Decline"
 msgstr "Refuză"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr "Aveți un element de tip „De făcut”."
 
-#: 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:718
 msgid "Details follow:"
 msgstr "Acestea sunt detaliile:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "Ați creat o întâlnire."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr "Ați fost invitat la o întâlnire."
 
-#: 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 "O întâlnire la care ați fost invitat a fost anulată."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr "Vi s-a înaintat o întâlnire."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Ați primit un răspuns la o propunere de întâlnire necunoscută."
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13381,36 +13562,36 @@ msgstr ""
 "Ați primit un răspuns la o propunere de întâlnire.\n"
 "%s a %s invitația ale cărei detalii sunt următoarele:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr "Eroare - nu s-a putut obține partea MIME de calendar."
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr "Eroare - nu s-a găsit nicio parte de calendar."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr "Eroare - tip necunoscut de componentă de calendar."
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
 msgstr "Trimite o notificare participanților"
 
 # titlu pe bară și titlu de fereastră
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr "Anulare întâlnire"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Sigur vreți să anulați această întâlnire?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr "Nu s-a găsit niciun cont"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13418,70 +13599,70 @@ msgstr ""
 "Nu aveți niciun cont care să se potrivească cu vreun participant.\n"
 "Vreți să răspundeți oricum?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr "Răspunde oricum"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr "Răspunde"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr "Editare întâlnire..."
 
 # hm ? ori Editează întâlnirea... / Anulează întâlnirea... ori Editare etc. / Anulare etc.
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr "Anulare întâlnire..."
 
 # hm ? parcă pornește sună aiurea
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr "Deschide site-ul web"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr "Sunteți deja ocupat la această oră."
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Eveniment:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Locație:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Rezumat:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr "Începe:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr "Se încheie:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Participanți:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr "Acțiune:"
 
@@ -14102,95 +14283,95 @@ msgstr "Eroare de sintaxă în marca de timp a salutului serverului\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr ""
 
-#: src/pop.c:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "Eroare de protocol POP\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "răspunsul UIDL nu este valid: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Se șterge mesajul expirat %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Se omite mesajul %d [%s] (%d baiți)\n"
 
-#: src/pop.c:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "căsuța poștală este blocată\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "Timpul sesiunii a expirat\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "comandă nesuportată\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "a apărut o eroare la sesiunea POP\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "Comanda TOP nu este suportată\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr "Știri (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Fișier mbox local"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr "Nimic (numai SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr "Numele contului"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
-msgstr "Setează ca implicit"
+msgstr "Stabilește ca implicit"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr "Informații personale"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr "Nume complet"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
 msgstr "Adresă de e-mail"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Configurează automat"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
-msgstr "Anulare"
+msgstr "Anulează"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14198,77 +14379,81 @@ msgstr ""
 "Avertisment: această versiune Claws Mail\n"
 "a fost construită fără suport pentru IMAP și Știri."
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr "Acest server necesită autentificare"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr "Autentificare la conectare"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr "Server de știri"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr "Server pentru primire"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr "Căsuță poștală locală"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr "Server SMTP (trimitere)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr "Folosește mai degrabă comanda de corespondență decât serverul SMTP"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr "comandă pentru trimiterea corespondenței"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr "Cont%d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr "Inbox implicit"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Mesajele nefiltrate vor fi stocate în acest dosar"
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
-msgstr "Folosește autentificarea securizată (APOP)"
+#: src/prefs_account.c:1634
+msgid "Authenticate before POP connection"
+msgstr ""
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1658 src/prefs_account.c:2259
+msgid "Select"
+msgstr ""
+
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr "Șterge mesajele de pe server la primire"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr "Șterge după"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 zile și 0 ore: șterge imediat"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr "Limită de mărime pentru primire"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14276,94 +14461,94 @@ msgstr ""
 "Mesajele peste această limită vor fi preluate parțial. La selectarea lor le "
 "veți putea descărca în întregime sau le puteți șterge."
 
-#: src/prefs_account.c:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr "Număr maxim de articole pentru descărcare"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr "nelimitat dacă este specificat 0"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr "Text simplu"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr "Director server IMAP"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr "(de obicei gol)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
 msgstr "Arată numai dosarele abonate"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1831
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mod de bandă eficientă (previne preluarea etichetelor la distanță)"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1833
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Acest mod utilizează mai puțină bandă, dar poate fi lent pe anumite servere."
 
-#: src/prefs_account.c:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Verificare automată"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr "Folosește setările globale"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Verifică pentru eventuale mesaje noi la fiecare"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr "Filtrează mesajele la primire"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permite filtrarea folosind plugin-uri la recepție"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1908
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "Include și acest cont la comanda „Verifică tot”"
 
-#: src/prefs_account.c:1894 src/prefs_customheader.c:210
+#: 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
 msgid "Header"
 msgstr "Antet"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr "Generează câmpul „Message-ID”"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
 msgstr "Trimite adresa de e-mail a contului în ID-ul mesajului"
 
 # hm ?
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr "Adaugă un antet de tip „user agent”"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr "Adaugă un antet definit de utilizator"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificare SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14371,51 +14556,95 @@ msgstr ""
 "Dacă lăsați necompletate aceste intrări, se va utiliza același nume de "
 "utilizator și aceeași parolă ca pentru primire."
 
-#: src/prefs_account.c:2033
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr "Autentifică cu POP înainte de a trimite"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr "Timpul pentru autentificarea POP a expirat"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2233
+msgid "Authorization"
+msgstr ""
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr ""
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr ""
+
+#: src/prefs_account.c:2296
+msgid "Client secret"
+msgstr ""
+
+#: src/prefs_account.c:2328
+msgid "Obtain authorization code"
+msgstr ""
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr ""
+
+#: src/prefs_account.c:2338
+msgid "Copy link"
+msgstr ""
+
+#: src/prefs_account.c:2350
+msgid "Authorization code"
+msgstr ""
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr ""
+
+#: src/prefs_account.c:2364
+msgid "Complete authorization"
+msgstr ""
+
+#: src/prefs_account.c:2368
+msgid "Authorize"
+msgstr ""
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr "Semnătură"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
 msgstr "Inserează semnătura automat"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr "Separator de semnătură"
 
 # hm ?
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr "Rezultat de comandă"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
 msgstr "Setare automată a următoarelor câmpuri de adrese"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr "Dicționare de verificare ortografică"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Dicționar implicit"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Dicționar alternativ implicit"
 
 # apare ca tab în preferințe la compunere / scriere
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
@@ -14423,124 +14652,124 @@ msgid "Compose"
 msgstr "Compunere"
 
 # apare și pe bara de unelte și ca tab în preferințe la compunere / scriere
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Răspunde"
 
 # apare și pe bara de unelte și ca tab în preferințe la compunere / scriere
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: 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
 msgid "Forward"
 msgstr "Înaintează"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr "Sistem de confidențialitate implicit"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Semnează mesajele întotdeauna"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Criptează mesajele întotdeauna"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2792
 msgid "Always sign messages when replying to a signed message"
 msgstr "Semnează mesajele întotdeauna când se răspunde la un mesaj semnat"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2795
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Criptează mesajele întotdeauna când se răspunde la un mesaj criptat"
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2798
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Criptează mesajele cu cheia personală în plus față de cea a destiatarului"
 
-#: src/prefs_account.c:2481
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvează sub formă de text clar mesajele criptate trimise"
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
 msgid "Don't use SSL/TLS"
 msgstr "Nu folosi SSL/TLS"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: 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 "Folosește SSL/TLS"
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Folosește comanda STARTTLS pentru a porni sesiunea criptată"
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr "Trimitere (SMTP)"
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:3004
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Nu folosi SSL/TLS (dar, dacă este necesar, folosește STARTTLS)"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr "Certificate de client"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr "Certificat pentru primire"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Fișier de certificat client ca fișier PKCS12 sau PEM"
 
-#: src/prefs_account.c:2732
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr "Certificat pentru trimitere"
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Acceptă automat certificatele SSL/TLS valide"
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr "Folosește SSL/TLS non-blocking"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3106
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Deselectați această opțiune dacă aveți probleme cu conexiunea SSL/TLS"
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
-msgstr "Folosește server de proxy"
+msgstr "Folosește un server de proxy"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3207
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Folosește setările implicite"
 
-#: src/prefs_account.c:2890
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
-msgstr "Folosește setările de proxy globale"
+msgstr "Folosește setările de server proxy globale"
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Folosește autentificare"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Nume de utilizator"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
-msgstr "Folosește un server Proxy pentru trimitere"
+msgstr "Folosește un server proxy pentru trimitere"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14549,175 +14778,179 @@ msgstr ""
 "directă la serverul de ieșire configurat, ocolind orice server proxy "
 "configurat."
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr "Port POP"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr "Port IMAP"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr "Nume de domeniu"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr ""
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr ""
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3451
 msgid "Mark cross-posted messages as read and color:"
 msgstr ""
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr "Pune mesajele trimise în"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr "Pune mesajele de la coadă în"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr "Pune ciornele în"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr "Pune mesajele șterse în"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr "Nu a fost introdus numele contului."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
 msgstr "Nu a fost introdusă adresa de e-mail."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr "Nu a fost introdus serverul SMTP."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr "Nu a fost introdus numele utilizator."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr "Nu a fost introdus serverul POP."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr "Dosarul Inbox implicit nu există."
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr "Nu a fost introdus serverul IMAP."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr "Nu a fost introdus serverul NNTP."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3626
 msgid "local mailbox filename is not entered."
 msgstr "numele de fișier al căsuței poștale locale nu a fost introdus."
 
 # hm ?
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
 msgstr "comanda de mail nu a fost introdusă."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3642
 msgid "User ID cannot contain a newline character."
 msgstr "ID-ul de utilizator nu poate conține cu caracter de linie nouă."
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3647
 msgid "Password cannot contain a newline character."
 msgstr "Parola nu poate conține cu caracter de linie nouă."
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3678
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "ID-ul SMTP nu poate conține un caracter de linie nouă."
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3683
 msgid "SMTP password cannot contain a newline character."
 msgstr "Parola SMTP nu poate conține un caracter de linie nouă."
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr "domeniul nu este specificat."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr "dosarul pentru trimise nu este selectat."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr "dosarul pentru coadă nu este selectat."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr "dosarul pentru ciorne nu este selectat."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "dosarul pentru gunoi nu este selectat."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr "Primire"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+msgid "OAuth2"
+msgstr ""
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Șabloane"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr "Confidențialitate"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr "Avansat"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr "Preferințe pentru contul nou"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferințe cont"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "A eșuat (adresă greșită)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr "Selectați fișierul de semnătură"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Selectați fișierul de certificat"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin-ul nu este încărcat)"
@@ -14987,7 +15220,7 @@ msgstr ""
 "t{Către: %t\\n}?c{Cc: %c\\n}?n{Grupuri de știri: %n\\n}?s{Subiect: %s\\n}\\n"
 "\\n%M"
 
-#: src/prefs_common.c:456
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15215,8 +15448,8 @@ msgstr ""
 "mesajului printr-un script atunci când se folosește elementul de meniu "
 "contextual „Afișează ca text”"
 
-#: 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:180
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Vizualizare mesaj"
 
@@ -15293,7 +15526,7 @@ msgstr "Schimbă scorul"
 
 #: src/prefs_filtering_action.c:189
 msgid "Set score"
-msgstr "Setează scorul"
+msgstr "Stabilește scorul"
 
 #: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
 #: src/prefs_filtering_action.c:192 src/prefs_matcher.c:644
@@ -15650,8 +15883,8 @@ msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
-"„Implicit” va respecta preferințele globale (aflate în /Preferințe/"
-"Vizualizare mesaj/Opțiuni de text)"
+"„Implicit” va urma preferințele globale (aflate în /Preferințe/Vizualizare "
+"mesaj/Opțiuni de text)"
 
 #: src/prefs_folder_item.c:540
 msgid "Synchronise for offline use"
@@ -15763,27 +15996,43 @@ msgstr "Fonturi"
 msgid "Preferences"
 msgstr "Preferințe"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Afișează automat imaginile atașate"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr "Redimensionează în mod implicit imaginile atașate"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
 msgstr "Clicul asupra imaginii comută scalarea"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:96
+msgid "Fit image"
+msgstr "Potrivește imaginea"
+
+#: src/prefs_image_viewer.c:99
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "Clic-dreapta peste imagine comută potrivirea pe înălțime/lățime"
+
+#: src/prefs_image_viewer.c:102
+msgid "Height"
+msgstr "Înălțime"
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr "Lățime"
+
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr "Afișează imaginile intercalat"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr "Tipărește imaginile"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr "Vizualizator de imagini"
 
@@ -15976,11 +16225,11 @@ msgid "whole message"
 msgstr "întregul mesaj"
 
 # comun și când search și în dropdown-ul din fereastra principală
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr "Marcat"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr "Șters"
 
@@ -15988,11 +16237,11 @@ msgstr "Șters"
 msgid "Replied"
 msgstr "Răspuns"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr "Înaintat"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Spam"
@@ -16001,7 +16250,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Are fișier atașat"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr "Semnat"
 
@@ -16277,83 +16526,91 @@ msgstr ""
 msgid "Current condition rules"
 msgstr "Reguli curente de condiții"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Anteturi"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "Afișează panoul de antet deasupra ferestrei de vizualizare a mesajului"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr "Afișează antetul (X-)Face în vizualizarea mesajului"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr ""
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr "Afișează antetul Face în vizualizarea mesajului"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr ""
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "Afișează anteturile în vizualizarea mesajului"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "Mesaje HTML"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "Randează ca text mesajele HTML"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Randează mesajele doar-HTML cu plugin dacă este posibil"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Selectează partea HTML a mesajelor multipart/alternative"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Spațiere linii"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "pixeli"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Derulare"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Jumătate de pagină"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Derulare lină"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Pas"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Arată descrierile fișierelor atașate (mei degrabă decât numele)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Citare"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Restrânge textul citat la dublu-clic"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Tratează aceste caractere ca semne de citare"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Opțiuni de text"
 
@@ -16534,7 +16791,7 @@ msgstr "Alegeți culoarea pentru 'color %d'"
 #: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:434
 #, c-format
 msgid "Set label for 'color %d'"
-msgstr "Setează culoarea pentru 'color %d'"
+msgstr "Stabilește culoarea pentru 'color %d'"
 
 # hm ? sau fără textul ?
 #: src/prefs_msg_colors.c:529
@@ -17016,8 +17273,8 @@ msgstr ""
 "Specifică câmpul de antet „Content-Transfer-Encoding” folosit atunci când "
 "corpul mesajului conține caractere non-ASCII"
 
-#: 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:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "Trimitere"
 
@@ -17197,7 +17454,7 @@ msgstr ""
 
 #: src/prefs_summaries.c:479
 msgid "Name and Address"
-msgstr ""
+msgstr "Nume și adresă"
 
 #: src/prefs_summaries.c:505
 msgid "Date format help"
@@ -17205,7 +17462,7 @@ msgstr "Ajutor pentru formatul datei"
 
 #: src/prefs_summaries.c:511
 msgid "Set message selection when entering a folder"
-msgstr "Setează selecția mesajului la accesarea unui dosar"
+msgstr "Stabilește selecția mesajului la accesarea unui dosar"
 
 #: src/prefs_summaries.c:520
 msgid "Open message when selected"
@@ -17820,7 +18077,7 @@ msgstr "Nu a fost definită nicio cheie de destinatar."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Eroare la decodarea BASE64]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr "Nu s-a putut decoda partea"
 
@@ -18139,89 +18396,89 @@ msgstr "Introduceți textul de înlocuit „%s”"
 msgid "Enter variable"
 msgstr "Introduceți variabila"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Trimitere mesaj utilizând comanda: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nu s-a putut executa comanda: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "A apărut o eroare în timpul executării comenzii: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "Conectare"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "Se execută POP înaintea SMTP..."
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "POP înaintea SMTP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Contul „%s”: Se conectează la serverul SMTP: %s:%d..."
 
-#: src/send_message.c:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "Mesajele au fost trimise cu succes."
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "Se trimite HELO..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "Autentificare"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "Se trimite mesajul..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "Se trimite EHLO..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "Se trimite MAIL FROM..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "Se trimite RCPT TO..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "Trimitere DATA..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "Se părăsește..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Trimitere mesaj (%d / %d baiți)"
 
 # hm ? asta este o înștiințare sau o comandă ?
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "Trimitere mesaj"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "A apărut o eroare în timpul trimiterii mesajului."
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18315,7 +18572,7 @@ msgstr "Creează o regulă de f_iltrare"
 
 #: src/summaryview.c:456
 msgid "_Set displayed columns"
-msgstr "_Setează coloanele afișate"
+msgstr "_Stabilește coloanele afișate"
 
 #: src/summaryview.c:461
 msgid "_Lock column headers"
@@ -18500,7 +18757,7 @@ msgstr "Se sortează rezumatul..."
 
 #: src/summaryview.c:3265
 msgid "Setting summary from message data..."
-msgstr "Se setează rezumatul din datele mesajului..."
+msgstr "Se stabilește rezumatul din datele mesajului..."
 
 #: src/summaryview.c:3471
 msgid "(No Date)"
@@ -18522,11 +18779,11 @@ msgstr "De la: %s, în %s"
 msgid "To: %s, on %s"
 msgstr "Către: %s, în %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr "Nu sunteți autorul articolului."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4574
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -18534,29 +18791,29 @@ msgstr[0] "Chiar vreți să ștergeți mesajul selectat?"
 msgstr[1] "Chiar vreți să ștergeți cele %d mesajele selectate?"
 msgstr[2] "Chiar vreți să ștergeți cele %d de mesajele selectate?"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Șterge mesajul"
 msgstr[1] "Șterge mesajele"
 msgstr[2] "Șterge mesajele"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr "Destinația este aceeași cu dosarul curent."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4796
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Selectați dosarul în care să fie mutat mesajul"
 msgstr[1] "Selectați dosarul în care să fie mutate mesajele"
 msgstr[2] "Selectați dosarul în care să fie mutate mesajele"
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr "Destinația pentru copiere este aceeași cu dosarul curent."
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4881
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Selectați dosarul în care să fie copiat mesajul"
@@ -18564,55 +18821,55 @@ msgstr[1] "Selectați dosarul în care să fie copiate mesajele"
 msgstr[2] "Selectați dosarul în care să fie copiate mesajele"
 
 # hm ? titlu ?
-#: src/summaryview.c:5036
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr "Adăugare sau suprascriere"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr "Adăugați sau suprascrieți fișierul existent?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr "_Adaugă"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr "_Suprascrie"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nu s-a putut salva fișierul „%s”."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5090
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 "Sunteți pe cale să tipăriți %d mesaje, unul câte unul. Vreți să continuați?"
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr "Se construiesc firele de discuție..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr "Omite aceste reguli"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5799
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplică aceste reguli indiferent de contul de care aparțin"
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5802
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplică aceste reguli dacă se aplică la contul curent"
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr "Filtrare"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18620,74 +18877,74 @@ msgstr ""
 "Există câteva reguli de filtrare care aparțin unui cont.\n"
 "Alegeți ce să faceți cu aceste reguli:"
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr "Se filtrează..."
 
 # titlu pe bară
-#: src/summaryview.c:5943
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr "Configurare procesare"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6095
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Chiar vreți să resetați eticheta de culoare de la toate mesajele selectate?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6097
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Chiar vreți să aplicați eticheta de culoare la toate mesajele selectate?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Reset color label"
-msgstr "Resetează eticheta de culoare"
+msgstr "Restabilește eticheta de culoare"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Set color label"
-msgstr "Setează eticheta de culoare"
+msgstr "Stabilește eticheta de culoare"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr "Fir de discuție ignorat"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr "Fir de discuție urmărit"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr "S-a răspuns dar a fost și înaintat - clic pentru a vedea răspunsul"
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr "S-a răspuns - clic pentru a vedea răspunsul"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr "De mutat"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr "De copiat"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr "Semnat, are fișier(e) atașat(e)"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr "Criptat, are unul sau mai multe fișiere atașate"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr "Criptat"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr "Are fișier(e) atașat(e)"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18696,11 +18953,11 @@ msgstr ""
 "Eroare în expresia regulată (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8402
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Salt înapoi la lista de dosare (aveți mesaje necitite)"
 
-#: src/summaryview.c:8403
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr "Du-te înapoi la lista de dosare"
 
@@ -19104,7 +19361,7 @@ msgstr "Editează"
 
 #: src/toolbar.c:527
 msgid "Wrap para."
-msgstr "Desparte paragraful"
+msgstr "Desparte paragraful."
 
 #: src/toolbar.c:528
 msgid "Wrap all"
@@ -19523,6 +19780,56 @@ msgstr ""
 "Claws Mail este acum pregătit.\n"
 "Dați clic pe Salvează pentru a porni."
 
+#, c-format
+#~ msgid ""
+#~ "The external editor is still working.\n"
+#~ "Force terminating the process?\n"
+#~ "process group id: %d"
+#~ msgstr ""
+#~ "Editorul extern este încă în funcțiune.\n"
+#~ "Forțați terminarea procesului?\n"
+#~ "ID-ul grupului de proces: %d"
+
+#~ msgid "  --help -h              display this help and exit"
+#~ msgstr ""
+#~ "  --help -h              afișează acest ajutor și ieșire din aplicație"
+
+#~ msgid "  --version -v           output version information and exit"
+#~ msgstr "  --version -v           afișează versiunea și ieșire din aplicație"
+
+#~ msgid ""
+#~ "  --version-full -V      output version and built-in features information "
+#~ "and exit"
+#~ msgstr "  --version              afișează versiunea și ieșire din aplicație"
+
+#~ msgid ""
+#~ "This key is not in your keyring. Do you want Claws Mail to try and import "
+#~ "it from a keyserver?"
+#~ msgstr ""
+#~ "Această cheie nu se află pe inelul dumneavoastră de chei. Vreți ca Claws "
+#~ "Mail să încerce să o importe de pe un server de chei?"
+
+#~ msgid ""
+#~ "with the following command: \n"
+#~ "\n"
+#~ "     "
+#~ msgstr ""
+#~ "cu următoarea comandă: \n"
+#~ "\n"
+#~ "     "
+
+#~ msgid ""
+#~ "   You can try to import it manually with the command:\n"
+#~ "\n"
+#~ "     "
+#~ msgstr ""
+#~ "   Puteți încerca să o importați manual cu comanda:\n"
+#~ "\n"
+#~ "     "
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Folosește autentificarea securizată (APOP)"
+
 #, c-format
 #~ msgid ""
 #~ "The pasted image has been attached as: \n"
diff --git a/po/ru.po b/po/ru.po
index 7e92cec6a..70b6625aa 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,5 +1,5 @@
 # Russian translation of Claws Mail.
-# Copyright © 2003-2020 The Claws Mail team.
+# Copyright © 2003-2021 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
@@ -8,14 +8,14 @@
 # Ruslan N. Balkin <baron at voices.ru>, 2003.
 # Pavlo & Olena Bohmat <bohm at ukr.net>, 2004-2007.
 # Aleksei Miheev <aleksei at miheev.info>, 2008-2009.
-# Mikhail Kurinnoi <viewizard at viewizard.com>, 2015-2020.
+# Mikhail Kurinnoi <viewizard at viewizard.com>, 2015-2021.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.17.4\n"
+"Project-Id-Version: Claws Mail 3.17.8\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2020-09-13 17:40+0100\n"
-"PO-Revision-Date: 2020-09-20 15:50+0300\n"
+"POT-Creation-Date: 2021-07-03 09:16+0100\n"
+"PO-Revision-Date: 2021-07-03 15:58+0300\n"
 "Last-Translator: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
 "Language-Team: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
 "Language: ru\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n% "
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 3.0\n"
 "X-Poedit-Basepath: claws\n"
 "X-Poedit-SearchPath-0: .\n"
 
@@ -68,48 +68,48 @@ msgstr "Учётные записи с внешними папками не мо
 msgid "Copy of %s"
 msgstr "Копировать %s"
 
-#: src/account.c:1125
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Вы действительно хотите удалить учётную запись '%s'?"
 
-#: src/account.c:1127
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr "(Безымянный)"
 
-#: src/account.c:1128
+#: src/account.c:1129
 msgid "Delete account"
 msgstr "Удалить учётную запись"
 
-#: src/account.c:1602
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1608
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Получить Почту' проверяет письма в указанных учётных записях"
 
-#: 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/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
 #: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: 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
 msgid "Name"
 msgstr "Имя"
 
-#: src/account.c:1623 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr "Протокол"
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Сервер"
 
@@ -160,7 +160,8 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5277 src/compose.c:5282 src/ldaputil.c:333
+#: 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/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -428,12 +429,12 @@ msgid "_Book"
 msgstr "_Книга"
 
 #: 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/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Правка"
 
-#: src/addressbook.c:407 src/compose.c:619 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Сервис"
@@ -466,14 +467,14 @@ msgstr "_Правка книги"
 msgid "_Delete book"
 msgstr "_Удалить книгу"
 
-#: src/addressbook.c:426 src/compose.c:631
+#: src/addressbook.c:426 src/compose.c:632
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: src/addressbook.c:427 src/compose.c:635 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
@@ -488,13 +489,13 @@ msgid "C_ut"
 msgstr "В_ырезать"
 
 #: 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/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Копировать"
 
 #: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Вставить"
 
@@ -816,7 +817,7 @@ msgid "Person"
 msgstr "Контакт"
 
 #: 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/folderview.c:449 src/prefs_account.c:3468 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Папка"
 
@@ -940,18 +941,18 @@ msgstr "Обновить адрес(а)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Ошибка обновления. Изменения не записаны в Каталог."
 
-#: src/alertpanel.c:144 src/compose.c:9810
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr "Уведомление"
 
-#: 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/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:5091
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5808 src/inc.c:726
+#: 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
 msgid "Error"
 msgstr "Ошибка"
@@ -1067,36 +1068,36 @@ 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:1238
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "Ошибка SSL/TLS соединения\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "Не найдено подходящего метода SMTP аутентификации\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Выбранный метод SMTP аутентификации недоступен\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "неверный ответ SMTP\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "ошибка во время SMTP сессии\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "возникла ошибка при аутентификации\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Сообщение слишком большое (Макс. размер %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "не удалось начать STARTTLS сессию\n"
 
@@ -1233,217 +1234,217 @@ msgstr "%d.%02dМБ"
 msgid "%.2fGB"
 msgstr "%.2fГБ"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Понедельник"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Среда"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Четверг"
 
-#: src/common/utils.c:4056
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Пятница"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Суббота"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Январь"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Февраль"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Март"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Апрель"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Май"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Июнь"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Июль"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Август"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Сентябрь"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Октябрь"
 
-#: src/common/utils.c:4069
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Ноябрь"
 
-#: src/common/utils.c:4070
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Декабрь"
 
-#: src/common/utils.c:4072
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Вс"
 
-#: src/common/utils.c:4073
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Пн"
 
-#: src/common/utils.c:4074
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Вт"
 
-#: src/common/utils.c:4075
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Ср"
 
-#: src/common/utils.c:4076
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Чт"
 
-#: src/common/utils.c:4077
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Пт"
 
-#: src/common/utils.c:4078
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Сб"
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Янв"
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Фев"
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Мар"
 
-#: src/common/utils.c:4083
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Апр"
 
-#: src/common/utils.c:4084
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Май"
 
-#: src/common/utils.c:4085
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Июн"
 
-#: src/common/utils.c:4086
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Июл"
 
-#: src/common/utils.c:4087
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Авг"
 
-#: src/common/utils.c:4088
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Сен"
 
-#: src/common/utils.c:4089
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Окт"
 
-#: src/common/utils.c:4090
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Ноя"
 
-#: src/common/utils.c:4091
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Дек"
 
-#: src/common/utils.c:4102
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "ДП"
 
-#: src/common/utils.c:4103
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ПП"
 
-#: src/common/utils.c:4104
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "дп"
 
-#: src/common/utils.c:4105
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "пп"
 
-#: src/compose.c:195
+#: src/compose.c:198
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1455,426 +1456,426 @@ msgstr ""
 "\n"
 "Подпись и шифрования будут отключены для этого сообщения."
 
-#: src/compose.c:603
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Добавить..."
 
-#: src/compose.c:604 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: src/compose.c:606 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Свойства..."
 
-#: src/compose.c:613 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "_Сообщение"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "_Орфография"
 
-#: src/compose.c:618 src/compose.c:685
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Параметры"
 
-#: src/compose.c:620 src/mainwindow.c:528 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
 msgid "_Help"
 msgstr "_Справка"
 
-#: src/compose.c:622
+#: src/compose.c:623
 msgid "S_end"
 msgstr "От_править"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "Отправить _позже"
 
-#: src/compose.c:626
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "_Вложить файл"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "_Вставить файл"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Вставить по_дпись"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "_Заменить подпись"
 
-#: src/compose.c:633
+#: src/compose.c:634
 msgid "_Print"
 msgstr "_Печать"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Отменить"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Повторить"
 
-#: src/compose.c:642 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "В_ырезать"
 
-#: src/compose.c:646
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "_Специальная вставка"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Как _цитату"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "_С переносами"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "_Без переносов"
 
-#: src/compose.c:651 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Выделить _всё"
 
-#: src/compose.c:653
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "Д_ополнительно"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "На символ назад"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "На символ вперёд"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "На слово назад"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "На слово вперёд"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "В начало строки"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "В конец строки"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "На предыдущую строку"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "На следующую строку"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Удалить символ слева"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Удалить символ справа"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Удалить слово слева"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Удалить слово справа"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Удалить строку"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Удалить до конца строки"
 
-#: src/compose.c:670 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Найти"
 
-#: src/compose.c:673
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "_Добавить переносы строк текущего обзаца"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Переносить все длинные _строки"
 
-#: src/compose.c:676
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Правка в_нешним редактором"
 
-#: src/compose.c:679
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "_Проверить всё или выделенное"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "_Подсветка всех неверных слов"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "Проверить _предыдущие слова"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "_К следующему неверному слову"
 
-#: src/compose.c:689
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "Ответить"
 
-#: src/compose.c:691
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "Система _Конфиденциальности"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "_Приоритет"
 
-#: src/compose.c:697 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "Кодировка _символов"
 
-#: src/compose.c:702 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Западно-европейская"
 
-#: src/compose.c:703 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Балтийская"
 
-#: src/compose.c:704 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: src/compose.c:705 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Арабская"
 
-#: src/compose.c:706 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Кириллица"
 
-#: src/compose.c:707 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Японская"
 
-#: src/compose.c:708 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Китайская"
 
-#: src/compose.c:709 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Корейская"
 
-#: src/compose.c:710 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Тайская"
 
-#: src/compose.c:713 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Адресная книга"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "_Template"
 msgstr "_Шаблон"
 
-#: src/compose.c:717 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "Дейст_вия"
 
-#: src/compose.c:721 src/mainwindow.c:825 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
 msgid "_About"
 msgstr "_О Claws Mail"
 
-#: src/compose.c:726
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Авт_оперенос"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Авто_отступ"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "Под_писать"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "_Зашифровать"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "_Запросить Подтверждение Доставки"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "Удал_ить связи"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "Показать _линейку"
 
-#: src/compose.c:737 src/compose.c:747
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Обычный режим"
 
-#: src/compose.c:738 src/mainwindow.c:674 src/messageview.c:305
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
 #: src/summaryview.c:433
 msgid "_All"
 msgstr "_Всем"
 
-#: src/compose.c:739 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_Sender"
 msgstr "_Отправителю"
 
-#: src/compose.c:740
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "_Список рассылки"
 
-#: src/compose.c:745
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "_Высочайший"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "Выс_окий"
 
-#: src/compose.c:748
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "Низ_кий"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "_Самый низкий"
 
-#: src/compose.c:754 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Автоматически"
 
-#: src/compose.c:755 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7бит ASCII (US-ASCII)"
 
-#: src/compose.c:756 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Юникод (_UTF-8)"
 
-#: src/compose.c:760 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Центрально-европейская (ISO-8859-2)"
 
-#: src/compose.c:763 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/compose.c:768 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Турецкая (ISO-8859-9)"
 
-#: src/compose.c:1055
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr "Неверный формат поля \"От:\" нового сообщения."
 
-#: src/compose.c:1148
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr "Ошибка формата темы нового сообщения."
 
-#: src/compose.c:1180 src/quote_fmt.c:563
+#: src/compose.c:1181 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Ошибка в теле шаблона \"Новое сообщение\", строка %d."
 
-#: src/compose.c:1449
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Не удалось ответить. Вероятно, исходное сообщение не существует."
 
-#: src/compose.c:1634 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "Некорректный почтовый адрес в поле \"От\" шаблона \"Ответить\"."
 
-#: src/compose.c:1683 src/quote_fmt.c:583
+#: src/compose.c:1684 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Ошибка в теле шаблона \"Ответить\", строка %d."
 
-#: src/compose.c:1824 src/compose.c:2025 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Некорректный почтовый адрес в поле \"От\" шаблона \"Перенаправить\"."
 
-#: src/compose.c:1885 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Ошибка в теле шаблона \"Переслать\", строка %d."
 
-#: src/compose.c:2068
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
 msgstr "Fw: несколько писем"
 
-#: src/compose.c:2577
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Ошибка в строке %d тела шаблона \"Перенаправить\"."
 
-#: src/compose.c:2648 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/compose.c:2651 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Скрытая копия:"
 
-#: src/compose.c:2654 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Ответить:"
 
-#: src/compose.c:2657 src/compose.c:5026 src/compose.c:5028
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Группы новостей:"
 
-#: src/compose.c:2660 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Дополнение к:"
 
-#: src/compose.c:2663 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "В ответе кому:"
 
-#: src/compose.c:2667 src/compose.c:5023 src/compose.c:5031
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Кому:"
 
-#: src/compose.c:2857
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Не удалось вложить файл (ошибка преобразования кодировки)."
 
-#: src/compose.c:2863
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1892,73 +1893,73 @@ msgstr[2] ""
 "Вложенные файлы:\n"
 "%s"
 
-#: src/compose.c:3143
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Некорректный \"Символ цитаты\" в шаблоне."
 
-#: src/compose.c:3672
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Невозможно определить размер файла '%s'."
 
-#: src/compose.c:3690
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Вы собираетесь вставить файл размером %s в тело сообщения. Продолжать?"
 
-#: src/compose.c:3693
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
-#: src/compose.c:3694 src/compose.c:10859 src/compose.c:11753
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr "_Вставить"
 
-#: src/compose.c:3819
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пуст."
 
-#: src/compose.c:3820
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr "Пустой файл"
 
-#: src/compose.c:3821
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr "_Все равно вложить"
 
-#: src/compose.c:3830
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr "Не удалось прочитать %s."
 
-#: src/compose.c:3857
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:4867 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Изменено]"
 
-#: src/compose.c:4874 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Составить сообщение %s"
 
-#: src/compose.c:4877 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[нет темы] - Составить сообщение%s"
 
-#: src/compose.c:4879 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Составить сообщение"
 
-#: src/compose.c:4906 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1966,59 +1967,59 @@ msgstr ""
 "Учётная запись для отправки почты не указана.\n"
 "Пожалуйста, выберите учётную запись перед отправкой."
 
-#: src/compose.c:5123 src/compose.c:5160
+#: src/compose.c:5126 src/compose.c:5163
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "По умолчанию задан только адрес '%s'. Всё равно отправить?"
 
-#: 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: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
 msgid "Send"
 msgstr "Отправить"
 
-#: 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/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
 msgid "_Send"
 msgstr "_Отправить"
 
-#: src/compose.c:5181
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr "Получатель не указан."
 
-#: src/compose.c:5196
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Тема не указана. %s"
 
-#: src/compose.c:5197 src/compose.c:5240
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Всё равно отправить?"
 
-#: src/compose.c:5198 src/compose.c:5241
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Всё равно поставить в очередь на отправку?"
 
-#: src/compose.c:5200 src/compose.c:5243 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:5201 src/compose.c:5244
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr "_В очередь"
 
-#: src/compose.c:5239
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Отправка %d получателям. %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5271
 msgid "Could not queue message."
 msgstr "Не удалось поставить сообщение в очередь на отправку."
 
-#: src/compose.c:5271
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2029,7 +2030,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5275
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2040,7 +2041,7 @@ msgstr ""
 "\n"
 "Ошибка подписи: %s"
 
-#: src/compose.c:5280
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2051,7 +2052,7 @@ msgstr ""
 "\n"
 "Ошибка шифрования: %s"
 
-#: src/compose.c:5285
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2061,7 +2062,7 @@ msgstr ""
 "\n"
 "Ошибка преобразование кодировки."
 
-#: src/compose.c:5289
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2071,7 +2072,7 @@ msgstr ""
 "\n"
 "Не удалось получить ключ шифрования."
 
-#: src/compose.c:5352 src/compose.c:5412
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2080,7 +2081,7 @@ msgstr ""
 "Используйте кнопку \"Отправить сообщения из очереди\" из меню главного окна "
 "для повторной попытки."
 
-#: src/compose.c:5408
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
@@ -2090,7 +2091,7 @@ msgstr ""
 "Используйте кнопку \"Отправить сообщения из очереди\" из меню главного окна "
 "для повторной попытки."
 
-#: src/compose.c:5805
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2101,7 +2102,7 @@ msgstr ""
 "в определённую %s кодировку.\n"
 "Отправить как %s?"
 
-#: src/compose.c:5867
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2114,68 +2115,68 @@ msgstr ""
 "\n"
 "Всё равно отправить?"
 
-#: src/compose.c:6102
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr "Предупреждение о кодировке"
 
-#: src/compose.c:6103
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr "П_родолжить"
 
-#: src/compose.c:6152
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr "Отсутствует учётная запись для отправки почты!"
 
-#: src/compose.c:6161
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Выбранная учётная запись не NNTP: Отправка невозможна."
 
-#: src/compose.c:6415
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 "Файл %s, который вы вложили в сообщение, больше не существует. Игнорировать?"
 
-#: src/compose.c:6417 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Отменить отправку"
 
-#: src/compose.c:6417
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr "Игнорировать вложение"
 
-#: src/compose.c:6473
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr "Часть первоисточника %s"
 
-#: src/compose.c:7073
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr "Добавить в адресную _книгу"
 
-#: src/compose.c:7240
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr "Удалить содержимое записи"
 
-#: src/compose.c:7244 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Использовать <Tab> для автозавершения из адресной книги"
 
-#: src/compose.c:7476
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr "Mime тип"
 
-#: src/compose.c:7482 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: 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
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:7544
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr "Сохранить Сообщение в "
 
-#: src/compose.c:7575 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
@@ -2186,27 +2187,27 @@ msgstr "Сохранить Сообщение в "
 msgid "_Browse"
 msgstr "_Выбрать"
 
-#: src/compose.c:7591
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr "Выберите папку для сохранения сообщения"
 
-#: src/compose.c:8048
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Загол_овок"
 
-#: src/compose.c:8053
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Вложения"
 
-#: src/compose.c:8067
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "Проч_ее"
 
-#: src/compose.c:8082
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "Т_ема:"
 
-#: src/compose.c:8306
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2215,19 +2216,19 @@ msgstr ""
 "Не удалось запустить проверку орфографии.\n"
 "%s"
 
-#: src/compose.c:8453
+#: src/compose.c:8456
 msgid "_From:"
 msgstr "_От:"
 
-#: src/compose.c:8470
+#: src/compose.c:8473
 msgid "Account to use for this email"
 msgstr "Учётная запись используемая для этого сообщения"
 
-#: src/compose.c:8472
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr "Использовать адрес отправителя"
 
-#: src/compose.c:8654
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2236,73 +2237,98 @@ msgstr ""
 "Не удалось загрузить систему конфиденциальности '%s'. Вы не сможете "
 "подписать или зашифровать сообщение."
 
-#: src/compose.c:8765 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "_Никакой"
 
-#: src/compose.c:8866 src/prefs_template.c:752
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Ошибка в теле шаблона, строка %d."
 
-#: src/compose.c:8963
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Ошибка формата шаблона '%s'."
 
-#: src/compose.c:9387
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:9402
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:9476
+#: src/compose.c:9479
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:9494
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr "MIME тип"
 
-#: src/compose.c:9527
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr "Кодировать"
 
-#: src/compose.c:9547
+#: src/compose.c:9550
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:9548
+#: src/compose.c:9551
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:9807
+#: src/compose.c:9646
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"Не удалось записать тело сообщения в файл:\n"
+"%s"
+
+#: src/compose.c:9704
+#, c-format
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Не удалось вызвать следующую команду:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9743
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr "Внешний редактор остановлен из-за ошибки:%s"
+
+#: src/compose.c:9817
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
 "Внешний редактор всё ещё работает.\n"
 "Завершить процесс принудительно?\n"
-"id группы процесса: %d"
+"id процесса: %d"
 
-#: src/compose.c:10280 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail требуется доступ к сети для отправки письма."
 
-#: src/compose.c:10473
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr "Не удалось сохранить черновик."
 
-#: src/compose.c:10477
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr "Не удалось сохранить черновик"
 
-#: src/compose.c:10478
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2310,24 +2336,24 @@ msgstr ""
 "Не удалось сохранить черновик.\n"
 "Отказаться от написанного сообщения?"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr "_Отменить выход"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr "_Отказаться от письма"
 
-#: src/compose.c:10669 src/compose.c:10683
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:10697
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Файл '%s' не может быть прочитан."
 
-#: src/compose.c:10699
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2336,50 +2362,50 @@ msgstr ""
 "Файл '%s' содержал неверные символы\n"
 "для текущей кодировки, вставка может быть неправильной."
 
-#: src/compose.c:10778
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr "Отказаться от сообщения"
 
-#: src/compose.c:10779
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr "Это сообщение было изменено. Отказаться от него?"
 
-#: src/compose.c:10780 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Отказаться"
 
-#: src/compose.c:10780 src/compose.c:10785
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr "_Сохранить в Черновики"
 
-#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: src/compose.c:10784
+#: src/compose.c:10734
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Это сообщение было изменено. Сохранить изменения?"
 
-#: src/compose.c:10785
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr "_Не сохранять"
 
-#: src/compose.c:10856
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Вы хотите применить шаблон '%s' ?"
 
-#: src/compose.c:10858
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:10859 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
 #: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: src/compose.c:11746
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2397,20 +2423,20 @@ msgstr[2] ""
 "Вы хотите вставить содержимое %d файлов в тело сообщения или вложить "
 "(прикрепить) в письмо?"
 
-#: src/compose.c:11752
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr "Вставить или вложить?"
 
-#: src/compose.c:11753
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr "_Вложить"
 
-#: src/compose.c:11971
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Неверный формат цитирования в строке %d."
 
-#: src/compose.c:12267
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2628,7 +2654,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:2158
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Файл"
@@ -2712,13 +2738,13 @@ msgstr "Добавить Новый Элемент JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Правка LDAP - Выбрать Базу Поиска"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "Имя узла"
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Порт"
@@ -2779,7 +2805,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2943,8 +2969,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:1405 src/prefs_account.c:2003
-#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
+#: 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
 msgid "Show password"
 msgstr "Показать пароль"
@@ -2967,11 +2993,11 @@ msgid ""
 msgstr ""
 "Максимальное число записей, которые должны возвращаться в результат поиска."
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr "Основные"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "Расширенный"
 
@@ -3114,8 +3140,8 @@ msgstr "Таблица стилей"
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
 #: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1040
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
+#: 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
 msgid "None"
 msgstr "Никакой"
 
@@ -3354,7 +3380,7 @@ msgstr "Экспорт Адресной Книги в LDIF Файл"
 msgid "Distinguished Name"
 msgstr "Характерное Имя"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr "Экспорт в mbox файл"
 
@@ -3419,17 +3445,17 @@ msgstr "Имя слишком длинное."
 msgid "Not specified."
 msgstr "Не указано."
 
-#: 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 "Файл %s отсутствует! Желаете использовать файл из резервной копии %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 "Невозможно копировать %s в %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 "
@@ -3539,51 +3565,51 @@ msgstr "действие не может быть применено\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "завершить обработку после действия [ %s ]\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "правило обработки '%s' [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "обработка правила <неназванный> [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "отключить правило '%s' [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "отключить правило <неназванный> [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "неопределённое"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "слияние"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "вручную"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "обработка папки"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "начальная обработка"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "пост-обработка"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3600,11 +3626,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3639,35 +3665,35 @@ msgstr "Черновики"
 msgid "Processing (%s)...\n"
 msgstr "Обработка (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Копирование %s в %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Перенос %s в %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Обновление кэша для %s..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "Обработка сообщений..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Синхронизировать %s для автономного использования...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Имя папки не может начинаться или заканчиваться точкой."
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "Имя папки не может заканчиваться пробелом."
 
@@ -3750,13 +3776,13 @@ msgstr "Установить Отображаемые столбцы"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr "Новые"
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Непрочтённые"
@@ -3775,7 +3801,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Настройка информации папки..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr "Пометить все как прочтённые"
 
@@ -3787,11 +3813,11 @@ msgstr ""
 "Действительно пометить все сообщения данной папки и её подпапок как "
 "прочтённые?"
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:871 src/summaryview.c:4292
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Действительно пометить все сообщения данной папки как прочтённые?"
 
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr "Пометить все как непрочтённые"
 
@@ -3803,16 +3829,16 @@ msgstr ""
 "Действительно пометить все сообщения в данной папке и её подпапках как "
 "непрочтённые?"
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:877 src/summaryview.c:4338
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Действительно пометить все сообщения в данной папке как непрочтённые?"
 
-#: src/folderview.c:1067 src/imap.c:4675
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Сканирование папки %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4679 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Сканирование папки %s..."
@@ -3869,7 +3895,7 @@ msgstr "Удалить все сообщения в корзине?"
 msgid "_Empty trash"
 msgstr "_Очистить корзину"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Автономная работа"
 
@@ -3889,7 +3915,7 @@ msgstr "Отправить все сообщения из очереди?"
 msgid "Some errors occurred while sending queued messages."
 msgstr "Возникли ошибки при отправке сообщений из очереди."
 
-#: src/folderview.c:2557 src/main.c:2891 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3955,7 +3981,7 @@ msgstr "Перенос не удался!"
 msgid "Processing configuration for folder %s"
 msgstr "Параметры обработки для папки %s"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Папка назначения может содержать только другие папки."
 
@@ -4005,7 +4031,7 @@ msgstr "неизвестно"
 msgid "Can't retrieve newsgroup list."
 msgstr "Невозможно получить список групп новостей."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1848 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr "Готово."
 
@@ -4040,11 +4066,11 @@ msgstr ""
 
 #: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Авторские права (C) 1999-2020\n"
+"Авторские права (C) 1999-2021\n"
 "Команда разработчиков Claws Mail\n"
 "и Хироюки Ямамото"
 
@@ -4198,44 +4224,44 @@ msgstr ""
 "Вместе с данной программой вы должны были получить экземпляр GNU General "
 "Public License. Если нет, смотрите "
 
-#: src/gtk/about.c:718 src/main.c:2715
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr "Статистика по сессиям\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2725 src/main.c:2728
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr "Начало: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2734
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr "Входящий трафик\n"
 
-#: src/gtk/about.c:741 src/main.c:2737
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Полученные сообщения: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2743
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr "Исходящий трафик\n"
 
-#: src/gtk/about.c:751 src/main.c:2746
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Новые/переадресованные сообщения: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2750
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Сообщений-ответов: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2754
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Переадресованные сообщения: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2758
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Всего исходящих сообщений: %d\n"
@@ -4445,20 +4471,20 @@ msgstr ""
 "Не удалось сменить альтернативный словарь.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1853
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "Ошибка: не найдена запись службы."
 
-#: src/gtk/gtkutils.c:1856
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "Ошибка: ошибка сети."
 
-#: src/gtk/gtkutils.c:1859
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Ошибка: неизвестная ошибка (%d)."
 
-#: src/gtk/gtkutils.c:1929
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "Настройка..."
 
@@ -4668,11 +4694,11 @@ msgstr "Статус:"
 
 #: src/gtk/headers.h:38
 msgid "Face"
-msgstr "Лицо"
+msgstr "Face"
 
 #: src/gtk/headers.h:38
 msgid "Face:"
-msgstr "Лицо:"
+msgstr "Face:"
 
 #: src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
@@ -4702,7 +4728,7 @@ msgstr "User-Agent:"
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
@@ -4730,7 +4756,7 @@ msgstr "Precedence"
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "Организация"
 
@@ -5053,7 +5079,7 @@ msgstr ""
 #: 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/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
@@ -5112,11 +5138,11 @@ msgid "_Hide"
 msgstr "_Скрыть"
 
 #: 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: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
 msgid "Account"
 msgstr "Учётная запись"
 
@@ -5341,53 +5367,53 @@ msgstr ""
 "отображения их с списке сообщений.\n"
 "Могут использоваться следующие символы:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 "Что-то пошло не так во время поиска. Пожалуйста, проверьте ваши журналы "
 "событий."
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr "От/Кому/Сс/Тема/Тег"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Рекурсивно"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "Прилипающий"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "Опережающий ввод"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "Перейти на выбранное"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "Очистить текущий поиск"
 
-#: 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 "Правка критерия поиска"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr "Информация о дополнительных символах"
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr "_Информация"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr "Р_едактировать"
 
-#: 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:349
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Очистить"
@@ -5563,213 +5589,213 @@ msgstr "(Нет поля 'От')"
 msgid "(No Subject)"
 msgstr "(Нет поля 'Тема')"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr "Ошибка:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Имя файла:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr "Размер файла:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr "Загрузить Изображение"
 
-#: src/imap.c:582
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr "Соединение IMAP прервано\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: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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Ошибка IMAP в %s:"
 
-#: src/imap.c:627
+#: src/imap.c:628
 msgid "authenticated"
 msgstr "аутентифицировано"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "не аутентифицировано"
 
-#: src/imap.c:633
+#: src/imap.c:634
 msgid "bad state"
 msgstr "некорректное состояние"
 
-#: src/imap.c:636
+#: src/imap.c:637
 msgid "stream error"
 msgstr "ошибка потока"
 
-#: src/imap.c:639
+#: src/imap.c:640
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "ошибка анализатора (скорее всего, не соответствующий RFC ответ от сервера)"
 
-#: src/imap.c:643
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "в соединении отказано"
 
-#: src/imap.c:646
+#: src/imap.c:647
 msgid "memory error"
 msgstr "ошибка выделения памяти"
 
-#: src/imap.c:649
+#: src/imap.c:650
 msgid "fatal error"
 msgstr "фатальная ошибка"
 
-#: src/imap.c:652
+#: src/imap.c:653
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 "ошибка протокола (скорее всего, не соответствующий RFC ответ от сервера)"
 
-#: src/imap.c:656
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr "соединение не принято"
 
-#: src/imap.c:659
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr "Ошибка APPEND"
 
-#: src/imap.c:662
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr "Ошибка NOOP"
 
-#: src/imap.c:665
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr "Ошибка LOGOUT"
 
-#: src/imap.c:668
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr "Ошибка CAPABILITY"
 
-#: src/imap.c:671
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr "Ошибка CHECK"
 
-#: src/imap.c:674
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr "Ошибка CLOSE"
 
-#: src/imap.c:677
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr "Ошибка EXPUNGE"
 
-#: src/imap.c:680
+#: src/imap.c:681
 msgid "COPY error"
 msgstr "Ошибка COPY"
 
-#: src/imap.c:683
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr "Ошибка UID COPY"
 
-#: src/imap.c:686
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr "Ошибка CREATE"
 
-#: src/imap.c:689
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr "Ошибка DELETE"
 
-#: src/imap.c:692
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr "Ошибка EXAMINE"
 
-#: src/imap.c:695
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr "Ошибка FETCH"
 
-#: src/imap.c:698
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr "Ошибка UID FETCH"
 
-#: src/imap.c:701
+#: src/imap.c:702
 msgid "LIST error"
 msgstr "Ошибка LIST"
 
-#: src/imap.c:704
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr "Ошибка LOGIN"
 
-#: src/imap.c:707
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr "Ошибка LSUB"
 
-#: src/imap.c:710
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr "Ошибка RENAME"
 
-#: src/imap.c:713
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr "Ошибка SEARCH"
 
-#: src/imap.c:716
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr "Ошибка UID SEARCH"
 
-#: src/imap.c:719
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr "Ошибка SELECT"
 
-#: src/imap.c:722
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr "Ошибка STATUS"
 
-#: src/imap.c:725
+#: src/imap.c:726
 msgid "STORE error"
 msgstr "Ошибка STORE"
 
-#: src/imap.c:728
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr "Ошибка UID STORE"
 
-#: src/imap.c:731
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr "Ошибка SUBSCRIBE"
 
-#: src/imap.c:734
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr "Ошибка UNSUBSCRIBE"
 
-#: src/imap.c:737
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr "Ошибка STARTTLS"
 
-#: src/imap.c:740
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr "Ошибка INVAL"
 
-#: src/imap.c:743
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr "Ошибка EXTENSTION"
 
-#: src/imap.c:746
+#: src/imap.c:747
 msgid "SASL error"
 msgstr "Ошибка SASL"
 
-#: src/imap.c:750
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr "Ошибка SSL/TLS"
 
-#: src/imap.c:754
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Неизвестная ошибка [%d]"
 
-#: src/imap.c:960
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5781,7 +5807,7 @@ msgstr ""
 "CRAM-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен CRAM-MD5 SASL модуль."
 
-#: src/imap.c:966
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5793,7 +5819,7 @@ msgstr ""
 "DIGEST-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен DIGEST-MD5 SASL модуль."
 
-#: src/imap.c:972
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5805,7 +5831,7 @@ msgstr ""
 "SCRAM-SHA-1 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен SCRAM SASL модуль."
 
-#: src/imap.c:978
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5817,7 +5843,7 @@ msgstr ""
 "PLAIN логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен PLAIN SASL модуль."
 
-#: src/imap.c:984
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5829,36 +5855,36 @@ msgstr ""
 "LOGIN логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен LOGIN SASL модуль."
 
-#: src/imap.c:991
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Соединение с %s прошло неудачно: логин отвергнут. %s"
 
-#: src/imap.c:995
+#: src/imap.c:1003
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Соединение с %s прошло неудачно: логин отвергнут. %s\n"
 
-#: src/imap.c:1013
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Соединение с %s прошло неудачно"
 
-#: src/imap.c:1020 src/imap.c:1023
+#: src/imap.c:1028 src/imap.c:1031
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP соединение с %s было разорвано. Повторное подключение...\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:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail необходимо сетевое подключение для доступа к серверу IMAP."
 
-#: src/imap.c:1163 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Незащищенное подключение"
 
-#: src/imap.c:1164 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5871,108 +5897,108 @@ msgstr ""
 "\n"
 "Продолжить подключение к серверу? Передаваемые данные не будут зашифрованы."
 
-#: src/imap.c:1170 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "Прод_олжить подключение"
 
-#: src/imap.c:1179
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Учётная запись '%s': Подключение к IMAP серверу: %s:%d..."
 
-#: src/imap.c:1244
+#: src/imap.c:1252
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Не удалось подключиться к IMAP серверу: %s:%d"
 
-#: src/imap.c:1247
+#: src/imap.c:1255
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Не удалось подключиться к IMAP серверу: %s:%d\n"
 
-#: src/imap.c:1279 src/imap.c:4146
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "Не удалось начать STARTTLS сессию.\n"
 
-#: src/imap.c:1348
+#: src/imap.c:1359
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Не удалось подключиться к серверу IMAP %s.\n"
 
-#: src/imap.c:1351
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Не удалось подключиться к серверу IMAP %s."
 
-#: src/imap.c:1779
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "Добавление сообщения..."
 
-#: src/imap.c:1984 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Копирование сообщения..."
 
-#: src/imap.c:2510
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr "Поиск прерван из-за ошибки сервера."
 
-#: src/imap.c:2594
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "невозможно установить флаг удаления\n"
 
-#: src/imap.c:2601 src/imap.c:5097
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "невозможно стереть\n"
 
-#: src/imap.c:2976
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Поиск подписанных папок в %s..."
 
-#: src/imap.c:2979
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ищутся подпапки %s..."
 
-#: src/imap.c:3267
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не удалось создать почтовый ящик: LIST завершился с ошибкой\n"
 
-#: src/imap.c:3280
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "не удалось создать почтовый ящик\n"
 
-#: src/imap.c:3411
+#: src/imap.c:3422
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не удалось переименовать почтовый ящик: %s в %s\n"
 
-#: src/imap.c:3524
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "не удалось удалить почтовый ящик\n"
 
-#: src/imap.c:3803
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "LIST завершился с ошибкой\n"
 
-#: src/imap.c:3888
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr "Помечаются сообщения..."
 
-#: src/imap.c:3991
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: src/imap.c:4143
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Сервер требует STARTTLS для входа.\n"
 
-#: src/imap.c:4153
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr "Не удалось обновить.\n"
 
-#: src/imap.c:4158
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5981,20 +6007,20 @@ msgstr ""
 "Не удалось соединиться с %s: сервер требует STARTTLS, но Claws Mail собран "
 "без поддержки STARTTLS.\n"
 
-#: src/imap.c:4166
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr "Сбой входа на сервер.\n"
 
-#: src/imap.c:4389
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "Получение сообщения..."
 
-#: src/imap.c:5090
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "невозможно установить флаг удаления: %d\n"
 
-#: src/imap.c:6125
+#: src/imap.c:6136
 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"
@@ -6386,32 +6412,32 @@ msgstr "Выбрать Pine Файл"
 msgid "Import Pine file into Address Book"
 msgstr "Импорт Pine файла в адресную книгу"
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail нужно сетевое подключение для получения писем."
 
-#: src/inc.c:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "Не удалось выполнить %s\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "Получение новых сообщений"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6419,28 +6445,28 @@ msgstr[0] "Завершено (%d сообщение (%s) получено)"
 msgstr[1] "Завершено (%d сообщения (%s) получено)"
 msgstr[2] "Завершено (%d сообщений (%s) получено)"
 
-#: src/inc.c:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Сбой подключения"
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Ошибка аутентификации"
 
-#: 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: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
 msgid "Locked"
 msgstr "Заблокирован"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:397
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr "Время ожидания"
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6448,66 +6474,66 @@ msgstr[0] "Завершено (%d новое сообщение)"
 msgstr[1] "Завершено (%d новых сообщения)"
 msgstr[2] "Завершено (%d новых сообщений)"
 
-#: src/inc.c:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Учётная запись '%s': Соединение с POP3 сервером: %s:%d..."
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Не удалось соединиться с POP3 сервером: %s:%d"
 
-#: src/inc.c:927
+#: src/inc.c:932
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с POP3 сервером: %s:%d\n"
 
-#: src/inc.c:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Получение сообщений с %s (%s)..."
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6515,16 +6541,16 @@ msgstr[0] "Получение (%d сообщение (%s) получено)"
 msgstr[1] "Получение (%d сообщения (%s) получено)"
 msgstr[2] "Получение (%d сообщений (%s) получено)"
 
-#: src/inc.c:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Соединение с %s:%d прошло неудачно."
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "Ошибка при обработки почты."
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6533,37 +6559,37 @@ msgstr ""
 "Ошибка при обработки почты:\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "Недостаточно места на диске."
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "Не удалось записать в файл."
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Ошибка сокета при соединении с %s:%d."
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "Соединение прервано удалённым узлом."
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Соединение с %s:%d прервано удалённым узлом."
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик заблокирован."
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6572,11 +6598,11 @@ msgstr ""
 "Почтовый ящик заблокирован:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6585,7 +6611,7 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6593,48 +6619,48 @@ msgstr ""
 "Превышено время ожидания. Вы можете попробовать исправить эту проблему, "
 "увеличив время ожидания в /Настройки/Параметры/Другие/Разное."
 
-#: src/inc.c:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Соединение с %s:%d прошло неудачно."
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr "Слияние отменено\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1766
+#: 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
 msgid "seconds"
 msgstr "секунд"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минуты"
 msgstr[2] "минут"
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часа"
 msgstr[2] "часов"
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sВы работаете автономно. Отменить это на %d %s?"
 
-#: src/inc.c:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sВы работаете автономно. Отменить?"
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "Одн_ократно"
 
@@ -6985,20 +7011,19 @@ msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug           режим отладки"
 
 #: src/main.c:2081
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h              показать эту справку и выйти"
+msgid "  --help -h              display this help"
+msgstr "  --help -h              показать эту справку"
 
 #: src/main.c:2082
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           показать информацию о версии и выйти"
+msgid "  --version -v           output version information"
+msgstr "  --version -v           показать информацию о версии"
 
 #: src/main.c:2083
 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      показать информацию о версии и поддерживаемых "
-"возможностях и выйти"
+"возможностях"
 
 #: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
@@ -7057,11 +7082,11 @@ msgstr "Сообщения в очереди"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "В очереди имеются неоправленные сообщения. Выйти?"
 
-#: src/main.c:3019
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: сеть доступна.\n"
 
-#: src/main.c:3025
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: сеть недоступна.\n"
 
@@ -7823,7 +7848,7 @@ msgstr "По убыванию"
 msgid "_Auto detect"
 msgstr "_Автоопределение"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr "Применить теги..."
 
@@ -7995,7 +8020,7 @@ msgstr "Не найдено дубликатов сообщений в %d пап
 msgid "Select folder to go to"
 msgstr "Выберите папку для перехода"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr "Обработка правил для применения перед правилами папки"
 
@@ -8003,7 +8028,7 @@ msgstr "Обработка правил для применения перед 
 msgid "Processing rules to apply after folder rules"
 msgstr "Обработка правил для применения после правил папки"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr "Настройка фильтрации"
 
@@ -8354,8 +8379,8 @@ msgstr ""
 "\n"
 "  Сообщение было удалено или перемещено в другую папку"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr "При обучении произошла ошибка.\n"
 
@@ -8468,7 +8493,7 @@ msgid "Go back to email"
 msgstr "Вернуться к письму"
 
 #: src/mimeview.c:1815 src/mimeview.c:1907 src/mimeview.c:2149
-#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:440
+#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Не удалось сохранить часть составного сообщения: %s"
@@ -8533,8 +8558,8 @@ msgstr "Выберите папку назначения"
 msgid "'%s' is not a directory."
 msgstr "'%s' не является каталогом."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr "Сохранить как"
 
@@ -8591,7 +8616,7 @@ msgstr "Тип:"
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: 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
 msgid "Description:"
@@ -8702,6 +8727,77 @@ msgstr "Отписаться от группы новостей"
 msgid "Rename newsgroup folder"
 msgstr "Переименовать папку группы новостей"
 
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr "OAuth2 отсутствует код аутентификации\n"
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr "OAuth2 ошибка соединения\n"
+
+#: src/oauth2.c:253 src/oauth2.c:367
+msgid "OAuth2 SSL connection error\n"
+msgstr "OAuth2 SSL ошибка соединения\n"
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr "OAuth2 токен доступа получен\n"
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr "OAuth2 токен доступа не получен\n"
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr "OAuth2 обновлённый токен получен\n"
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "OAuth2 обновлённый токен не получен\n"
+
+#: src/oauth2.c:452
+msgid "OAuth2 socket write error\n"
+msgstr "OAuth2 ошибка записи сокета\n"
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr "OAuth2 ошибка превышения времени ожидания сокета \n"
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr "OAuth2 токен доступа еще действительный\n"
+
+#: src/oauth2.c:534
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr "OAuth2 получение токена доступа с использованием токена обновления\n"
+
+#: src/oauth2.c:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr "OAuth2 пытается получить новый токен доступа с кодом авторизации\n"
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr "OAuth2 токен доступа обновлен\n"
+
+#: src/oauth2.c:583
+#, c-format
+msgid "OAuth2 original: %s\n"
+msgstr "OAuth2 оригинал: %s\n"
+
+#: src/oauth2.c:584
+#, c-format
+msgid "OAuth2 encoded: %s\n"
+msgstr "OAuth2 зашифрованный: %s\n"
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr ""
+"OAuth2 расшифрованный: %s\n"
+"\n"
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr "Введите парольную фразу"
@@ -9660,7 +9756,7 @@ msgstr "Сообщения превышающий указанный разме
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1616
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr "КБ"
 
@@ -10183,7 +10279,7 @@ msgstr "Открыть в Просмотрщике (внешнее содерж
 msgid "Do nothing (remote content is disabled)"
 msgstr "Ничего не делать (внешнее содержимое отключено)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Прокси"
@@ -10235,7 +10331,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:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
+#: src/prefs_account.c:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Просмотр"
@@ -10244,89 +10340,89 @@ msgstr "Просмотр"
 msgid "Select stylesheet"
 msgstr "Выберите таблицу стилей"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr "Загрузка внешнего содержимого отключена."
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr "Загружать изображения"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr "Отображать внешнее содержимое"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr "Разрешить JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr "Разрешить Модули"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr "Разрешить Java"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
 msgstr "Открывать ссылки во внешнем браузере"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Произошла ошибка: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "Поток %s имеет некорректный или неподдерживаемый формат"
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr "Искать в Сети"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr "Открыть в Просмотрщике"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr "Открыть в Браузере"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr "Открыть Изображение"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
 msgstr "Копировать Ссылку"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
 msgstr "Скачать Ссылку"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr "Сохранить Изображение Как"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr "Копировать Изображение"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr "Импортировать поток"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Просмотрщик"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10550,7 +10646,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:1921
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
 msgid "Authentication"
 msgstr "Аутентификация"
 
@@ -10606,7 +10702,7 @@ msgstr "Интеграция GData"
 #: 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"
 
@@ -10733,8 +10829,8 @@ msgid "Cache refresh interval"
 msgstr "Период обновления кэша"
 
 #: 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:323 src/prefs_account.c:1697
+#: src/prefs_account.c:1855 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "часов"
 
@@ -10815,11 +10911,11 @@ msgstr ""
 "изображение пользователя недоступно. Оставьте адрес пустым, чтобы по "
 "умолчанию libravatar отображал оранжевый значок."
 
-#: src/plugins/libravatar/libravatar_prefs.c:397
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "_Разрешить переадресацию на другие сайты"
 
-#: 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"
@@ -10827,23 +10923,23 @@ msgstr ""
 "Следовать по перенаправлению, полученному от сервера libravatar к другим "
 "сервисам изображений, таких как gravatar.com"
 
-#: src/plugins/libravatar/libravatar_prefs.c:407
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "_Включить объединённые серверы"
 
-#: 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 "Пытаться получить изображение с сервера libravatar домена отправителя"
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr "Запрос времени ожидания"
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "секунд(а)"
 
-#: 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."
@@ -10852,15 +10948,15 @@ msgstr ""
 "сокета. Максимальное значение должно быть меньше, чем глобальное значение "
 "времени ожидания I/O сокета."
 
-#: src/plugins/libravatar/libravatar_prefs.c:472
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Кэш изображений"
 
-#: src/plugins/libravatar/libravatar_prefs.c:476
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "Если изображение отсутствует, отображать"
 
-#: src/plugins/libravatar/libravatar_prefs.c:480
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Сеть"
 
@@ -10991,7 +11087,7 @@ msgstr "Метод аутентификации не доступен"
 msgid "sending error on Sieve session: %s\n"
 msgstr "сообщение ошибки сессии Sieve: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
 msgid "_Filter"
 msgstr "_Фильтровать"
 
@@ -11048,7 +11144,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve Фильтр%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 "Загрузка..."
 
@@ -11120,7 +11216,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Включить Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr "Информация о сервере"
 
@@ -11171,28 +11267,28 @@ msgstr "Укажите аутентификацию"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
-#: src/prefs_account.c:1967
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 msgid "User ID"
 msgstr "Пользователь"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c: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/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
 msgid "Password"
 msgstr "Пароль"
 
-#: 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:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr "Метод аутентификация"
 
-#: 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/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
 msgid "Automatic"
 msgstr "Автоматически"
@@ -11822,95 +11918,95 @@ msgstr "Формат:"
 msgid "Optimized:"
 msgstr "Оптимизация:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "Свойства PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "Введите пароль"
 
-#: 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 "Этот документ заблокирован, требуется ввод пароля перед открытием."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1387
 #, c-format
 msgid "%s Document"
 msgstr "Документ %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
 msgstr "из %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 "Отображение PDF не удалось по неизвестным причинам."
 
-#: 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 "Список Документов"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "Первая Страница"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr "Предыдущая Страница"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "Следующая Страницы"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "Последняя Страница"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "Крупнее"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "Мельче"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "Страница Целиком"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "По Ширине Страницы"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "Повернуть Налево"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "Повернуть Направо"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "Распечатать Документ"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "Информация о Документе"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "Страница"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "Масштаб"
 
-#: 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 "
@@ -11922,13 +12018,13 @@ msgstr ""
 "помощью библиотеки Poppler %s и программы gs.\n"
 "Авторы будут благодарны за любые комментарии: 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"
 
-#: 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 "
@@ -11980,19 +12076,30 @@ msgstr "Пожалуйста, введите парольную фразу дл
 msgid "Bad passphrase.\n"
 msgstr "Неверная парольная фраза.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Импорт ключа"
 
-#: 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 and import it?"
 msgstr ""
 "Этого ключа нет в вашем keyring. Хотите, чтобы Claws Mail попытался "
-"импортировать его с сервера ключей?"
+"импортировать его?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "_No"
+msgstr "_Нет"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "с сервера ключей"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr "из Web Key Directory"
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
@@ -12000,15 +12107,15 @@ msgstr ""
 "\n"
 "  Идентификатор ключа "
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid "   This key is not in your keyring.\n"
 msgstr "   Этого ключа нет в вашем keyring.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   Должно быть возможно его импортировать "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -12016,17 +12123,17 @@ msgstr ""
 "при работе в сети,\n"
 "   или "
 
-#: 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 ""
-"с помощью следующей команды:\n"
+"с помощью любой из следующих команд: \n"
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -12034,30 +12141,27 @@ msgstr ""
 "\n"
 "  Импорт идентификатора ключа "
 
-#: 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 "   Этот ключ был импортирован в ваш keyring.\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 "   Не удалось импортировать этот ключ в ваш keyring.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Серверы ключей иногда работают медленно.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Вы можете попробовать импортировать его вручную с помощью следующей "
-"команды:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
+msgstr "   Вы можете попробовать импортировать его вручную с помощью команды:"
+
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr "или"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   Этот ключ есть в вашем keyring.\n"
 
@@ -12117,8 +12221,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:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "минут"
 
@@ -12362,7 +12466,7 @@ msgstr "Просроченная подпись от uid \"%s\" (Период д
 #: src/plugins/pgpcore/sgpgme.c:387
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr "uid отозванного ключа \"%s\"\n"
+msgstr "Отозванный uid ключа \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:392
 #, c-format
@@ -12743,8 +12847,8 @@ msgstr "Показать Python консоль..."
 msgid "Refresh"
 msgstr "Обновить"
 
-#: 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/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
 msgid "Browse"
 msgstr "Просмотр"
@@ -13071,7 +13175,7 @@ msgstr "Получать комментарии для постов не ста
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1585 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
+#: src/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "дней"
 
@@ -13773,45 +13877,45 @@ msgstr "Ориентировочно принять"
 msgid "Decline"
 msgstr "Отклонить"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr "У вас есть запись в списке задач."
 
-#: 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:718
 msgid "Details follow:"
 msgstr "Подробности:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "Вы создали встречу."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr "Вы приглашены на встречу."
 
-#: 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 "Встреча, на которую вы были приглашены, отменена."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr "Вы были направлены на деловую встречу."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr "(это событие повторяется)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr "(это регулярно повторяющееся событие)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Вы получили ответ на неизвестное приглашение."
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13820,35 +13924,35 @@ msgstr ""
 "Вы получили ответ на приглашение.\n"
 "Контакт %s %s приглашение. Подробности:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr "Ошибка: не удалось получить MIME часть календаря."
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr "Ошибка: в сообщении не найдена часть, содержащая календарь."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr "Ошибка: неизвестный тип компонента календаря."
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
 msgstr "Отправить уведомление участникам"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr "Отменить встречу"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Вы уверены, что хотите отменить эту встречу?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr "Учётная запись не найдена"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13856,68 +13960,68 @@ msgstr ""
 "У вас нет подходящей учётной записи.\n"
 "Всё равно ответить?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr "Всё равно ответить"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr "Ответить"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr "Изменить встречу..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr "Отменить встречу..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr "Открыть веб-сайт"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr "Вы уже заняты в это время."
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Событие:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Место:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Сводка:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr "Начало:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr "Окончание:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Участники:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr "Действие:"
 
@@ -14537,95 +14641,95 @@ msgstr "Ошибка синтаксиса временной метки в пр
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Ошибка синтаксиса временной метки в приветствии (не ASCII)\n"
 
-#: src/pop.c:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "Ошибка протокола POP\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "неверный UIDL ответ: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Удаление устаревшего сообщения %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Пропуск сообщения %d [%s] (%d байт)\n"
 
-#: src/pop.c:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "почтовый ящик заблокирован\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "Истекло время ожидания\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "команда не поддерживается\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "ошибка во время POP сессии\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "Команда ТОР не поддерживается\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr "Новости (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Локальный mbox файл"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr "Никакой (только SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr "Имя учётной записи"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
 msgstr "Использовать по умолчанию"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr "Полное имя"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
 msgstr "Почтовый адрес"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Авто-настройка"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14633,77 +14737,81 @@ msgstr ""
 "Предупреждение: эта версия Claws Mail\n"
 "была собрана без поддержки IMAP и NNTP."
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr "Этот сервер требует аутентификацию"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr "Удостоверять при подключении"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr "Сервер новостей"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr "Сервер для получения"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr "Локальный ящик"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr "SMTP сервер (отправка)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr "Использовать почтовую команду, а не SMTP сервер"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr "команда для отправки почты"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr "Учётная запись %d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr "Локальный узел"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr "'Входящие' по умолчанию"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Неотфильтрованные сообщения помещаются в эту папку"
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
-msgstr "Использовать безопасную аутентификацию (АРОР)"
+#: src/prefs_account.c:1634
+msgid "Authenticate before POP connection"
+msgstr "Аутентифицировать перед POP подключением"
+
+#: src/prefs_account.c:1658 src/prefs_account.c:2259
+msgid "Select"
+msgstr "Выбрать"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr "Удалять сообщения с сервера после получения"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr "Удалить по истечении"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 дней 0 часов : удалять немедленно"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr "Ограничение размера получаемых сообщений"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14711,95 +14819,95 @@ msgstr ""
 "Сообщения, превышающие данный лимит загружаются частично. При их выборе, "
 "возможно получить полное сообщение, либо удалить его."
 
-#: src/prefs_account.c:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr "Максимальное количество статей для загрузки"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr "неограниченно, если указан 0"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr "(обычно пусто)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
 msgstr "Показывать только подписанные папки"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1831
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Режим экономии трафика (не получать теги с сервера)"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1833
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Этот режим использует меньше трафика, но может быть медленнее с некоторыми "
 "серверами."
 
-#: src/prefs_account.c:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Автоматическая проверка"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr "Использовать глобальные настройки"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Проверять ящик каждые"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr "Фильтровать сообщения при получении"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr "Использовать модули фильтрации при получении"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1908
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "'Получить почту' проверяет наличие новых сообщений данной учётной записи"
 
-#: src/prefs_account.c:1894 src/prefs_customheader.c:210
+#: 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
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr "Генерировать идентификатор сообщения"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
 msgstr "Включать почтовый адрес в идентификатор сообщения"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr "Добавить заголовок агента пользователя"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr "Добавить заданный заголовок"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Аутентификация (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14807,172 +14915,217 @@ msgstr ""
 "Пустое поле означает использовать имя пользователя и пароль те же, что и при "
 "получении."
 
-#: src/prefs_account.c:2033
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr "Авторизация с POP перед отправкой"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr "Время ожидания аутентификации POP"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2233
+msgid "Authorization"
+msgstr "Авторизация"
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr "Выберите Поставщика Услуг OAuth2 Почты"
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr "ID клиента"
+
+#: src/prefs_account.c:2296
+msgid "Client secret"
+msgstr "Секрет клиента"
+
+#: src/prefs_account.c:2328
+msgid "Obtain authorization code"
+msgstr "Получить код авторизации"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr "Открыть браузер по умолчанию с запросом"
+
+#: src/prefs_account.c:2338
+msgid "Copy link"
+msgstr "Копировать ссылку"
+
+#: src/prefs_account.c:2350
+msgid "Authorization code"
+msgstr "Код авторизации"
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr ""
+"Вставьте полный URL из браузера или предоставленный токен аутентификации"
+
+#: src/prefs_account.c:2364
+msgid "Complete authorization"
+msgstr "Завершить авторизацию"
+
+#: src/prefs_account.c:2368
+msgid "Authorize"
+msgstr "Авторизовать"
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
 msgstr "Автоматически вставлять подпись"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr "Отделять подпись"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
 msgstr "Автоматически установить следующие адреса"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr "Словари проверки орфографии"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Словарь по умолчанию"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Альтернативный словарь по умолчанию"
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Составление"
 
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: 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
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr "Система конфиденциальности по умолчанию"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Всегда подписывать сообщения"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Всегда шифровать сообщения"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2792
 msgid "Always sign messages when replying to a signed message"
 msgstr "Всегда подписывать сообщение при ответе на подписанное сообщение"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2795
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Всегда шифровать сообщение при ответе на зашифрованное сообщение"
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2798
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Шифровать отправленные сообщения своим ключом в дополнение к ключу получателя"
 
-#: src/prefs_account.c:2481
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr "Сохранять отправленные зашифрованные сообщения как простой текст"
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
 msgid "Don't use SSL/TLS"
 msgstr "Не использовать SSL/TLS"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: 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 "Использовать SSL/TLS"
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Использовать команду STARTTLS для запуска зашифрованной сессии"
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr "Отправка (SMTP)"
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:3004
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Не использовать SSL/TLS (но при необходимости, использовать STARTTLS)"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr "Клиентские сертификаты"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr "Сертификат для получения"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Клиентский сертификат в виде файла PKCS12 или PEM"
 
-#: src/prefs_account.c:2732
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr "Сертификат для отправки"
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Автоматически принимать действительный SSL/TLS сертификат"
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr "Использовать неблокируемый SSL/TLS"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3106
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Отключите при обнаружении проблем с SSL/TLS соединением"
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Использовать прокси сервер"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3207
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Использовать значения по умолчанию"
 
-#: src/prefs_account.c:2890
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
 msgstr "Использовать глобальные настройки прокси сервера"
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Использовать аутентификацию"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
 msgstr "Использовать прокси сервер для отправки"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14980,27 +15133,27 @@ msgstr ""
 "Если выключено, сообщения будут отправлены через прямое подключение, "
 "игнорируя все настройки прокси сервера."
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr "Порт SMTP"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr "Порт POP"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr "Порт IMAP"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr "Порт NNTP"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr "Имя домена"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15008,148 +15161,152 @@ msgstr ""
 "Доменное имя будет использоваться в сгенерированном Message-ID, и при "
 "подключении к серверам SMTP."
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr "Использовать команду для связи с сервером"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3451
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Пометить перекрёстные сообщения как прочтённые и цветом:"
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr "Поместить отправленные сообщения в"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr "Поместить исходящие сообщения в"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr "Поместить черновые сообщения в"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr "Поместить удалённые сообщения в"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr "Имя учётной записи не введено."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
 msgstr "Почтовый адрес не введён."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr "SMTP сервер не введён."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr "Имя пользователя не введено."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr "POP сервер не введён."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr "Папка по умолчанию 'Входящие' не существует."
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr "IMAP сервер не введён."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr "NNTP сервер не введён."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3626
 msgid "local mailbox filename is not entered."
 msgstr "имя файла локального ящика не введено."
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
 msgstr "команда приёма почты не введена."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3642
 msgid "User ID cannot contain a newline character."
 msgstr "Имя пользователя не может содержать символ новой строки."
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3647
 msgid "Password cannot contain a newline character."
 msgstr "Пароль не может содержать символ новой строки."
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3678
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP имя пользователя не может содержать символ новой строки."
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3683
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP пароль не может содержать символ новой строки."
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr "домен не указан."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr "папка отправки не выбрана."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr "папка очереди не выбрана."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr "папка черновиков не выбрана."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "папка мусорной корзины не выбрана."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr "Получить"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr "Дополнительные"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr "Параметры для новой учётной записи"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr "Параметры учётной записи - %s"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Ошибка (неправильный адрес)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr "Выбрать файл подписи"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Выбрать файл сертификата"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (модуль не загружен)"
@@ -15416,7 +15573,7 @@ msgstr ""
 "t{Кому: %t\\n}?c{Копия: %c\\n}?n{Группы новостей: %n\\n}?s{Тема: %s\\n}\\n\\n"
 "%M"
 
-#: src/prefs_common.c:456
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15642,8 +15799,8 @@ msgstr ""
 "Эта настройка позволяет с помощью скрипта отображать части MIME в сообщении "
 "при использовании пункта контекстного меню 'Показать как текст'"
 
-#: 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:180
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Просмотр Сообщения"
 
@@ -16184,27 +16341,43 @@ msgstr "Шрифты"
 msgid "Preferences"
 msgstr "Настройки"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Автоматически отображать вложенные изображения"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr "Менять размеры вложенных изображений по умолчанию"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
 msgstr "Щёлкнуть изображение для переключения масштаба"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:96
+msgid "Fit image"
+msgstr "Подогнать изображение"
+
+#: src/prefs_image_viewer.c:99
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "Правый клик по изображению позволяет подогнать размер"
+
+#: src/prefs_image_viewer.c:102
+msgid "Height"
+msgstr "Высота"
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr "Ширина"
+
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr "Отображать изображения внутри сообщения"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr "Печатать изображения"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr "Просмотрщик Изображений"
 
@@ -16408,11 +16581,11 @@ msgstr "тело сообщения"
 msgid "whole message"
 msgstr "сообщение целиком"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr "Помечено"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr "Удалено"
 
@@ -16420,11 +16593,11 @@ msgstr "Удалено"
 msgid "Replied"
 msgstr "На сообщение есть ответ"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr "Сообщение было перенаправлено"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Спам"
@@ -16433,7 +16606,7 @@ msgstr "Спам"
 msgid "Has attachment"
 msgstr "Сообщение с вложениями"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr "Сообщение подписано"
 
@@ -16713,83 +16886,91 @@ msgstr ""
 msgid "Current condition rules"
 msgstr "Выбранные правила условий"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Заголовки"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "Показывать панель заголовка над просмотром сообщения"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
-msgstr "Показывать (X-)Лицо в просмотре сообщений"
+msgstr "Показывать (X-)Face в просмотре сообщений"
+
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "Если возможно, сохранить (X-)Face в адресной книге"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
-msgstr "Показывать Лицо в просмотре сообщений"
+msgstr "Показывать Face в просмотре сообщений"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr "Если возможно, сохранить Face в адресной книге"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "Показывать заголовки в просмотре сообщений"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "HTML сообщения"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "Отображать HTML сообщения как простой текст"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Отображать только HTML сообщения с помощью модуля, если возможно"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Выбирать HTML часть из составного/альтернативного сообщений"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Расстояние между строками"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "пикселей"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Половина страницы"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Плавная прокрутка"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Шаг"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Показывать описание вложений (вместо имён)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Цитаты"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Сворачивать цитаты двойным щелчком"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Рассматривать эти символы как метки цитат"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Параметры Текста"
 
@@ -17460,8 +17641,8 @@ msgstr ""
 "Укажите Content-Transfer-Encoding для тела сообщений, содержащих не-ASCII "
 "символы"
 
-#: 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:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "Отправка"
 
@@ -18261,7 +18442,7 @@ msgstr "Действия не определены."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Ошибка декодирования BASE64]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr "Часть декодировать не удалось"
 
@@ -18621,88 +18802,88 @@ msgstr "Введите текст для замены '%s'"
 msgid "Enter variable"
 msgstr "Введите переменную"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Отправка сообщения командой: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Невозможно выполнить команду: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Возникла ошибка при выполнении команды: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "Соединение"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "Обрабатывать POP перед SMTP..."
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "POP перед SMTP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Учётная запись '%s': Соединение с SMTP сервером: %s:%d..."
 
-#: src/send_message.c:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "Почта отправлена успешно."
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "Отправка HELO..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "Отправка сообщения..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "Отправка EHLO..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "Отправка MAIL FROM..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "Отправка RCPT TO..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "Отправка DATA..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "Завершение..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "При отправке сообщения возникла ошибка."
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19004,11 +19185,11 @@ msgstr "От: %s, %s"
 msgid "To: %s, on %s"
 msgstr "По: %s, %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr "Вы не автор статьи."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4574
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -19016,86 +19197,86 @@ msgstr[0] "Вы действительно хотите удалить %d выд
 msgstr[1] "Вы действительно хотите удалить %d выделенных сообщения?"
 msgstr[2] "Вы действительно хотите удалить %d выделенных сообщений?"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Удалить сообщение"
 msgstr[1] "Удалить сообщения"
 msgstr[2] "Удалить сообщений"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr "Назначение совпадает с текущей папкой."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4796
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Выберите папку, чтобы переместить выбранное сообщение"
 msgstr[1] "Выберите папку, чтобы переместить выбранные сообщения"
 msgstr[2] "Выберите папку, чтобы переместить выбранные сообщения"
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr "Назначение копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4881
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Выберите папку для копирования выбранного сообщения"
 msgstr[1] "Выберите папку для копирования выбранных сообщений"
 msgstr[2] "Выберите папку для копирования выбранных сообщений"
 
-#: src/summaryview.c:5036
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr "Дописать или Перезаписать"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr "Дописать или перезаписать существующий файл?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr "_Дописать"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr "_Перезаписать"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Не удалось сохранить файл '%s'."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5090
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 "Вы собираетесь напечатать %d сообщений одно за другим. Хотите продолжить?"
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr "Построение цепочек..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr "Пропускать эти правила"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5799
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 "Применить эти правила, независимо от учётной записи, к которой они "
 "принадлежат"
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5802
 msgid "Apply these rules if they apply to the current account"
 msgstr "Применить эти правила, если они применяются к текущей учётной записи"
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr "Фильтрация"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19103,76 +19284,76 @@ msgstr ""
 "Некоторые правила фильтрации привязаны к учётным записям.\n"
 "Пожалуйста, выберите, что делать с этими правилами:"
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr "Настройка обработки"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6095
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Вы действительно хотите сбросить цветовую метку всем выделенным сообщениям?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6097
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Вы действительно хотите применить эту цветовую метку всем выделенным "
 "сообщениям?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Reset color label"
 msgstr "Сбросить цветную метку"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Set color label"
 msgstr "Установить цветную метку"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr "Игнорируемая цепочка"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr "Отслеживаемая цепочка"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 "Ответ на данное сообщение отправлен, так же, сообщение перенаправлено - "
 "щёлкните, чтобы увидеть ответ"
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr "Ответ на данное сообщение отправлен - щёлкните, чтобы увидеть ответ"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr "Помечено на перемещение"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr "Помечено на копирование"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr "Подписано, содержит вложение(я)"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr "Зашифровано, содержит вложение(я)"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr "Зашифровано"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr "Сообщение с вложениями"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19181,11 +19362,11 @@ msgstr ""
 "Ошибка в регулярном выражении (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8402
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Вернуться к списку папок (у Вас есть непрочтённые сообщения)"
 
-#: src/summaryview.c:8403
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr "Вернуться к списку папок"
 
diff --git a/po/sk.po b/po/sk.po
index 09152f4ce..52a090998 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,21 +2,21 @@
 # Copyright © 2009-2017 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
-# Slavko <linux at slavino.sk>, 2009-2020.
+# Slavko <linux at slavino.sk>, 2009-2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.17.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2020-09-13 17:40+0100\n"
-"PO-Revision-Date: 2020-09-15 13:21+0200\n"
+"POT-Creation-Date: 2021-07-03 09:16+0100\n"
+"PO-Revision-Date: 2021-07-03 11:25+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 3.36.0\n"
+"X-Generator: Gtranslator 3.38.0\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/account.c:402 src/account.c:469
@@ -42,7 +42,7 @@ msgid ""
 "given, the checkbox indicates which accounts will be included. Bold text "
 "indicates the default account."
 msgstr ""
-"Tlačidlo „Prijať poštu” prijme poštu z vašich účtov v zadanom poradí, "
+"Tlačidlo „Prijať poštu” prijme poštu z Vašich účtov v zadanom poradí, "
 "zaškrtnutie poľa v stĺpci „G” určuje ktoré účty budú zahrnuté. Predvolený "
 "účet je označený tučným písmom."
 
@@ -59,48 +59,48 @@ msgstr "Účty so vzdialenými zložkami nemožno kopírovať."
 msgid "Copy of %s"
 msgstr "Kópia %s"
 
-#: src/account.c:1125
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Naozaj chcete odstrániť účet „%s”?"
 
-#: src/account.c:1127
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr "(Bez názvu)"
 
-#: src/account.c:1128
+#: src/account.c:1129
 msgid "Delete account"
 msgstr "Zmazať účet"
 
-#: src/account.c:1602
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1608
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 
-#: src/account.c:1615 src/addrduplicates.c:472 src/addressadd.c:223
-#: src/addressbook.c:128 src/compose.c:7488 src/editaddress.c:1474
+#: src/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
 #: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: 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
 msgid "Name"
 msgstr "Meno"
 
-#: src/account.c:1623 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -151,7 +151,8 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5277 src/compose.c:5282 src/ldaputil.c:333
+#: 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/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -418,12 +419,12 @@ msgid "_Book"
 msgstr "_Adresár"
 
 #: 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/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: src/addressbook.c:407 src/compose.c:619 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Nástroje"
@@ -456,14 +457,14 @@ msgstr "_Upraviť adresár"
 msgid "_Delete book"
 msgstr "Z_mazať adresár"
 
-#: src/addressbook.c:426 src/compose.c:631
+#: src/addressbook.c:426 src/compose.c:632
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: src/addressbook.c:427 src/compose.c:635 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
@@ -478,13 +479,13 @@ msgid "C_ut"
 msgstr "_Vystrihnúť"
 
 #: 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/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovať"
 
 #: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "V_ložiť"
 
@@ -806,7 +807,7 @@ msgid "Person"
 msgstr "Osoba"
 
 #: 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/folderview.c:449 src/prefs_account.c:3468 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Zložka"
 
@@ -929,18 +930,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:144 src/compose.c:9810
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: 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/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:5091
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5808 src/inc.c:726
+#: 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
 msgid "Error"
 msgstr "Chyba"
@@ -1061,36 +1062,36 @@ 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:1238
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "Zlyhalo vytvorenie spojenia SSL/TLS\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "Nie je dostupná žiadna metóda SMTP AUTH\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Zvolená metóda SMTP AUTH nie je dostupná\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "neplatná odozva SMTP\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "nastala chyba relácie SMTP\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "nastala chyba autentifikácie\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, 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:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "nemožno vytvoriť reláciu STARTTLS\n"
 
@@ -1227,217 +1228,217 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondelok"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Streda"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: src/common/utils.c:4056
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Piatok"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Január"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Február"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marec"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Apríl"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Jún"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Júl"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Október"
 
-#: src/common/utils.c:4069
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4070
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "December"
 
-#: src/common/utils.c:4072
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Ne"
 
-#: src/common/utils.c:4073
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Po"
 
-#: src/common/utils.c:4074
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ut"
 
-#: src/common/utils.c:4075
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "St"
 
-#: src/common/utils.c:4076
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Št"
 
-#: src/common/utils.c:4077
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Pi"
 
-#: src/common/utils.c:4078
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "So"
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4083
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:4084
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4085
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jún"
 
-#: src/common/utils.c:4086
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Júl"
 
-#: src/common/utils.c:4087
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:4088
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4089
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:4090
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4091
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dec"
 
-#: src/common/utils.c:4102
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP"
 
-#: src/common/utils.c:4103
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP"
 
-#: src/common/utils.c:4104
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "dop"
 
-#: src/common/utils.c:4105
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "odp"
 
-#: src/compose.c:195
+#: src/compose.c:198
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1449,426 +1450,426 @@ msgstr ""
 "\n"
 "Podpisovanie a šifrovanie tejto správy bolo vpynuté."
 
-#: src/compose.c:603
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Pridať..."
 
-#: src/compose.c:604 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: src/compose.c:606 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:613 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "Sp_ráva"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "P_ravopis"
 
-#: src/compose.c:618 src/compose.c:685
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: src/compose.c:620 src/mainwindow.c:528 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: src/compose.c:622
+#: src/compose.c:623
 msgid "S_end"
 msgstr "Odos_lať"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "Odoslať _neskôr"
 
-#: src/compose.c:626
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "Pripojiť sú_bor"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "Vlož_iť súbor"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Vložiť _podpis"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "Nah_radiť podpis"
 
-#: src/compose.c:633
+#: src/compose.c:634
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Späť"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Znova"
 
-#: src/compose.c:642 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Vystrihnúť"
 
-#: src/compose.c:646
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "Prilepiť _špeciálne"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Ako _citácia"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "_Zalomené"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:651 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vy_brať všetko"
 
-#: src/compose.c:653
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "_Rozšírené"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Presunúť o znak dozadu"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Presunúť o znak dopredu"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Presunúť o slovo dozadu"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Presunúť o slovo dopredu"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Presunúť na začiatok riadku"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Presunúť na koniec riadku"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Presunúť na predchádzajúci riadok"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Presunúť na ďalší riadok"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Zmazať znak naľavo od kurzora"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Zmazať znak napravo od kurzora"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Zmazať slovo naľavo od kurzora"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Zmazať slovo napravo od kurzora"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Zmazať riadok"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Zmazať do konca riadku"
 
-#: src/compose.c:670 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Hľadať"
 
-#: src/compose.c:673
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "_Zalomiť aktuálny odsek"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Zalomiť všetky d_lhé riadky"
 
-#: src/compose.c:676
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Upraviť pomocou e_xterného editora"
 
-#: src/compose.c:679
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "_Skontrolovať všetko alebo výber"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "_Zvýrazniť všetky nesprávne slová"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "S_pätne skontrolovať nesprávne slovo"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "_Dopredu na ďalšie nesprávne slovo"
 
-#: src/compose.c:689
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "Reži_m odpovede"
 
-#: src/compose.c:691
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "_Súkromie"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "Pri_orita"
 
-#: src/compose.c:697 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "_Kódovanie znakov"
 
-#: src/compose.c:702 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/compose.c:703 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Pobaltské"
 
-#: src/compose.c:704 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "Hebrejské"
 
-#: src/compose.c:705 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arabské"
 
-#: src/compose.c:706 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Cyrilika"
 
-#: src/compose.c:707 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonské"
 
-#: src/compose.c:708 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Čínske"
 
-#: src/compose.c:709 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Kórejské"
 
-#: src/compose.c:710 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Thajské"
 
-#: src/compose.c:713 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Adresár"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "_Template"
 msgstr "Šabló_na"
 
-#: src/compose.c:717 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "A_kcie"
 
-#: src/compose.c:721 src/mainwindow.c:825 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
 msgid "_About"
 msgstr "_O programe"
 
-#: src/compose.c:726
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Aut_omatické zalamovanie"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Automatické odsaden_ie"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "Podpí_sať"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "_Šifrovať"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "Vyžiadať potv_rdenie o prijatí"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "_Odstrániť odkazy"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "Zobraziť p_ravítko"
 
-#: src/compose.c:737 src/compose.c:747
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Normálny"
 
-#: src/compose.c:738 src/mainwindow.c:674 src/messageview.c:305
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
 #: src/summaryview.c:433
 msgid "_All"
 msgstr "_Všetkým"
 
-#: src/compose.c:739 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_Sender"
 msgstr "Odo_sielateľ"
 
-#: src/compose.c:740
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "E_mailová konferencia"
 
-#: src/compose.c:745
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "_Najvyššia"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "_Vysoká"
 
-#: src/compose.c:748
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "_Nízka"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "Na_jnižšia"
 
-#: src/compose.c:754 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:755 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:756 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:760 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:763 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grécke (ISO-8859-_7)"
 
-#: src/compose.c:768 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turecké (ISO-8859-_9)"
 
-#: src/compose.c:1055
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr "Chyba v tvare odosielateľa novej správy."
 
-#: src/compose.c:1148
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr "Chyba v tvare predmetu novej správy."
 
-#: src/compose.c:1180 src/quote_fmt.c:563
+#: src/compose.c:1181 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "V tele šablóny „Nová správa” je chyba na riadku %d."
 
-#: src/compose.c:1449
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Nemožno odpovedať. Pôvodná správa už asi neexistuje."
 
-#: src/compose.c:1634 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "Pole „Od” šablóny „Odpovedať” obsahuje neplatnú emailovú adresu."
 
-#: src/compose.c:1683 src/quote_fmt.c:583
+#: src/compose.c:1684 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "V tele šablóny „Odpovedať” je chyba na riadku %d."
 
-#: src/compose.c:1824 src/compose.c:2025 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Pole „Od” šablóny „Poslať ďalej” obsahuje neplatnú emailovú adresu."
 
-#: src/compose.c:1885 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "V tele šablóny „Poslať ďalej” je chyba na riadku %d."
 
-#: src/compose.c:2068
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
 msgstr "Fw: viacero správ"
 
-#: src/compose.c:2577
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "V tele šablóny „Presmerovať” je chyba na riadku %d."
 
-#: src/compose.c:2648 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/compose.c:2651 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
-#: src/compose.c:2654 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
-#: src/compose.c:2657 src/compose.c:5026 src/compose.c:5028
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
-#: src/compose.c:2660 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračovanie:"
 
-#: src/compose.c:2663 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovedi komu:"
 
-#: src/compose.c:2667 src/compose.c:5023 src/compose.c:5031
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2857
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nemožno priložiť súbor (zlyhala konverzia kódovania)."
 
-#: src/compose.c:2863
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1886,73 +1887,73 @@ msgstr[2] ""
 "Nasledujúce súbory budú priložené:\n"
 "%s"
 
-#: src/compose.c:3143
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "„Značka citácie” šablóny nie je platná."
 
-#: src/compose.c:3672
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemožno zistiť veľkosť súboru „%s”."
 
-#: src/compose.c:3690
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Do tela správy vkladáte súbor %s. Ste si istý, že to chcete urobiť?"
 
-#: src/compose.c:3693
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: src/compose.c:3694 src/compose.c:10859 src/compose.c:11753
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: src/compose.c:3819
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:3820
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr "Prázdny súbor"
 
-#: src/compose.c:3821
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr "Pripojiť i _tak"
 
-#: src/compose.c:3830
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemožno čítať %s."
 
-#: src/compose.c:3857
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:4867 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Upravené]"
 
-#: src/compose.c:4874 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:4877 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[bez názvu] - Písanie správy%s"
 
-#: src/compose.c:4879 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Napísať správu"
 
-#: src/compose.c:4906 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1960,59 +1961,59 @@ msgstr ""
 "Nie je zadaný účet na odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštový účet."
 
-#: src/compose.c:5123 src/compose.c:5160
+#: src/compose.c:5126 src/compose.c:5163
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "Jediný príjemca je predvolená adresa „%s”. Odoslať i tak?"
 
-#: src/compose.c: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: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
 msgid "Send"
 msgstr "Odoslať"
 
-#: 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/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
 msgid "_Send"
 msgstr "_Odoslať"
 
-#: src/compose.c:5181
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr "Nie je zadaný príjemca."
 
-#: src/compose.c:5196
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Prázdny predmet. %s"
 
-#: src/compose.c:5197 src/compose.c:5240
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Poslať i tak?"
 
-#: src/compose.c:5198 src/compose.c:5241
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Zaradiť do fronty i tak?"
 
-#: src/compose.c:5200 src/compose.c:5243 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr "Odoslať ho neskôr"
 
-#: src/compose.c:5201 src/compose.c:5244
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr "Do _fronty"
 
-#: src/compose.c:5239
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Odosielanie na %d adries. %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5271
 msgid "Could not queue message."
 msgstr "Nemožno zaradiť správu do fronty na odoslanie."
 
-#: src/compose.c:5271
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2023,7 +2024,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5275
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2034,7 +2035,7 @@ msgstr ""
 "\n"
 "Podpísanie zlyhalo: %s"
 
-#: src/compose.c:5280
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2045,7 +2046,7 @@ msgstr ""
 "\n"
 "Šifrovanie zlyhalo: %s"
 
-#: src/compose.c:5285
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2055,7 +2056,7 @@ msgstr ""
 "\n"
 "Zlyhala konverzia kódovania."
 
-#: src/compose.c:5289
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2065,7 +2066,7 @@ msgstr ""
 "\n"
 "Nie je dostupný šifrovací kľúč príjemcu."
 
-#: src/compose.c:5352 src/compose.c:5412
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2073,7 +2074,7 @@ msgstr ""
 "Správa bola zaradená do fronty, ale nebolo ju možné odoslať.\n"
 "Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
 
-#: src/compose.c:5408
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
@@ -2082,7 +2083,7 @@ msgstr ""
 "%s\n"
 "Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
 
-#: src/compose.c:5805
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2093,7 +2094,7 @@ msgstr ""
 "kódovania na %s.\n"
 "Odoslať správu v kódovaní %s?"
 
-#: src/compose.c:5867
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2106,67 +2107,67 @@ msgstr ""
 "\n"
 "Odoslať aj tak?"
 
-#: src/compose.c:6102
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr "Upozornenie šifrovania"
 
-#: src/compose.c:6103
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr "_Pokračovať"
 
-#: src/compose.c:6152
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadny účet na odosielanie správ!"
 
-#: src/compose.c:6161
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Zvolený účet nie je NNTP: Posielanie nie je možné."
 
-#: src/compose.c:6415
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Príloha %s už neexistuje. Ignorovať?"
 
-#: src/compose.c:6417 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Zrušiť posielanie"
 
-#: src/compose.c:6417
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr "Ignorovať prílohu"
 
-#: src/compose.c:6473
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr "Pôvodná časť %s"
 
-#: src/compose.c:7073
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr "Pridať do _adresára"
 
-#: src/compose.c:7240
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr "Zmazať obsah položiek"
 
-#: src/compose.c:7244 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Na automatické doplnenie z adresára použite <TAB>"
 
-#: src/compose.c:7476
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr "Typ MIME"
 
-#: src/compose.c:7482 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: 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
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:7544
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr "Uložiť správu do "
 
-#: src/compose.c:7575 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
@@ -2177,27 +2178,27 @@ msgstr "Uložiť správu do "
 msgid "_Browse"
 msgstr "_Prechádzať"
 
-#: src/compose.c:7591
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr "Vyberte zložku na uloženie správy"
 
-#: src/compose.c:8048
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "H_lavička"
 
-#: src/compose.c:8053
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Prílohy"
 
-#: src/compose.c:8067
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "_Ostatné"
 
-#: src/compose.c:8082
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "Pre_dmet:"
 
-#: src/compose.c:8306
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2206,19 +2207,19 @@ msgstr ""
 "Nemožno spustiť kontrolu preklepov.\n"
 "%s"
 
-#: src/compose.c:8453
+#: src/compose.c:8456
 msgid "_From:"
 msgstr "O_d:"
 
-#: src/compose.c:8470
+#: src/compose.c:8473
 msgid "Account to use for this email"
 msgstr "Účet, použitý pre tento email"
 
-#: src/compose.c:8472
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr "Adresa odosielateľa"
 
-#: src/compose.c:8654
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2227,73 +2228,98 @@ msgstr ""
 "Nemožno načítať systém súkromia „%s”. Nebude možné podpísať ani zašifrovať "
 "túto správu."
 
-#: src/compose.c:8765 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "Žiad_na"
 
-#: src/compose.c:8866 src/prefs_template.c:752
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Telo šablóny má chybu v riadku %d."
 
-#: src/compose.c:8963
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Chyba formátu šablóny „%s”."
 
-#: src/compose.c:9387
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:9402
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:9476
+#: src/compose.c:9479
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9494
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/compose.c:9527
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: src/compose.c:9547
+#: src/compose.c:9550
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:9548
+#: src/compose.c:9551
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:9807
+#: src/compose.c:9646
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"Nemožno zapísať telo do súboru:\n"
+"%s"
+
+#: src/compose.c:9704
+#, c-format
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Nemožno spustiť nasledujúci príkaz:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9743
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr "Externá editor skončil chybou:%s"
+
+#: src/compose.c:9817
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
 "Externý editor je ešte stále aktívny.\n"
 "Vynútiť ukončenie procesu?\n"
-"ID skupiny procesu: %d"
+"ID procesu: %d"
 
-#: src/compose.c:10280 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potrebuje na odoslanie tejto správy pripojenie k sieti."
 
-#: src/compose.c:10473
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr "Koncept nemožno uložiť."
 
-#: src/compose.c:10477
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr "Koncept nemožno uložiť"
 
-#: src/compose.c:10478
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2301,24 +2327,24 @@ msgstr ""
 "Koncept nemožno uložiť.\n"
 "Chcete pokračovať v písaní, alebo zahodiť rozpísanú správu?"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr "+_Zrušiť skončenie"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr "_Zahodiť správu"
 
-#: src/compose.c:10669 src/compose.c:10683
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr "Zvoľte súbor"
 
-#: src/compose.c:10697
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor „%s” nemožno čítať."
 
-#: src/compose.c:10699
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2327,50 +2353,50 @@ msgstr ""
 "Súbor „%s” obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
-#: src/compose.c:10778
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr "Zahodiť správu"
 
-#: src/compose.c:10779
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
-#: src/compose.c:10780 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: src/compose.c:10780 src/compose.c:10785
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
-#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Uložiť zmeny"
 
-#: src/compose.c:10784
+#: src/compose.c:10734
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Táto správa bola zmenená. Uložiť posledné zmeny?"
 
-#: src/compose.c:10785
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr "_Neukladať"
 
-#: src/compose.c:10856
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použiť šablónu „%s”?"
 
-#: src/compose.c:10858
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:10859 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
 #: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: src/compose.c:11746
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2388,20 +2414,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:11752
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
-#: src/compose.c:11753
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr "_Pripojiť"
 
-#: src/compose.c:11971
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare citácie na riadku %d."
 
-#: src/compose.c:12267
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2618,7 +2644,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:2158
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Súbor"
@@ -2703,13 +2729,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:2910
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 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:2917
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2770,7 +2796,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2931,8 +2957,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:1405 src/prefs_account.c:2003
-#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
+#: 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
 msgid "Show password"
 msgstr "Zobraziť heslo"
@@ -2954,11 +2980,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Najväčší počet vrátených výsledkov vyhľadávania."
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr "Základné"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "Rozšírené"
 
@@ -3098,8 +3124,8 @@ msgstr "Štýlopis"
 #: 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/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
 msgid "None"
 msgstr "Žiadna"
 
@@ -3337,7 +3363,7 @@ msgstr "Exportovať adresár do súboru LDIF"
 msgid "Distinguished Name"
 msgstr "Distguished Name"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr "Exportovať do súboru mbox"
 
@@ -3402,17 +3428,17 @@ msgstr "Názov je príliš dlhý."
 msgid "Not specified."
 msgstr "Nie je určený."
 
-#: 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 "Súbor %s chýba! Chcete použiť záložný súbor z %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 "Nemožno kopírovať %s do %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 "
@@ -3518,51 +3544,51 @@ msgstr "akciu nemožno aplikovať\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "žiadne ďalšie spracovanie po akcii [ %s ]\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "spracovanie pravidla „%s” [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "spracovanie pravidla <bez mena> [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "vypnuté pravidlo „%s” [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "vypnuté pravidlo [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "neurčené"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "začlenenie"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "manuálne"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "spracovanie zložky"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "pred-spracovanie"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "po-spracovanie"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3579,11 +3605,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3618,35 +3644,35 @@ msgstr "Koncepty"
 msgid "Processing (%s)...\n"
 msgstr "Spracúvam (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopírujem %s do %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Presúvam %s do %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizujem vyrovnávaciu pamäť zložky %s..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "Spracúvam správy..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizujem %s na použitie pri odpojení...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Názov zložky nemôže začínať alebo končiť bodkou."
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "Názov zložky nemôže končiť bodkou."
 
@@ -3729,13 +3755,13 @@ msgstr "Nastaviť zobrazované stĺpce"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr "Nový"
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Neprečítané"
@@ -3754,7 +3780,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie zložky..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr "Označiť všetky ako prečítané"
 
@@ -3766,11 +3792,11 @@ msgstr ""
 "Naozaj chcete označiť všetky správy tejto zložky a jej podzložiek ako "
 "prečítané?"
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:871 src/summaryview.c:4292
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Naozaj chcete označiť všetky správy tejto zložky ako prečítané?"
 
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr "Označiť všetky ako neprečítané"
 
@@ -3782,16 +3808,16 @@ msgstr ""
 "Naozaj chcete označiť všetky správy tejto zložky a jej podzložiek ako "
 "neprečítané?"
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:877 src/summaryview.c:4338
 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:1067 src/imap.c:4675
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prehľadávanie zložky %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4679 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prehľadávanie zložky %s..."
@@ -3850,7 +3876,7 @@ msgstr "Vymazať všetky správy z koša?"
 msgid "_Empty trash"
 msgstr "_Vyprázdniť kôš"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Varovanie odpojenia"
 
@@ -3870,7 +3896,7 @@ msgstr "Odoslať všetky správy vo fronte?"
 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielaní správ vo fronte nastali chyby."
 
-#: src/folderview.c:2557 src/main.c:2891 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3936,7 +3962,7 @@ msgstr "Presun zlyhal!"
 msgid "Processing configuration for folder %s"
 msgstr "Nastavenie spracovania zložky %s"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Zvolená cieľová zložka môže obsahovať len podzložky."
 
@@ -3986,7 +4012,7 @@ msgstr "neznáme"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemožno získať zoznam diskusných skupín."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1848 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr "Hotovo."
 
@@ -4020,11 +4046,11 @@ msgstr ""
 
 #: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999 – 2020\n"
+"Copyright (C) 1999 – 2021\n"
 "Tím Claws Mail\n"
 "a Hiroyuki Yamamoto"
 
@@ -4176,44 +4202,44 @@ 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:718 src/main.c:2715
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr "Štatistiky relácie\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2725 src/main.c:2728
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr "Začatá: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2734
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr "Došlá komunikácia\n"
 
-#: src/gtk/about.c:741 src/main.c:2737
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Prijaté správy: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2743
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr "Odoslaná komunikácia\n"
 
-#: src/gtk/about.c:751 src/main.c:2746
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/presmerované správy: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2750
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpovede na správy: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2754
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Presmerované správy: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2758
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Odoslané správy celkom: %d\n"
@@ -4423,20 +4449,20 @@ msgstr ""
 "Kontrola preklepov nemohla zmeniť alternatívny slovník.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1853
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "Zlyhalo: nebol nájdený záznam služby."
 
-#: src/gtk/gtkutils.c:1856
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "Zlyhalo: chyba siete."
 
-#: src/gtk/gtkutils.c:1859
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Zlyhalo: neznáma chyba (%d)."
 
-#: src/gtk/gtkutils.c:1929
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "Nastavovanie..."
 
@@ -4680,7 +4706,7 @@ msgstr "User-Agent:"
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
@@ -4708,7 +4734,7 @@ msgstr "Precedence"
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "Organizácia"
 
@@ -5030,7 +5056,7 @@ msgstr ""
 #: 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/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
@@ -5089,11 +5115,11 @@ msgid "_Hide"
 msgstr "_Skryť"
 
 #: 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: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
 msgid "Account"
 msgstr "Účet"
 
@@ -5316,52 +5342,52 @@ msgstr ""
 "musia správy spĺňať, aby boli zobrazené v zozname správ.\n"
 "Môžu byť použité tieto symboly:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 "Počas hľadania sa prihodilo niečo zlé. Prosím, skontrolujte svoje záznamy."
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Od/Komu/Kópia/Predmet/Značka"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Rekurzívne"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "Trvalé"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "Dynamické"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "Spustiť pri zvolení"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "Zrušiť súčasné vyhľadávanie"
 
-#: 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 "Upraviť vyhľadávacie kritériá"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr "Informácie o rozšírených symboloch"
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr "_Informácia"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr "_Upraviť"
 
-#: 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:349
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Vy_mazať"
@@ -5537,212 +5563,212 @@ msgstr "(bez Odosielateľa)"
 msgid "(No Subject)"
 msgstr "(bez Predmetu)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Názov súboru:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr "Veľkosť súboru:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr "Načítať obrázok"
 
-#: src/imap.c:582
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr "Spojenie IMAP poškodené\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: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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Chyba IMAP na %s:"
 
-#: src/imap.c:627
+#: src/imap.c:628
 msgid "authenticated"
 msgstr "autentifikovaný"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "neautentifikovaný"
 
-#: src/imap.c:633
+#: src/imap.c:634
 msgid "bad state"
 msgstr "zlý stav"
 
-#: src/imap.c:636
+#: src/imap.c:637
 msgid "stream error"
 msgstr "chyba streamu"
 
-#: src/imap.c:639
+#: src/imap.c:640
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "chyba spracovania (pravdepodobne server, ktorý nedodržiava štandard RFC)"
 
-#: src/imap.c:643
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "spojenie odmietnuté"
 
-#: src/imap.c:646
+#: src/imap.c:647
 msgid "memory error"
 msgstr "chyba pamäte"
 
-#: src/imap.c:649
+#: src/imap.c:650
 msgid "fatal error"
 msgstr "fatálna chyba"
 
-#: src/imap.c:652
+#: src/imap.c:653
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "chyba protokolu (pravdepodobne server, ktorý nedodržiava štandard RFC)"
 
-#: src/imap.c:656
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr "spojenie nebolo prijaté"
 
-#: src/imap.c:659
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr "Chyba pri APPEND"
 
-#: src/imap.c:662
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr "Chyba pri NOOP"
 
-#: src/imap.c:665
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr "Chyba pri LOGOUT"
 
-#: src/imap.c:668
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr "Chyba pri CAPABILITY"
 
-#: src/imap.c:671
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr "Chyba pri CHECK"
 
-#: src/imap.c:674
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr "Chyba pri CLOSE"
 
-#: src/imap.c:677
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr "Chyba pri EXPUNGE"
 
-#: src/imap.c:680
+#: src/imap.c:681
 msgid "COPY error"
 msgstr "Chyba pri COPY"
 
-#: src/imap.c:683
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr "Chyba pri UID COPY"
 
-#: src/imap.c:686
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr "Chyba pri CREATE"
 
-#: src/imap.c:689
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr "Chyba pri DELETE"
 
-#: src/imap.c:692
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr "Chyba pri EXAMINE"
 
-#: src/imap.c:695
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr "Chyba pri FETCH"
 
-#: src/imap.c:698
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr "Chyba pri UID FETCH"
 
-#: src/imap.c:701
+#: src/imap.c:702
 msgid "LIST error"
 msgstr "Chyba pri LIST"
 
-#: src/imap.c:704
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr "Chyba pri LOGIN"
 
-#: src/imap.c:707
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr "Chyba pri LSUB"
 
-#: src/imap.c:710
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr "Chyba pri RENAME"
 
-#: src/imap.c:713
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr "Chyba pri SEARCH"
 
-#: src/imap.c:716
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr "Chyba pri UID SEARCH"
 
-#: src/imap.c:719
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr "Chyba pri SELECT"
 
-#: src/imap.c:722
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr "Chyba pri STATUS"
 
-#: src/imap.c:725
+#: src/imap.c:726
 msgid "STORE error"
 msgstr "Chyba pri STORE"
 
-#: src/imap.c:728
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr "Chyba pri UID STORE"
 
-#: src/imap.c:731
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr "Chyba pri SUBSCRIBE"
 
-#: src/imap.c:734
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr "Chyba pri UNSUBSCRIBE"
 
-#: src/imap.c:737
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr "Chyba pri STARTTLS"
 
-#: src/imap.c:740
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr "Chyba pri INVAL"
 
-#: src/imap.c:743
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr "Chyba pri EXTENSION"
 
-#: src/imap.c:746
+#: src/imap.c:747
 msgid "SASL error"
 msgstr "Chyba pri SASL"
 
-#: src/imap.c:750
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr "Chyba pri SSL/TLS"
 
-#: src/imap.c:754
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Neznáma chyba [%d]"
 
-#: src/imap.c:960
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5754,7 +5780,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:966
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5766,7 +5792,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:972
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5778,7 +5804,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:978
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5790,7 +5816,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:984
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5802,36 +5828,36 @@ msgstr ""
 "Prihlásenie LOGIN funguje, len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul LOGIN SASL."
 
-#: src/imap.c:991
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s"
 
-#: src/imap.c:995
+#: src/imap.c:1003
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s\n"
 
-#: src/imap.c:1013
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Spojenie k %s zlyhalo"
 
-#: src/imap.c:1020 src/imap.c:1023
+#: src/imap.c:1028 src/imap.c:1031
 #, 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:1053 src/imap.c:3725 src/imap.c:4384 src/imap.c:4478
-#: src/imap.c:4656 src/imap.c:5467
+#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 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:1163 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: src/imap.c:1164 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5845,108 +5871,108 @@ msgstr ""
 "Chcete pokračovať v pripájaní na tento server? Komunikácia nebude "
 "zabezpečená."
 
-#: src/imap.c:1170 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "Po_kračovať v pripájaní"
 
-#: src/imap.c:1179
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru IMAP: %s: %d..."
 
-#: src/imap.c:1244
+#: src/imap.c:1252
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Nemožno sa pripojiť k serveru IMAP: %s:%d"
 
-#: src/imap.c:1247
+#: src/imap.c:1255
 #, 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:1279 src/imap.c:4146
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nemožno vytvoriť reláciu STARTTLS.\n"
 
-#: src/imap.c:1348
+#: src/imap.c:1359
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s.\n"
 
-#: src/imap.c:1351
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 
-#: src/imap.c:1779
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "Pridávam správy..."
 
-#: src/imap.c:1984 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopírujem správy..."
 
-#: src/imap.c:2510
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr "Hľadanie zlyhalo kvôli chybe servera."
 
-#: src/imap.c:2594
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "nemožno nastaviť príznak zmazania\n"
 
-#: src/imap.c:2601 src/imap.c:5097
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "nemožno odstrániť\n"
 
-#: src/imap.c:2976
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Hľadám neodoberané zložky v %s..."
 
-#: src/imap.c:2979
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hľadám podzložky %s..."
 
-#: src/imap.c:3267
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nemožno vytvoriť schránku: príkaz LIST zlyhal\n"
 
-#: src/imap.c:3280
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "nemožno vytvoriť schránku\n"
 
-#: src/imap.c:3411
+#: src/imap.c:3422
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nemožno premenovať schránku: %s na %s\n"
 
-#: src/imap.c:3524
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "nemožno odstrániť schránku \n"
 
-#: src/imap.c:3803
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "LIST zlyhal\n"
 
-#: src/imap.c:3888
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr "Označujem správy..."
 
-#: src/imap.c:3991
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nemožno vybrať zložku: %s\n"
 
-#: src/imap.c:4143
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server na prihlásenie vyžaduje STARTTLS.\n"
 
-#: src/imap.c:4153
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo  sa obnoviť možnosti servera.\n"
 
-#: src/imap.c:4158
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5955,20 +5981,20 @@ msgstr ""
 "Pripojenie k %s zlyhalo: server vyžaduje STARTTLS, ale Claws Mail bol "
 "zostavený bez podpory STARTTLS.\n"
 
-#: src/imap.c:4166
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 
-#: src/imap.c:4389
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "Sťahujem správu..."
 
-#: src/imap.c:5090
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nemožno nastaviť príznaky zmazania: %d\n"
 
-#: src/imap.c:6125
+#: src/imap.c:6136
 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"
@@ -5976,7 +6002,7 @@ msgid ""
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
 "Máte definovaný jeden alebo viac účtov IMAP. Avšak táto verzia Claws Mail "
-"bola zostavená bez podpory IMAP, vaše účty IMAP sú deaktivované.\n"
+"bola zostavená bez podpory IMAP, Vaše účty IMAP sú deaktivované.\n"
 "\n"
 "Pravdepodobne potrebujete nainštalovať knižnicu „libetpan” a znovu zostaviť "
 "Claws Mail."
@@ -6359,32 +6385,32 @@ msgstr "Vyberte súbor Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importovať súbor Pine do adresára"
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 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:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "%s zlyhal\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6392,28 +6418,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:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Autentifikácia zlyhala"
 
-#: 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: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
 msgid "Locked"
 msgstr "Správa je zamknutá"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:397
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr "Časový limit"
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6421,66 +6447,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:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru POP3: %s:%d..."
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d"
 
-#: src/inc.c:927
+#: src/inc.c:932
 #, 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:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Autentifikácia..."
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Prijímanie správ z %s (%s)..."
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6488,16 +6514,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:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Spojenie k %s:%d zlyhalo."
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty nastala chyba."
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6506,37 +6532,37 @@ msgstr ""
 "Pri spracovávaní pošty nastala chyba:\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "Nemožno zapisovať do súboru."
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba soketu pri pripojení k %s:%d."
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Vzdialený hostiteľ %s:%d ukončil spojenie."
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "Poštová schránka je zamknutá."
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6545,11 +6571,11 @@ msgstr ""
 "Poštová schránka je zamknutá:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "Autentifikácia zlyhala."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6558,7 +6584,7 @@ msgstr ""
 "Autentifikácia zlyhala:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6566,48 +6592,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:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Spojenie k %s:%d zlyhalo."
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1766
+#: 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
 msgid "seconds"
 msgstr "sekúnd"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minúta"
 msgstr[1] "minúty"
 msgstr[2] "minúty"
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodina"
 msgstr[1] "hodiny"
 msgstr[2] "hodín"
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, 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:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sPracujete odpojený. Pripojiť?"
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "_Len raz"
 
@@ -6960,20 +6986,18 @@ msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         prepne ladiaci mód"
 
 #: src/main.c:2081
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h              zobrazí tohoto pomocníka a ukončí program"
+msgid "  --help -h              display this help"
+msgstr "  --help -h              zobrazí tohoto pomocníka"
 
 #: src/main.c:2082
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           zobrazí informácie o verzii a ukončí program"
+msgid "  --version -v           output version information"
+msgstr "  --version -v           zobrazí informácie o verzii"
 
 #: src/main.c:2083
 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      zobrazí informácie o verzii, zabudovaných "
-"vlastnostiach a ukončí program"
+"  --version-full -V      zobrazí informácie o verzii a zabudovaných funkciách"
 
 #: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
@@ -7032,11 +7056,11 @@ msgstr "Správy vo fronte"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:3019
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: sieť je pripojená.\n"
 
-#: src/main.c:3025
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieť nie je pripojená.\n"
 
@@ -7798,7 +7822,7 @@ msgstr "Zostupne"
 msgid "_Auto detect"
 msgstr "_Automaticky zistiť"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr "Použiť značky..."
 
@@ -7968,7 +7992,7 @@ msgstr "Žiadne duplicitné správy v %d zložkách.\n"
 msgid "Select folder to go to"
 msgstr "Zvoľte zložku na prechod"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracovania použité pred pravidlami zložky"
 
@@ -7976,7 +8000,7 @@ msgstr "Pravidlá spracovania použité pred pravidlami zložky"
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracovania použité po pravidlách zložky"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
@@ -8321,8 +8345,8 @@ msgstr ""
 "\n"
 "  Správa bola odstránená alebo presunutá do inej zložky"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 
@@ -8434,7 +8458,7 @@ msgid "Go back to email"
 msgstr "Naspäť na správu"
 
 #: 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:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nemožno uložiť časť viacdielnej správy: %s"
@@ -8499,8 +8523,8 @@ msgstr "Zvoľte cieľovú zložku"
 msgid "'%s' is not a directory."
 msgstr "„%s” nie je zložka."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr "Uložiť ako"
 
@@ -8540,7 +8564,7 @@ msgid ""
 "Do you want to run this file?"
 msgstr ""
 "Táto príloha je spustiteľný súbor. Spúšťanie neznámych binárnych súborov je "
-"nebezpečné a môže spôsobiť kompromitovať váš počítač.\n"
+"nebezpečné a môže kompromitovať Váš počítač.\n"
 "\n"
 "Naozaj chcete spustiť tento súbor?"
 
@@ -8557,7 +8581,7 @@ msgstr "Typ:"
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: 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
 msgid "Description:"
@@ -8642,7 +8666,7 @@ msgid ""
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
 "Máte definovaný jeden alebo viac účtov News. Avšak táto verzia Claws Mail "
-"bola zostavená bez podpory News, vaše účty News sú deaktivované.\n"
+"bola zostavená bez podpory News, Vaše účty News sú deaktivované.\n"
 "\n"
 "Pravdepodobne potrebujete nainštalovať knižnicu „libetpan”, a znova zostaviť "
 "Claws Mail."
@@ -8668,6 +8692,77 @@ msgstr "Odhlásiť sa z diskusnej skupiny"
 msgid "Rename newsgroup folder"
 msgstr "Premenovať diskusnú zložku"
 
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr "Chýba autentifikačný kód OAuth2\n"
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr "Chyba spojenia OAuth2\n"
+
+#: src/oauth2.c:253 src/oauth2.c:367
+msgid "OAuth2 SSL connection error\n"
+msgstr "Chyba spojenia OAuth2 SSL\n"
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr "Prístupový token OAuth2 získaný\n"
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr "Prístupový token OAuth2 nezískaný\n"
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr "Obnovovací token OAuth2 získaný\n"
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "Obnovovací token OAuth2 nezískaný\n"
+
+#: src/oauth2.c:452
+msgid "OAuth2 socket write error\n"
+msgstr "Chyba zápisu soketu OAuth2\n"
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr "Uplynul časový limit socketu OAuth2 \n"
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr "Prístupový token OAuth2 stále platný\n"
+
+#: src/oauth2.c:534
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr "Získanie prístupového tokenu OAuth2 pomocou obnovovacieho tokenu\n"
+
+#: src/oauth2.c:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr "OAuth2 skúšanie platného prístupového tokenu s autentifikačným kódom\n"
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr "Prístupový token OAuth2 aktualizovaný\n"
+
+#: src/oauth2.c:583
+#, c-format
+msgid "OAuth2 original: %s\n"
+msgstr "Originál OAuth2: %s\n"
+
+#: src/oauth2.c:584
+#, c-format
+msgid "OAuth2 encoded: %s\n"
+msgstr "Kódovaný OAuth2: %s\n"
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr ""
+"Dekódovaný OAuth2: %s\n"
+"\n"
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr "Zadajte hlavnú tajnú vetu"
@@ -9627,7 +9722,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:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1616
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr "kB"
 
@@ -9696,7 +9791,7 @@ msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
 msgstr ""
-"Správy pochádzajúce od odosielateľov z vášho adresára budú doručené do "
+"Správy pochádzajúce od odosielateľov z Vášho adresára budú doručené do "
 "bežných zložiek aj v prípade, že budú identifikované ako spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
@@ -9918,7 +10013,7 @@ msgstr ""
 "zadanej zložke.\n"
 "\n"
 "Pretože tento zásuvný modul komunikuje s clamd pomocou soketu, existujú isté "
-"špeciálne minimálne požiadavky na práva vášho domovského adresára a "
+"špeciálne minimálne požiadavky na práva Vášho domovského adresára a "
 "adresára .claws-mail. Tieto adresáre musia povoľovať všetkým používateľom "
 "aspoň práva na vykonávanie (execute).\n"
 "\n"
@@ -10152,7 +10247,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:3924
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Proxy"
@@ -10204,7 +10299,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:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
+#: src/prefs_account.c:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "P_rehliadať"
@@ -10213,89 +10308,89 @@ msgstr "P_rehliadať"
 msgid "Select stylesheet"
 msgstr "Vyberte štýlopis"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr "Načítavanie vzdialeného obsahu je vypnuté."
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr "Načítať obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr "Zapnúť vzdialený obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr "Povoliť JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr "Povoliť zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr "Povoliť Java"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
 msgstr "Otvoriť odkazy v externom prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s je poškodený alebo nepodporovaný kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr "Hľadať na webe"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr "Otvoriť obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
 msgstr "Kopírovať odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
 msgstr "Stiahnuť odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr "Uložiť obrázok ako"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr "Kopírovať obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr "Importovať kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr "Vkusný"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr "Vkusný zobrazovač HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10521,7 +10616,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:1921
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
 msgid "Authentication"
 msgstr "Autentifikácia"
 
@@ -10579,7 +10674,7 @@ msgstr "Integrácia GData"
 #: 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"
 
@@ -10702,8 +10797,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: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:323 src/prefs_account.c:1697
+#: src/prefs_account.c:1855 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "hodín"
 
@@ -10784,11 +10879,11 @@ msgstr ""
 "používateľa. Nechajte prázdne na použitie predvolenej oranžovej ikony "
 "libravatar."
 
-#: src/plugins/libravatar/libravatar_prefs.c:397
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "Povoliť presmerov_ania na iné stránky"
 
-#: 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"
@@ -10796,23 +10891,23 @@ msgstr ""
 "Nasledovať odpovede presmerovania na iné služby avataru (napr. gravatar.com) "
 "prijaté zo servera libravatar"
 
-#: src/plugins/libravatar/libravatar_prefs.c:407
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "Povoliť _federalizované servery"
 
-#: 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 "Skúsiť získať avatar zo servera libravatar domény odosielateľa"
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr "Časový limit požiadavky"
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "sekunda(y)"
 
-#: 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."
@@ -10820,15 +10915,15 @@ msgstr ""
 "Nastavte na 0, aby bol použitý všeobecný časový limit V/V soketu. Maximálna "
 "hodnota musí byť tiež menšia ako je všeobecný  časový limit V/V soketu."
 
-#: src/plugins/libravatar/libravatar_prefs.c:472
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Vyrovnávacia pamäť ikon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:476
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "Predvolený režim chýbajúcej ikony"
 
-#: src/plugins/libravatar/libravatar_prefs.c:480
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Sieť"
 
@@ -10959,7 +11054,7 @@ msgstr "Metóda auth nie je dostupná"
 msgid "sending error on Sieve session: %s\n"
 msgstr "chyba odoslania v relácii Sieve: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
 msgid "_Filter"
 msgstr "_Filtrovať"
 
@@ -11016,7 +11111,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s – Filter Sieve%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 "Načítanie..."
 
@@ -11087,7 +11182,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:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr "Informácie o servere"
 
@@ -11139,28 +11234,28 @@ msgstr "Zadať autentifikáciu"
 
 #: 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:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 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: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/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
 msgid "Password"
 msgstr "Heslo"
 
-#: 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:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr "Metóda autentifikácie"
 
-#: 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/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
 msgid "Automatic"
 msgstr "Automatické"
@@ -11802,95 +11897,95 @@ msgstr "Formát:"
 msgid "Optimized:"
 msgstr "Optimalizované:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "Vlastnosti PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "Zadajte heslo"
 
-#: 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 "Tento dokument je zamknutý a na otvorenie vyžaduje heslo."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1387
 #, c-format
 msgid "%s Document"
 msgstr "Dokument %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
 msgstr "z %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 "Spracovanie PDF zlyhalo z neznámeho dôvodu."
 
-#: 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 "Obsah dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "Prvá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr "Predošlá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "Ďalšia strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "Posledná strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "Zväčšiť"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "Zmenšiť"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "Celá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "Celá šírka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "Otočiť vľavo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "Otočiť vpravo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "Vytlačiť dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "Informácie o dokumente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "Číslo strany"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "Mierka"
 
-#: 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 +11998,13 @@ msgstr ""
 "\n"
 "Akákoľvek spätná väzba je vítaná: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c: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 "Zobrazovať PDF"
 
-#: 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 "
@@ -11961,19 +12056,30 @@ msgstr "Prosím, zadajte heslo pre:"
 msgid "Bad passphrase.\n"
 msgstr "Neplatné heslo.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Import kľúča"
 
-#: 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 and import it?"
 msgstr ""
-"Tento kľúč nie je vo vašom zväzku kľúčov. Chcete, aby sa Claws Mail pokúsil "
-"importovať ho z kľúčového serveru?"
+"Tento kľúč nie je vo Vašej kľúčenke. Chcete, aby sa Claws Mail pokúsil "
+"importovať ho?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "_No"
+msgstr "_Nie"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "z kľúčového servera"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr "z Web Key Directory"
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
@@ -11981,15 +12087,15 @@ msgstr ""
 "\n"
 "  ID kľúča "
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid "   This key is not in your keyring.\n"
-msgstr "   Tento kľúč nie je vo vašom zväzku kľúčov.\n"
+msgstr "   Tento kľúč nie je vo Vašej kľúčenke.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   Malo by byť možné importovať ho "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -11997,17 +12103,17 @@ msgstr ""
 "pri práci online,\n"
 "   alebo "
 
-#: 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 ""
-"pomocou tohoto príkazu: \n"
+"pomocou niektorého z nasledujúcich príkazov: \n"
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -12015,31 +12121,29 @@ msgstr ""
 "\n"
 "  Importujem ID kľúča "
 
-#: 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 "   Tento kľúč bol naimportovaný do vášho zväzku.\n"
+msgstr "   Tento kľúč bol importovaný do Vašej kľúčenky.\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 "   Tento kľúč nebol importovaný do vášho zväzku.\n"
+msgstr "   Tento kľúč nebol importovaný do Vašej kľúčenky.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
-msgstr "   Kľúčové servery môžu niekedy byť pomalé.\n"
+msgstr "   Kľúčové servery sú niekedy pomalé.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Môžete sa pokúsiť naimportovať ho ručne pomocou príkazu:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
+msgstr "   Môžete sa pokúsiť naimportovať ho ručne pomocou príkazu:"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr "alebo"
+
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
-msgstr "   Tento kľúč je vo vašom zväzku kľúčov.\n"
+msgstr "   Tento kľúč je vo Vašej kľúčenke.\n"
 
 #: src/plugins/pgpcore/plugin.c:37
 msgid "PGP/Core"
@@ -12078,7 +12182,7 @@ msgstr "Automaticky overovať podpisy"
 
 #: src/plugins/pgpcore/prefs_gpg.c:145
 msgid "Use keyring for address autocompletion"
-msgstr "Použiť na dokončovanie adries kľúčenku GPG"
+msgstr "Použiť na dokončovanie adries kľúčenku"
 
 #: src/plugins/pgpcore/prefs_gpg.c:150
 msgid "Use gpg-agent to manage passwords"
@@ -12097,8 +12201,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:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minút"
 
@@ -12134,7 +12238,7 @@ msgstr "Použiť predvolený kľúč GnuPG"
 
 #: src/plugins/pgpcore/prefs_gpg.c:377
 msgid "Select key by your email address"
-msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
+msgstr "Zvoliť kľúč podľa Vašej emailovej adresy"
 
 #: src/plugins/pgpcore/prefs_gpg.c:388
 msgid "Specify key manually"
@@ -12463,7 +12567,7 @@ msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
-"Prebieha generácia vášho nového páru kľúčov... Prosím, pohybujte myšou, aby "
+"Prebieha generácia Vášho nového páru kľúčov... Prosím, pohybujte myšou, aby "
 "ste zvýšili entropiu v systéme..."
 
 #: src/plugins/pgpcore/sgpgme.c:1012
@@ -12718,8 +12822,8 @@ msgstr "Zobraziť konzolu Python..."
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: 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/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
 msgid "Browse"
 msgstr "Prechádzať"
@@ -13042,7 +13146,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: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/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dní"
 
@@ -13149,7 +13253,7 @@ msgstr "Cesta k súboru cookies"
 
 #: src/plugins/rssyl/rssyl_prefs.c:184
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
-msgstr "Cesta k súboru cookies.txt obsahujúcemu vaše cookies v štýle Netscape"
+msgstr "Cesta k súboru cookies.txt obsahujúcemu Vaše cookies v štýle Netscape"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Refreshing"
@@ -13737,45 +13841,45 @@ msgstr "Nezáväzne prijať"
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr "Máte položku ToDo."
 
-#: 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:718
 msgid "Details follow:"
 msgstr "Detaily:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "Vytvorili ste stretnutie."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr "Boli ste pozvaný na stretnutie."
 
-#: 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 "Stretnutie, na ktoré ste boli pozvaný, bolo zrušené."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr "Boli ste poslaný na stretnutie."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr "(opakovaná udalosť)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr "(táto udalosť je časťou opakovanej udalosti)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Prijali ste odpoveď na neznámu ponuku na stretnutie."
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13784,35 +13888,35 @@ msgstr ""
 "Prijali ste odpoveď na ponuku na stretnutie.\n"
 "%s je %s pozvaný s týmito podrobnosťami:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr "Chyba: Nemožno získať MIME časť kalendára."
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr "Chyba: Nenájdená kalendárová časť."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr "Chyba: Neznámy typ kalendárového komponentu."
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
 msgstr "Poslať upozornenie účastníkom"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr "Zrušiť stretnutie"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Naozaj chcete zrušiť toto stretnutie?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr "Účet nenájdený"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13820,68 +13924,68 @@ msgstr ""
 "Nemáte účet, ktorý zodpovedá tomuto účastníkovi.\n"
 "Chcete napriek tomu odpovedať?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr "Odpovedať i tak"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr "Odpovedať"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr "Upraviť stretnutie..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr "Zrušiť stretnutie..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr "Pozrieť webovú stránku"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr "V tej dobe ste obsadený."
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Udalosť:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Miesto:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Zhrnutie:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr "Začiatok:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr "Koniec:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Účastníci:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr "Akcia:"
 
@@ -14503,95 +14607,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:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "Chyba protokolu POP\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neplatná UIDL odpoveď: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Odstraňujem starú správu %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Preskakujem správu %d [%s] (%d B)\n"
 
-#: src/pop.c:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "poštová schránka je zamknutá\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "Čas spojenia vypršal\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "príkaz nie je podporovaný\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "nastala chyba relácie POP\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "Príkaz TOP nie je podporovaný\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Lokálna schránka mbox"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr "Žiadne (len SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr "Názov účtu"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
 msgstr "Nastaviť ako predvolené"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr "Osobné informácie"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr "Celé meno"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
 msgstr "Emailová adresa"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "Automatická konfigurácia"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14599,77 +14703,81 @@ msgstr ""
 "Varovanie: táto verzia Claws Mail\n"
 "bola zostavená bez podpory protokolu IMAP a News."
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentifikáciu"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr "Autentifikovať pri pripojení"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr "Lokálna poštová schránka"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr "Použiť príkaz miesto SMTP serveru"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr "príkaz na odosielanie pošty"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr "Lokálne"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr "Predvolený inbox"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované správy budú umiestnené v tejto zložke"
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
-msgstr "Použiť bezpečnú autentifikáciu (APOP)"
+#: src/prefs_account.c:1634
+msgid "Authenticate before POP connection"
+msgstr "Autentifikovať pred pripojením POP"
+
+#: src/prefs_account.c:1658 src/prefs_account.c:2259
+msgid "Select"
+msgstr "Zvoliť"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na servere po ich prijatí"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr "Vymazať po"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dní a 0 hodín: mazať ihneď"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr "Prijať správu veľkú najviac"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14677,94 +14785,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:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr "Maximálny počet príspevkov na stiahnutie"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr "neobmedzené, ak je zadané 0"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr "Zložka servera IMAP"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr "(zväčša prázdne)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1831
 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:1730
+#: src/prefs_account.c:1833
 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:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatická kontrola"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr "Použiť globálne nastavenia"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Automaticky kontrolovať novú poštu každých"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtrovať správy pri prijatí aj pomocou zásuvných modulov"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1908
 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:1894 src/prefs_customheader.c:210
+#: 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
 msgid "Header"
 msgstr "Hlavička"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr "Generovať hlavičku Message-ID"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
 msgstr "Poslať emailovú adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr "Pridať hlavičku „user agent”"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr "Pridať používateľom definované hlavičky"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentifikácia SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14772,171 +14880,217 @@ 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:2033
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr "Autentifikovať cez POP pred odosielaním"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr "Časový limit autentifikácie POP"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2233
+msgid "Authorization"
+msgstr "Autorizácia"
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr "Zvoľte Poskytovateľa OAuth2 emailovej služby"
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr "ID klienta"
+
+#: src/prefs_account.c:2296
+msgid "Client secret"
+msgstr "Heslo klienta"
+
+#: src/prefs_account.c:2328
+msgid "Obtain authorization code"
+msgstr "Získať autorizačný kód"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr "Otvoriť predvolený prehliadač s požiadavkou"
+
+#: src/prefs_account.c:2338
+msgid "Copy link"
+msgstr "Kopírovať odkaz"
+
+#: src/prefs_account.c:2350
+msgid "Authorization code"
+msgstr "Autorizačný kód"
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr ""
+"Prekopírujte kompletnú URL z prehliadača alebo poskytnutý autentifikačný "
+"token"
+
+#: src/prefs_account.c:2364
+msgid "Complete authorization"
+msgstr "Dokončiť autorizáciu"
+
+#: src/prefs_account.c:2368
+msgid "Authorize"
+msgstr "Autororizovať"
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
 msgstr "Automaticky vložiť podpis"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr "Slovníky kontroly preklepov"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Predvolený slovník"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Prednastavený alternatívny slovník"
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Nová"
 
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: 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
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr "Predvolený systém súkromia"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "Vždy podpisovať správy"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "Vždy šifrovať správy"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2792
 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:2476
+#: src/prefs_account.c:2795
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Vždy šifrovať odpoveď na šifrovanú správu"
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2798
 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:2481
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť odoslané zašifrované správy ako prostý text"
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
 msgid "Don't use SSL/TLS"
 msgstr "Nepoužívať SSL/TLS"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: 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 "Použiť SSL/TLS"
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Použiť príkaz STARTTLS na vytvorenie šifrovanej relácie"
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:3004
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívať SSL/TLS (v prípade potreby použiť STARTTLS)"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr "Certifikáty klienta"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr "Certifikát na prijímanie"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 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:2732
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr "Certifikát na odosielanie"
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Automaticky akceptovať platné certifikáty SSL/TLS"
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr "Použiť neblokujúce SSL/TLS"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3106
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "Vypnite túto voľbu ak máte problémy pri spojeniach SSL/TLS"
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Použiť proxy server"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3207
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Použiť predvolené nastavenia"
 
-#: src/prefs_account.c:2890
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
 msgstr "Použiť globálne nastavenia proxy servera"
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Použiť autentifikáciu"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Používateľské meno"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
 msgstr "Na odosielanie použiť proxy server"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14944,27 +15098,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:3079
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr "Doménové meno"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14972,148 +15126,152 @@ msgstr ""
 "Názov domény bude použitý na generovanie Message-ID, a pri pripájaní k "
 "serverom SMTP."
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz na komunikáciu so serverom"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3451
 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:3185
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr "Uložiť správy do fronty"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov účtu."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná emailová adresa."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr "Nebolo zadané ID používateľa."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr "Nebol zadaný POP server."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr "Predvolená zložka doručených správ neexistuje."
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr "Nebol zadaný IMAP server."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3626
 msgid "local mailbox filename is not entered."
 msgstr "Nebol zadaný názov lokálnej schránky."
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
 msgstr "Nebol zadaný príkaz na odosielanie pošty."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3642
 msgid "User ID cannot contain a newline character."
 msgstr "ID používateľa nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3647
 msgid "Password cannot contain a newline character."
 msgstr "Heslo nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3678
 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:3361
+#: src/prefs_account.c:3683
 msgid "SMTP password cannot contain a newline character."
 msgstr "Heslo SMTP nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr "nie je zadaná doména."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr "nie je zvolená zložka odoslaných."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr "nie je zvolená zložka fronty."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr "nie je zvolená zložka konceptov."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "nie je zvolená zložka koša."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablóny"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr "Nastavenie nového účtu"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s – Nastavenie účtu"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Zlyhalo (zlá adresa)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr "Vyberte súbor so podpisom"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Zvoľte súbor certifikátu"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (zásuvný modul nie je načítaný)"
@@ -15382,7 +15540,7 @@ msgstr ""
 "t{Komu: %t\\n}?c{Cc: %c\\n}?n{Diskusné skupiny: %n\\n}?s{Predmet: %s\\n}\\n"
 "\\n%M"
 
-#: src/prefs_common.c:456
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15606,8 +15764,8 @@ msgstr ""
 "Toto nastavenie umožňuje zobraziť MIME časti v zobrazení správy pomocou "
 "skriptu, pri použití voľby „Zobraziť ako text” z kontextového menu"
 
-#: 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:180
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Zobrazenie správy"
 
@@ -16144,27 +16302,43 @@ msgstr "Písma"
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Automaticky zobraziť priložené obrázky"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr "Predvolene prispôsobiť veľkosť obrázkových príloh"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
 msgstr "Kliknutie na obrázok prepína mierku"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:96
+msgid "Fit image"
+msgstr "Celý obrázok"
+
+#: src/prefs_image_viewer.c:99
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "Kliknutie na obrázok prepína vyplnenie výšky/šírky"
+
+#: src/prefs_image_viewer.c:102
+msgid "Height"
+msgstr "Výška"
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr "Šírka"
+
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr "Zobraziť obrázky priamo v tele správy"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr "Tlačiť obrázky"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr "Zobrazovač obrázkov"
 
@@ -16368,11 +16542,11 @@ msgstr "telo správy"
 msgid "whole message"
 msgstr "celá správa"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr "Označená"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr "Zmazaná"
 
@@ -16380,11 +16554,11 @@ msgstr "Zmazaná"
 msgid "Replied"
 msgstr "Odpovedaná"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr "Poslané ďalej"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "Spam"
@@ -16393,7 +16567,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Má prílohu"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr "Podpísané"
 
@@ -16673,83 +16847,91 @@ msgstr ""
 msgid "Current condition rules"
 msgstr "Aktuálne pravidlá"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Hlavičky"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "Zobraziť panel s hlavičkami nad správou"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr "Zobraziť (X-)Face v zobrazení správy"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "Uložiť (X-)Face v adresári, ak je to možné"
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr "Zobraziť Face v zobrazení správy"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr "Uložiť Face v adresári, ak je to možné"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "Zobraziť hlavičky v správe"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "HTML správy"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "Vykresľovať HTML správy ako text"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Zobraziť HTML správy pomocou zásuvného modulu, ak je to možné"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Zvoliť HTML časť zložených/alternatívnych správ"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Medzera medzi riadkami"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "pixely"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Posúvanie"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Pol stránky"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Plynulé posúvanie"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Posun"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Zobraziť popisy príloh miesto ich názvov"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Citácia"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Zbaliť citovaný text po dvojkliku"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Za úvodzovky považovať tieto znaky"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Textové možnosti"
 
@@ -17111,7 +17293,7 @@ msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr ""
-"Štandardné hlavičky (ako „From:”, „Subject:”) budú preložené do vášho jazyka."
+"Štandardné hlavičky (ako „From:”, „Subject:”) budú preložené do Vášho jazyka."
 
 #: src/prefs_other.c:592
 msgid "Ask before emptying trash"
@@ -17413,8 +17595,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:520 src/send_message.c:524
-#: src/send_message.c:529
+#: src/prefs_send.c:420 src/send_message.c:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "Odosielanie"
 
@@ -18211,7 +18393,7 @@ msgstr "Neboli definované žiadne kľúče príjemcov."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba pri dekódovaní BASE64]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr "Nemožno dekódovať časť"
 
@@ -18322,11 +18504,11 @@ msgstr "poloha kurzora"
 
 #: src/quote_fmt.c:69
 msgid "account property: your name"
-msgstr "nastavenie účtu: vaše meno"
+msgstr "nastavenie účtu: Vaše meno"
 
 #: src/quote_fmt.c:70
 msgid "account property: your email address"
-msgstr "nastavenie účtu: vaša emailová adresa"
+msgstr "nastavenie účtu: Vaša emailová adresa"
 
 #: src/quote_fmt.c:71
 msgid "account property: account name"
@@ -18565,88 +18747,88 @@ msgstr "Zadajte text, ktorým má nahradiť „%s”"
 msgid "Enter variable"
 msgstr "Zadajte premennú"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Odosielam správu pomocou príkazu: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nemožno vykonať príkaz: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Pri odosielaní správy nastala chyba: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "Robím POP pred SMTP..."
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "POP pred SMTP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, 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:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "Správa bola odoslaná úspešne."
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "Posielam HELO..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "Autentifikácia"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "Odosielam správu..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "Odosielam EHLO..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "Odosielam MAIL FROM..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "Odosielam RCPT TO..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "Odosielam DATA..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "Odpájam sa..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "Odosielam správu"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18947,11 +19129,11 @@ msgstr "Od: %s, na %s"
 msgid "To: %s, on %s"
 msgstr "Komu: %s, na %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr "Nie ste autorom tohoto príspevku."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4574
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -18959,83 +19141,83 @@ msgstr[0] "Naozaj chcete zmazať zvolenú správu?"
 msgstr[1] "Naozaj chcete zmazať %d zvolené správy?"
 msgstr[2] "Naozaj chcete zmazať %d zvolených správ?"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Zmazať správu"
 msgstr[1] "Zmazať správy"
 msgstr[2] "Zmazať správy"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr "Cieľ je rovnaký ako aktuálna zložka."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4796
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Zvoľte zložku na presun správy"
 msgstr[1] "Zvoľte zložku na presun správ"
 msgstr[2] "Zvoľte zložku na presun správ"
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr "Cieľ kopírovania je rovnaký ako aktuálna zložka."
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4881
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Zvoľte zložku na kopírovanie správy"
 msgstr[1] "Zvoľte zložku na kopírovanie správ"
 msgstr[2] "Zvoľte zložku na kopírovanie správ"
 
-#: src/summaryview.c:5036
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr "Pripojiť alebo prepísať"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr "Pripojiť alebo prepísať existujúci súbor?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr "Pri_pojiť"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr "_Prepísať"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemožno uložiť súbor „%s”."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5090
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Chystáte sa vytlačiť %d správ, jednu po druhej. Prajete si pokračovať?"
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr "Preskočiť tieto pravidlá"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5799
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Použiť tieto pravidlá bez ohľadu na to, ku ktorému účtu patria"
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5802
 msgid "Apply these rules if they apply to the current account"
 msgstr "Použiť tieto pravidlá bez ohľadu na to, či patria k aktívnemu účtu"
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr "Filtrovanie"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19043,71 +19225,71 @@ msgstr ""
 "Niektoré pravidlá patria konkrétnemu účtu.\n"
 "Prosím vyberte si, ako pristupovať k týmto pravidlám:"
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr "Nastavenie spracovania"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6095
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "Naozaj chcete resetovať farebnú menovku všetkých zvolených správ?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6097
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr "Naozaj chcete použiť túto farebnú menovku na všetky zvolené správy?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Reset color label"
 msgstr "Obnoviť menovku farby"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Set color label"
 msgstr "Nastaviť farebnú menovku"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr "Ignorované vlákno"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr "Sledované vlákno"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpovedané, ale aj presmerované – kliknite na zobrazenie odpovede"
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr "Odpovedané – kliknite na zobrazenie odpovede"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr "Presunuté"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr "Skopírované"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr "Podpísané, má prílohu(y)"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr "Zašifrované, má prílohu(y)"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr "Zašifrované"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr "Má prílohu(y)"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19116,11 +19298,11 @@ msgstr ""
 "Chyba v regulárnom výraze:\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8402
 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:8403
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr "Prejsť naspäť na zoznam zložiek"
 
@@ -19765,7 +19947,7 @@ msgstr "Prosím, zadajte svoje meno a emailovú adresu."
 
 #: src/wizard.c:660
 msgid "Please enter your receiving server and username."
-msgstr "Prosím, zadajte váš server príchodzej pošty, a používateľské meno."
+msgstr "Prosím, zadajte svoj server príchodzej pošty, a používateľské meno."
 
 #: src/wizard.c:670
 msgid "Please enter your username."
@@ -19896,9 +20078,9 @@ msgid ""
 "common mail options so that you can start to use Claws Mail in less than "
 "five minutes."
 msgstr ""
-"Víta vás sprievodca nastavením Claws Mail.\n"
+"Víta Vás sprievodca nastavením Claws Mail.\n"
 "\n"
-"Začneme získaním základných údajov o vás, a vašich poštových nastaveniach, "
+"Začneme získaním základných údajov o Vás a Vašich poštových nastaveniach, "
 "aby ste mohli začať Claws Mail používať za menej ako päť minút."
 
 #: src/wizard.c:1842
@@ -19932,3 +20114,6 @@ msgid ""
 msgstr ""
 "Program Claws Mail je pripravený.\n"
 "Kliknite na Uložiť a začnite."
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Použiť bezpečnú autentifikáciu (APOP)"
diff --git a/po/tr.po b/po/tr.po
index a89ff0d7f..a80b09e9b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,14 +1,14 @@
 # Turkish translation of Claws Mail.
-# Copyright (C) 1999-2020 The Claws Mail Team
+# Copyright (C) 1999-2021 The Claws Mail Team
 # This file is distributed under the same license as the Claws Mail package.
-# Numan Demirdöğen <if.gnu.linux at gmail.com>, 2016-2020.
+# Numan Demirdöğen <if.gnu.linux at gmail.com>, 2016-2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.17.4git18\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2020-09-13 20:02+0300\n"
-"PO-Revision-Date: 2020-09-13 21:15+0300\n"
+"POT-Creation-Date: 2021-07-03 22:29+0300\n"
+"PO-Revision-Date: 2021-07-07 20:45+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"
@@ -56,48 +56,48 @@ msgstr "Uzak dizine sahip hesaplar kopyalanamaz."
 msgid "Copy of %s"
 msgstr "%s hesabının kopyası"
 
-#: src/account.c:1125
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "'%s' hesabını silmek istediğinizden emin misiniz?"
 
-#: src/account.c:1127
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr "(Başlıksız)"
 
-#: src/account.c:1128
+#: src/account.c:1129
 msgid "Delete account"
 msgstr "Hesabı sil"
 
-#: src/account.c:1602
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1608
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Posta Al' seçilen hesaplardan posta alır"
 
-#: 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/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
 #: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: 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
 msgid "Name"
 msgstr "İsim"
 
-#: src/account.c:1623 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Sunucu"
 
@@ -148,7 +148,8 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5277 src/compose.c:5282 src/ldaputil.c:333
+#: 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/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -415,12 +416,12 @@ msgid "_Book"
 msgstr "_Defter"
 
 #: 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/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: src/addressbook.c:407 src/compose.c:619 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "_Araçlar"
@@ -453,14 +454,14 @@ msgstr "_Defteri düzenle"
 msgid "_Delete book"
 msgstr "_Defteri sil"
 
-#: src/addressbook.c:426 src/compose.c:631
+#: src/addressbook.c:426 src/compose.c:632
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Kaydet"
 
-#: src/addressbook.c:427 src/compose.c:635 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
@@ -475,13 +476,13 @@ msgid "C_ut"
 msgstr "K_es"
 
 #: 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/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopyala"
 
 #: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Yapıştır"
 
@@ -803,7 +804,7 @@ msgid "Person"
 msgstr "Kişi"
 
 #: 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/folderview.c:449 src/prefs_account.c:3468 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Dizin"
 
@@ -927,18 +928,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:144 src/compose.c:9810
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr "Not"
 
-#: 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/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:5091
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5808 src/inc.c:726
+#: 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
 msgid "Error"
 msgstr "Hata"
@@ -1057,36 +1058,36 @@ 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:1238
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "SSL/TLS iletişimi başarısız oldu\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "SMTP AUTH yöntemi mevcut değil\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Seçilen SMTP AUTH yöntemi mevcut değil\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "kötü SMTP tepkisi\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP oturumunda hata meydana geldi\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "kimlik doğrulamada hata meydana geldi\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, 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:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "STARTTLS oturumu başlatılamadı\n"
 
@@ -1223,217 +1224,217 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Pazar"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Salı"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: src/common/utils.c:4056
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Cuma"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Ocak"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Şubat"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Mart"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Nisan"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayıs"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Haziran"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Temmuz"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Ağustos"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Eylül"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Ekim"
 
-#: src/common/utils.c:4069
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Kasım"
 
-#: src/common/utils.c:4070
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Aralık"
 
-#: src/common/utils.c:4072
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Paz"
 
-#: src/common/utils.c:4073
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Pzt"
 
-#: src/common/utils.c:4074
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Sal"
 
-#: src/common/utils.c:4075
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Çar"
 
-#: src/common/utils.c:4076
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Per"
 
-#: src/common/utils.c:4077
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Cum"
 
-#: src/common/utils.c:4078
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Cmt"
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Oca"
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Şub"
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4083
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Nis"
 
-#: src/common/utils.c:4084
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "May"
 
-#: src/common/utils.c:4085
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Haz"
 
-#: src/common/utils.c:4086
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Tem"
 
-#: src/common/utils.c:4087
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ağu"
 
-#: src/common/utils.c:4088
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Eyl"
 
-#: src/common/utils.c:4089
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Eki"
 
-#: src/common/utils.c:4090
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Kas"
 
-#: src/common/utils.c:4091
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Ara"
 
-#: src/common/utils.c:4102
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "ÖÖ"
 
-#: src/common/utils.c:4103
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ÖS"
 
-#: src/common/utils.c:4104
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "öö"
 
-#: src/common/utils.c:4105
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "ös"
 
-#: src/compose.c:195
+#: src/compose.c:198
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1445,361 +1446,361 @@ msgstr ""
 "\n"
 "İmzalama ve şifreleme bu e-posta için iptal edildi."
 
-#: src/compose.c:603
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Ekle..."
 
-#: src/compose.c:604 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: src/compose.c:606 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Özellikler..."
 
-#: src/compose.c:613 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "_İleti"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "_İmlâ"
 
-#: src/compose.c:618 src/compose.c:685
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Seçenekler"
 
-#: src/compose.c:620 src/mainwindow.c:528 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
 msgid "_Help"
 msgstr "_Yardım"
 
-#: src/compose.c:622
+#: src/compose.c:623
 msgid "S_end"
 msgstr "_Gönder"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "Sonra _gönder"
 
-#: src/compose.c:626
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "Dosya _iliştir"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "Dosya _ekle"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "İmza _ekle"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "İmzayı _değiştir"
 
-#: src/compose.c:633
+#: src/compose.c:634
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Geri al"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Tekrarla"
 
-#: src/compose.c:642 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Ke_s"
 
-#: src/compose.c:646
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "Özel _yapıştır"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Alıntı _olarak"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "_Katlanmış"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "_Katlanmamış"
 
-#: src/compose.c:651 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Hepsini _seç"
 
-#: src/compose.c:653
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "_Gelişmiş"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Bir harf geri git"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Bir harf ileri git"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Bir kelime geri git"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Bir kelime ileri git"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Satır başına git"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Satır sonuna git"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Önceki satıra git"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Sonraki satıra git"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Bir önceki harfi sil"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Bir sonraki harfi sil"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Bir önceki kelimeyi sil"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Bir sonraki kelimeyi sil"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Satırı sil"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Satır sonuna kadar sil"
 
-#: src/compose.c:670 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Ara"
 
-#: src/compose.c:673
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "_Mevcut paragrafı katla"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Tüm uzun satırları _katla"
 
-#: src/compose.c:676
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "_Harici metin düzenleyici ile aç"
 
-#: src/compose.c:679
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "_Hepsini ya da seçileni denetle"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "_Tüm yanlış yazılan kelimeleri vurgula"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "Yanlış yazılan kelimeyi _geriye doğru denetle"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "_Bir sonraki yanlış yazılan kelimeye ilerle"
 
-#: src/compose.c:689
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "Çevaplama _biçimi"
 
-#: src/compose.c:691
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "Gizlilik _Sistemi"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "_Öncelik"
 
-#: src/compose.c:697 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "Karakter _kodlaması"
 
-#: src/compose.c:702 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "Batı Avrupa"
 
-#: src/compose.c:703 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "Baltık"
 
-#: src/compose.c:704 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "İbranice"
 
-#: src/compose.c:705 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "Arapça"
 
-#: src/compose.c:706 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "Kiril"
 
-#: src/compose.c:707 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "Japonca"
 
-#: src/compose.c:708 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "Çince"
 
-#: src/compose.c:709 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "Korece"
 
-#: src/compose.c:710 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "Tayca"
 
-#: src/compose.c:713 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "_Adres defteri"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "_Template"
 msgstr "Şab_lon"
 
-#: src/compose.c:717 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "_Eylemler"
 
-#: src/compose.c:721 src/mainwindow.c:825 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
 msgid "_About"
 msgstr "_Hakkında"
 
-#: src/compose.c:726
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "_Otomatik katlama"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Otomatik _girinti"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "İm_zala"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "Şif_rele"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "_Okundu Bilgisi İste"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "Referansları _kaldır"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "Cetveli _göster"
 
-#: src/compose.c:737 src/compose.c:747
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:738 src/mainwindow.c:674 src/messageview.c:305
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
 #: src/summaryview.c:433
 msgid "_All"
 msgstr "_Hepsini"
 
-#: src/compose.c:739 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_Sender"
 msgstr "_Gönderene"
 
-#: src/compose.c:740
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "_E-posta listesi"
 
-#: src/compose.c:745
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "_En yüksek"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "_Yüksek"
 
-#: src/compose.c:748
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "_Düşük"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "En _düşük"
 
-#: src/compose.c:754 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "_Otomatik"
 
-#: src/compose.c:755 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:756 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:760 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:763 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:768 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:1055
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr "Yeni iletide Gönderen biçimi hatası"
 
-#: src/compose.c:1148
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr "Yeni iletide başlık biçimi hatası"
 
-#: src/compose.c:1180 src/quote_fmt.c:563
+#: src/compose.c:1181 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "\"Yeni ileti\" şablonu gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:1449
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Cevaplanamıyor. Asıl e-posta muhtemelen mevcut değil."
 
-#: src/compose.c:1634 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1807,12 +1808,12 @@ msgstr ""
 "\"Cevapla\" şablonunun \"Gönderen\" bölümü geçersiz bir e-posta adresi "
 "barındırıyor."
 
-#: src/compose.c:1683 src/quote_fmt.c:583
+#: src/compose.c:1684 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "\"Cevapla\" şablonu gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:1824 src/compose.c:2025 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1820,55 +1821,55 @@ msgstr ""
 "\"Yönlendir\" şablonunun \"Gönderen\" bölümü geçersiz bir e-posta adresi "
 "barındırıyor."
 
-#: src/compose.c:1885 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "\"Yönlendir\" şablonu gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:2068
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
 msgstr "Yön: birçok e-posta"
 
-#: src/compose.c:2577
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "\"Yeniden Yönlendir\" şablonu gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:2648 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2651 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2654 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Yanıtla:"
 
-#: src/compose.c:2657 src/compose.c:5026 src/compose.c:5028
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Haber grubu:"
 
-#: src/compose.c:2660 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Takiben:"
 
-#: src/compose.c:2663 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Yanıt-Olarak:"
 
-#: src/compose.c:2667 src/compose.c:5023 src/compose.c:5031
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Alıcı:"
 
-#: src/compose.c:2857
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Dosya iliştirilemedi (karakter seti dönüştürmede hata)."
 
-#: src/compose.c:2863
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1880,16 +1881,16 @@ msgstr[0] ""
 "İliştirilen dosya(lar): \n"
 "%s"
 
-#: src/compose.c:3143
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Şablonun \"Alıntı işareti\" geçersiz."
 
-#: src/compose.c:3672
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "'%s' dosyasının boyutu alınamadı."
 
-#: src/compose.c:3690
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1898,57 +1899,57 @@ msgstr ""
 "İleti gövdesine %s boyutunda bir dosya eklemek üzeresiniz. Bunu yapmak "
 "istediğinizden emin misiniz?"
 
-#: src/compose.c:3693
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr "Emin misiniz?"
 
-#: src/compose.c:3694 src/compose.c:10859 src/compose.c:11753
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr "_Ekle"
 
-#: src/compose.c:3819
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:3820
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr "Boş dosya"
 
-#: src/compose.c:3821
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr "_Yine de iliştir"
 
-#: src/compose.c:3830
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamıyor."
 
-#: src/compose.c:3857
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:4867 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Düzenlendi]"
 
-#: src/compose.c:4874 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - İleti yaz%s"
 
-#: src/compose.c:4877 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[başlık yok] - İleti yaz%s"
 
-#: src/compose.c:4879 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "İleti yaz"
 
-#: src/compose.c:4906 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1956,60 +1957,60 @@ msgstr ""
 "E-postayı gönderecek hesap seçilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı seçin."
 
-#: src/compose.c:5123 src/compose.c:5160
+#: src/compose.c:5126 src/compose.c:5163
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 "Alıcı olarak tek öntanımlı '%s' adresi girilmiş. Yine de gönderilsin mi?"
 
-#: src/compose.c: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: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
 msgid "Send"
 msgstr "Gönder"
 
-#: 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/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
 msgid "_Send"
 msgstr "_Gönder"
 
-#: src/compose.c:5181
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:5196
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Başlık boş bırakılmış. %s"
 
-#: src/compose.c:5197 src/compose.c:5240
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "Yine de gönderilsin mi?"
 
-#: src/compose.c:5198 src/compose.c:5241
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "Yine de kuyruğa eklensin mı?"
 
-#: src/compose.c:5200 src/compose.c:5243 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/compose.c:5201 src/compose.c:5244
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr "_Kuyruğa ekle"
 
-#: src/compose.c:5239
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "%d adet alıcıya gönderiliyor. %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5271
 msgid "Could not queue message."
 msgstr "İleti kuyruğa eklenemedi."
 
-#: src/compose.c:5271
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2020,7 +2021,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5275
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2031,7 +2032,7 @@ msgstr ""
 "\n"
 "İmzalama başarısız oldu: %s"
 
-#: src/compose.c:5280
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2042,7 +2043,7 @@ msgstr ""
 "\n"
 "Şifreleme başarısız oldu: %s"
 
-#: src/compose.c:5285
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2052,7 +2053,7 @@ msgstr ""
 "\n"
 "Karakter seti dönüştürmesi başarısız oldu."
 
-#: src/compose.c:5289
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2062,7 +2063,7 @@ msgstr ""
 "\n"
 "Alıcının şifreleme anahtarı alınamadı."
 
-#: src/compose.c:5352 src/compose.c:5412
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2070,7 +2071,7 @@ msgstr ""
 "İleti kuyruğa eklenmesine rağmen gönderilemedi.\n"
 "Ana pencereden \"Kuyruktaki iletileri gönder\"i kullanarak tekrar deneyin."
 
-#: src/compose.c:5408
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
@@ -2079,7 +2080,7 @@ msgstr ""
 "%s\n"
 "Ana pencereden \"Kuyruktaki iletileri gönderi\"i kullanarak tekrar deneyin."
 
-#: src/compose.c:5805
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2090,7 +2091,7 @@ msgstr ""
 "karakter kodlamasına dönüştürülemedi.\n"
 "%s olarak gönderilsin mi?"
 
-#: src/compose.c:5867
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2103,67 +2104,67 @@ msgstr ""
 "\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:6102
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr "Şifreleme uyarısı"
 
-#: src/compose.c:6103
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr "Devam _Et"
 
-#: src/compose.c:6152
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr "E-posta göndermek için bir hesap mevcut değil!"
 
-#: src/compose.c:6161
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Seçilen hesap NNTP değil: Göndermek mümkün değil."
 
-#: src/compose.c:6415
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "%s eki artık mevcut değil. Dikkate alma?"
 
-#: src/compose.c:6417 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "Göndermeyi iptal et"
 
-#: src/compose.c:6417
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr "Eki dikkate alma"
 
-#: src/compose.c:6473
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr "Ozgün %s bölümü"
 
-#: src/compose.c:7073
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr "Adres _defterine ekle"
 
-#: src/compose.c:7240
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr "Girdi içeriğini sil"
 
-#: src/compose.c:7244 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Adres defterinden otomatik tamamlamak için <tab> kullanın"
 
-#: src/compose.c:7476
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr "Mime türü"
 
-#: src/compose.c:7482 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: 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
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:7544
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr "İletiyi şuraya kaydet "
 
-#: src/compose.c:7575 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
@@ -2174,27 +2175,27 @@ msgstr "İletiyi şuraya kaydet "
 msgid "_Browse"
 msgstr "_Gözat"
 
-#: src/compose.c:7591
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr "İletinin kaydedileceği dizini seçin"
 
-#: src/compose.c:8048
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Üst_bilgi"
 
-#: src/compose.c:8053
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Ekler"
 
-#: src/compose.c:8067
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "_Diğerleri"
 
-#: src/compose.c:8082
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "_Başlık"
 
-#: src/compose.c:8306
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2203,19 +2204,19 @@ msgstr ""
 "İmlâ denetimi başlatılamadı.\n"
 "%s"
 
-#: src/compose.c:8453
+#: src/compose.c:8456
 msgid "_From:"
 msgstr "_Gönderen:"
 
-#: src/compose.c:8470
+#: src/compose.c:8473
 msgid "Account to use for this email"
 msgstr "Bu e-posta için kullanılacak hesap"
 
-#: src/compose.c:8472
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr "Kullanılacak gönderen adresi"
 
-#: src/compose.c:8654
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2224,73 +2225,98 @@ msgstr ""
 "'%s' gizlilik sistemi yüklenemedi. Bu iletiyi imzalayamayacak ya da "
 "şifreleyemeyeceksiniz"
 
-#: src/compose.c:8765 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "_Hiç biri"
 
-#: src/compose.c:8866 src/prefs_template.c:752
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Şablon gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:8963
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "'%s' şablonu format hatası."
 
-#: src/compose.c:9387
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:9402
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr "Dosya mevcut değil ya da boş."
 
-#: src/compose.c:9476
+#: src/compose.c:9479
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:9494
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr "MIME türü"
 
-#: src/compose.c:9527
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:9547
+#: src/compose.c:9550
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:9548
+#: src/compose.c:9551
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:9807
+#: src/compose.c:9646
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"Metin gövdesi dosyaya yazdırılamadı:\n"
+"%s"
+
+#: src/compose.c:9704
+#, c-format
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Aşağıdaki komut oluşturulamadı:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9743
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr "Harici metin düzenleyici çalışmayı durdurdu:%s"
+
+#: src/compose.c:9817
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
 "Harici metin düzenleyici hâlâ çalışıyor.\n"
 "İşlemi sonlandırmaya zorla?\n"
-"işlem grup id: %d"
+"işlem id: %d"
 
-#: src/compose.c:10280 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 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:10473
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr "Taslak kaydedilemedi."
 
-#: src/compose.c:10477
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr "Taslak kaydedilemedi."
 
-#: src/compose.c:10478
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2298,24 +2324,24 @@ msgstr ""
 "Taslak kaydedilemedi.\n"
 "Çıkmaktan ya da bu e-postadan vaz geçmek ister misiniz?"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr "Çıkmaktan _vazgeç"
 
-#: src/compose.c:10480
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr "E-postadan _vaz geç"
 
-#: src/compose.c:10669 src/compose.c:10683
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:10697
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "'%s' dosyası okunamadı."
 
-#: src/compose.c:10699
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2324,50 +2350,50 @@ msgstr ""
 "'%s' dosyası mevcut karakter kodlaması için\n"
 "geçersiz karakterler barındırıyor, eklemek yanlış olabilir."
 
-#: src/compose.c:10778
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr "İletiden vaz geç"
 
-#: src/compose.c:10779
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr "Bu ileti değiştirilmiş. Vaz geç?"
 
-#: src/compose.c:10780 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Vaz geç"
 
-#: src/compose.c:10780 src/compose.c:10785
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr "_Taslaklara Kaydet"
 
-#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: src/compose.c:10784
+#: src/compose.c:10734
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bu ileti değiştirilmiş. Son değişiklikleri kaydet?"
 
-#: src/compose.c:10785
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr "_Kaydetme"
 
-#: src/compose.c:10856
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "'%s' şablonunun uygulanmasını istiyor musunuz?"
 
-#: src/compose.c:10858
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:10859 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
 #: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "_Yer Değiştir"
 
-#: src/compose.c:11746
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2379,20 +2405,20 @@ msgstr[0] ""
 "%d adet dosya içeriğinin ileti gövdesine eklenmesini ya da e-postaya "
 "iliştirilmesini istiyor musunuz?"
 
-#: src/compose.c:11752
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr "Ekle ya da iliştir"
 
-#: src/compose.c:11753
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr "_İliştir"
 
-#: src/compose.c:11971
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "%d. satırda alıntı biçimi hatası."
 
-#: src/compose.c:12267
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2609,7 +2635,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:2158
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "Dosya"
@@ -2692,13 +2718,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:2910
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 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:2917
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2759,7 +2785,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTSSL"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2922,8 +2948,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:1405 src/prefs_account.c:2003
-#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
+#: 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
 msgid "Show password"
 msgstr "Şifreyi göster"
@@ -2945,11 +2971,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Arama sonucunda gösterilecek azamî girdi sayısı."
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr "Temel"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "Gelişmiş"
 
@@ -3091,8 +3117,8 @@ msgstr "Stil"
 #: 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/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
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -3331,7 +3357,7 @@ msgstr "Adres Defterini LDIF Olarak Kaydet"
 msgid "Distinguished Name"
 msgstr "Ayırt Edici İsim (dn):"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr "mbox olarak kaydet"
 
@@ -3396,18 +3422,18 @@ msgstr "Çok uzun isim."
 msgid "Not specified."
 msgstr "Belirtilmedi"
 
-#: 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 ""
 "%s dosyası kayıp! %s tarihindeki yedek dosyayı kullanmak istiyor musunuz?"
 
-#: 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 "%s, %s üzerine kopyalanamadı"
 
-#: 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 "
@@ -3512,51 +3538,51 @@ msgstr "işlem uygulanamadı\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "eylemden [ %s ] sonra başka işlem yok\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "kural '%s' işletiliyor [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "kural <unnamed> işletiliyor [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "kural '%s' kapatıldı [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "kural <unnamed> kapatıldı [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "kararlaştırılmamış"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "birleştirme"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "elle"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "dizin işleme"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "ön işlem"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "son işlem"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3573,11 +3599,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3612,35 +3638,35 @@ msgstr "Taslaklar"
 msgid "Processing (%s)...\n"
 msgstr "İşleniyor (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "%s %s üzerine kopyalanıyor...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "%s %s üzerine taşınıyor...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "%s için önbellek güncelleniyor..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "İletiler işleniyor..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "%s çevrim dışı kullanım için eşleniyor...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Dizin adı nokta ile başlayamaz ya da bitemez."
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "Dizin adı boşluk ile bitemez."
 
@@ -3723,13 +3749,13 @@ msgstr "Gösterilen _Sütünları seç"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr "Yeni"
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Okunmamış"
@@ -3748,7 +3774,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr "Hepsini okunmuş say"
 
@@ -3760,12 +3786,12 @@ msgstr ""
 "Bu ve bunun alt dizinlerindeki tüm e-postaları okunmuş olarak işaretlemek "
 "istiyor musunuz?"
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:871 src/summaryview.c:4292
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Bu dizindeki tüm e-postaları okunmuş olarak işaretlemek istiyor musunuz?"
 
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr "Hepsini okunmamış say"
 
@@ -3777,17 +3803,17 @@ msgstr ""
 "Bu ve bunun alt dizinlerindeki tüm e-postaları okunmamuş olarak işaretlemek "
 "istiyor musunuz?"
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:877 src/summaryview.c:4338
 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:1067 src/imap.c:4675
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "%s/%s dizini taranıyor..."
 
-#: src/folderview.c:1070 src/imap.c:4679 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "%s dizini taranıyor..."
@@ -3846,7 +3872,7 @@ msgstr "Çöpteki tüm iletiler silinsin mi?"
 msgid "_Empty trash"
 msgstr "Çöpü _boşalt"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "Çevrimdışı uyarı"
 
@@ -3866,7 +3892,7 @@ msgstr "Kuyruktaki tüm iletileri gönder"
 msgid "Some errors occurred while sending queued messages."
 msgstr "Kuruktaki iletiler gönderilirken hata oluştu."
 
-#: src/folderview.c:2557 src/main.c:2891 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3932,7 +3958,7 @@ msgstr "Taşıma başarısız!"
 msgid "Processing configuration for folder %s"
 msgstr "%s dizini için düzenlemeler işleniyor"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Hedef dizin sadece alt dizinleri kaydetmek için kullanılabilir."
 
@@ -3982,7 +4008,7 @@ msgstr "bilinmeyen"
 msgid "Can't retrieve newsgroup list."
 msgstr "Haber grubu listesi alınamadı."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1848 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr "Tamamlandı."
 
@@ -4017,11 +4043,11 @@ msgstr ""
 
 #: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "Claws Mail Tayfası\n"
 "ve Hiroyuki Yamamoto"
 
@@ -4174,44 +4200,44 @@ 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:718 src/main.c:2715
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr "Oturum istatistikleri\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2725 src/main.c:2728
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr "Başlatıldı: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2734
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr "Gelen trafik\n"
 
-#: src/gtk/about.c:741 src/main.c:2737
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Alınan iletiler: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2743
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr "Giden trafik\n"
 
-#: src/gtk/about.c:751 src/main.c:2746
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Yeni/yönlendirilmiş iletiler: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2750
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Cevaplanan iletiler: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2754
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Yönlendirilmiş iletiler: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2758
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Giden toplam ileti: %d\n"
@@ -4423,20 +4449,20 @@ msgstr ""
 "İmlâ denetçisi alternatif sözlüğü değiştiremedi.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1853
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "Başarısız oldu: servis kaydı bulunamadı."
 
-#: src/gtk/gtkutils.c:1856
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "Başarısız oldu: bağlantı hatası."
 
-#: src/gtk/gtkutils.c:1859
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Başarısız oldu: bilinmeyen hata (%d)."
 
-#: src/gtk/gtkutils.c:1929
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "Ayarlarnıyor..."
 
@@ -4680,7 +4706,7 @@ msgstr "Kullanıcı-Uygulaması:"
 msgid "Content-Type"
 msgstr "İçerik-Türü"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr "İçerik-Türü:"
 
@@ -4708,7 +4734,7 @@ msgstr "Öncelik"
 msgid "Precedence:"
 msgstr "Öncelik:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "Kurum"
 
@@ -5030,7 +5056,7 @@ msgstr ""
 #: 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/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
@@ -5088,11 +5114,11 @@ msgid "_Hide"
 msgstr "_Gizle"
 
 #: 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: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
 msgid "Account"
 msgstr "Hesap"
 
@@ -5316,51 +5342,51 @@ msgstr ""
 "sağlamaktadır.\n"
 "Şu semboller bu iş için kullanılabilir:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Arama sırasında sorun oluştur. Sebebi için kayıtlara bakın."
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Gönderen/Alıcı/Cc/Başlık/Etiket"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "Yinelenen"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "Yapışkan"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "Kesintisiz yazma"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "Seçince yürüt"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "Mevcut aramayı temizle"
 
-#: 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 "Arama ölçütünü düzenle"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr "Genişletilmiş semboller hakkında bilgi"
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr "_Bilgi"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr "_Düzenle"
 
-#: 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:349
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "_Sil"
@@ -5536,211 +5562,211 @@ msgstr "(Gönderen satırı yok)"
 msgid "(No Subject)"
 msgstr "(Başlık yok)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr "Hata:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Dosya adı:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr "Dosya boyutu:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr "Resmi yükle"
 
-#: src/imap.c:582
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr "IMAP bağlantısı koptu\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: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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "%s üzerinde IMAP hatası:"
 
-#: src/imap.c:627
+#: src/imap.c:628
 msgid "authenticated"
 msgstr "kimlik denetimi yapıldı"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "Kimlik denetimi yapılmamış"
 
-#: src/imap.c:633
+#: src/imap.c:634
 msgid "bad state"
 msgstr "kötü durum"
 
-#: src/imap.c:636
+#: src/imap.c:637
 msgid "stream error"
 msgstr "sıralı karakter dizisi hatası"
 
-#: src/imap.c:639
+#: src/imap.c:640
 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:643
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "bağlantı reddedildi"
 
-#: src/imap.c:646
+#: src/imap.c:647
 msgid "memory error"
 msgstr "bellek hatası"
 
-#: src/imap.c:649
+#: src/imap.c:650
 msgid "fatal error"
 msgstr "geri dönüşü olmayan hata"
 
-#: src/imap.c:652
+#: src/imap.c:653
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "protokol hatası (muhtemelen sunucu tarafında RFC uyumsuzluğu)"
 
-#: src/imap.c:656
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr "bağlantı kabul edilmedi"
 
-#: src/imap.c:659
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr "APPEND hatası"
 
-#: src/imap.c:662
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr "NOOP hatası"
 
-#: src/imap.c:665
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr "LOGOUT hatası"
 
-#: src/imap.c:668
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr "CAPABILITY hatası"
 
-#: src/imap.c:671
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr "CHECK hatası"
 
-#: src/imap.c:674
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr "CLOSE hatası"
 
-#: src/imap.c:677
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr "EXPUNGE hatası"
 
-#: src/imap.c:680
+#: src/imap.c:681
 msgid "COPY error"
 msgstr "COPY hatası"
 
-#: src/imap.c:683
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr "UID COPY hatası"
 
-#: src/imap.c:686
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr "CREATE hatası"
 
-#: src/imap.c:689
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr "DELETE hatası"
 
-#: src/imap.c:692
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr "EXAMINE hatası"
 
-#: src/imap.c:695
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr "FETCH hatası"
 
-#: src/imap.c:698
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr "UID FETCH hatası"
 
-#: src/imap.c:701
+#: src/imap.c:702
 msgid "LIST error"
 msgstr "LIST hatası"
 
-#: src/imap.c:704
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr "LOGIN hatası"
 
-#: src/imap.c:707
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr "LSUB hatası"
 
-#: src/imap.c:710
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr "RENAME hatası"
 
-#: src/imap.c:713
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr "SEARCH hatası"
 
-#: src/imap.c:716
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr "UID SEARCH hatası"
 
-#: src/imap.c:719
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr "SELECT hatası"
 
-#: src/imap.c:722
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr "STATUS hatası"
 
-#: src/imap.c:725
+#: src/imap.c:726
 msgid "STORE error"
 msgstr "STORE hatası"
 
-#: src/imap.c:728
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr "UID STORE hatası"
 
-#: src/imap.c:731
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr "SUBSCRIBE hatası"
 
-#: src/imap.c:734
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr "UNSUBSCRIBE hatası"
 
-#: src/imap.c:737
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr "STARTSSL hatası"
 
-#: src/imap.c:740
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr "INVAL hatası"
 
-#: src/imap.c:743
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr "EXTENSION hatası"
 
-#: src/imap.c:746
+#: src/imap.c:747
 msgid "SASL error"
 msgstr "SASL hatası"
 
-#: src/imap.c:750
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr "SSL/TLS hatası"
 
-#: src/imap.c:754
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Bilinmeyen hata [%d]"
 
-#: src/imap.c:960
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5752,7 +5778,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:966
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5764,7 +5790,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:972
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5776,7 +5802,7 @@ msgstr ""
 "SCRAM-SHA-1 girişleri sadece libetpan SASL desteğiyle derlendiyse ve SCRAM "
 "eklentisi yüklükse çalışmakta."
 
-#: src/imap.c:978
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5788,7 +5814,7 @@ msgstr ""
 "PLAIN ile oturum açma, libetpan SASL desteğiyle derlendiyse ve PLAIN SSL "
 "eklentisi yüklüyse çalışır."
 
-#: src/imap.c:984
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5800,37 +5826,37 @@ msgstr ""
 "LOGIN ile oturum açma, libetpan SASL desteğiyle derlendiyse ve LOGIN SASL "
 "eklentisi yüklüyse çalışır."
 
-#: src/imap.c:991
+#: src/imap.c:999
 #, 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:995
+#: src/imap.c:1003
 #, 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:1013
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "%s adresine bağlanma başarısız oldu."
 
-#: src/imap.c:1020 src/imap.c:1023
+#: src/imap.c:1028 src/imap.c:1031
 #, 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:1053 src/imap.c:3725 src/imap.c:4384 src/imap.c:4478
-#: src/imap.c:4656 src/imap.c:5467
+#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 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:1163 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "Güvensiz bağlantı"
 
-#: src/imap.c:1164 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5844,108 +5870,108 @@ msgstr ""
 "Bu sunucuya bağlanmaya devam etmek istiyor musunuz? İletişim güvenli "
 "olmayacak."
 
-#: src/imap.c:1170 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "Bağlanmaya _devam et"
 
-#: src/imap.c:1179
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "'%s' hesabı: IMAP sunucusuna bağlanıyor: %s:%d..."
 
-#: src/imap.c:1244
+#: src/imap.c:1252
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "IMAP sunucusuna bağlanılamıyor: %s:%d"
 
-#: src/imap.c:1247
+#: src/imap.c:1255
 #, 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:1279 src/imap.c:4146
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "STARTTLS oturumu başlatılamıyor.\n"
 
-#: src/imap.c:1348
+#: src/imap.c:1359
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "%s IMAP4 sunucusunda oturum açılamadı.\n"
 
-#: src/imap.c:1351
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "%s IMAP sunucusunda oturum açılamadı."
 
-#: src/imap.c:1779
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "İletiler ekleniyor..."
 
-#: src/imap.c:1984 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "İletiler kopyalanıyor..."
 
-#: src/imap.c:2510
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr "Arama sunucu hatasından dolayı başarısız oldu."
 
-#: src/imap.c:2594
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "silinen işaretler atanamaz\n"
 
-#: src/imap.c:2601 src/imap.c:5097
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: src/imap.c:2976
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "%s içindeki abonelikten çıkılan dizinler aranıyor..."
 
-#: src/imap.c:2979
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "%s içindeki alt dizinler aranıyor..."
 
-#: src/imap.c:3267
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu oluşturulamıyor: LIST hatası\n"
 
-#: src/imap.c:3280
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "posta kutusu oluşturulamıyor\n"
 
-#: src/imap.c:3411
+#: src/imap.c:3422
 #, 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:3524
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemiyor\n"
 
-#: src/imap.c:3803
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "LIST başarısız oldu\n"
 
-#: src/imap.c:3888
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr "İletiler işaretleniyor..."
 
-#: src/imap.c:3991
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemiyor: %s\n"
 
-#: src/imap.c:4143
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Oturum açabilmek için STARTTLS gerekli.\n"
 
-#: src/imap.c:4153
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr "Kabiliyeler tazelenemedi.\n"
 
-#: src/imap.c:4158
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5954,20 +5980,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:4166
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr "Sunucuya oturum açma kapatılmış.\n"
 
-#: src/imap.c:4389
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "İleti alınıyor..."
 
-#: src/imap.c:5090
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "silinen işaretler atanamaz: %d\n"
 
-#: src/imap.c:6125
+#: src/imap.c:6136
 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"
@@ -6360,139 +6386,139 @@ msgstr "Pine Dosyası Seçin"
 msgid "Import Pine file into Address Book"
 msgstr "Pine dosyasını Adres Defterine aktar"
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 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:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "%s başarısız oldu\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, 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:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "Tamamlandı (yeni ileti yok)"
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Bağlantı başarısız"
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "Kimlik denetimi başarısız"
 
-#: 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: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
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:397
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Tamamlandı (%d adet yeni ileti)"
 
-#: src/inc.c:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "Tamamlandı (yeni ileti yok)"
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "'%s' hesabı: POP3 sunucusuna bağlanıyor: %s:%d..."
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "POP3 sunucusuna bağlanılamıyor: %s:%d"
 
-#: src/inc.c:927
+#: src/inc.c:932
 #, 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:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "İletiler %s hesabından alınıyor (%s)..."
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti sayısı alınıyor (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti sayısı alınıyor (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti sayısı alınıyor (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İleti alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, 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:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "%s:%d bağlantısı başarısız oldu."
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "E-posta işlenirken bir hata oluştu."
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6501,37 +6527,37 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "Dosya yazılamıyor."
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "soket hatası"
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "%s:%d bağlantısında soket hatası meydana geldi."
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "%s:%d bağlantısı karşı taraftan kesildi."
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli."
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6540,11 +6566,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "Kimlik doğrulaması başarısız oldu."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6553,7 +6579,7 @@ msgstr ""
 "Kimlik doğrulaması başarısız oldu:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6561,44 +6587,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:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "%s:%d bağlantısı zaman aşımına uğradı."
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr "Birleştirme iptal edildi\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1766
+#: 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
 msgid "seconds"
 msgstr "saniye"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "dakikada"
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "saat"
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, 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:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sÇevrim dışı çalışıyorsunuz. Geçersiz kıl?"
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "_Bir kereliğine"
 
@@ -6944,20 +6970,18 @@ msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug          hata ayıklama modunu değiştir"
 
 #: src/main.c:2081
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h              bu yardımı göster ve çık"
+msgid "  --help -h              display this help"
+msgstr "  --help -h              bu yardımı göster"
 
 #: src/main.c:2082
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           sürüm bilgisini yazdır ve çık"
+msgid "  --version -v           output version information"
+msgstr "  --version -v           sürüm bilgisini yazdır"
 
 #: src/main.c:2083
 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      sürüm ve gömülü özelliklere dair bilgileri yazdır "
-"ve çık"
+"  --version-full -V      sürüm ve gömülü özelliklere dair bilgileri yazdır"
 
 #: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
@@ -7016,11 +7040,11 @@ msgstr "Kuyruktaki iletiler"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Gönderilmemiş bazı iletiler kuyrukta bekliyor. Şimdi çıkılsın mı?"
 
-#: src/main.c:3019
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: ağ devrede.\n"
 
-#: src/main.c:3025
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: ağ devre dışı.\n"
 
@@ -7636,7 +7660,7 @@ msgstr "_Menü çubuğu"
 
 #: src/mainwindow.c:831
 msgid "_Message view"
-msgstr "_İleti bölümü"
+msgstr "_Posta içeriği"
 
 #: src/mainwindow.c:833
 msgid "Status _bar"
@@ -7782,7 +7806,7 @@ msgstr "Azalan sırada"
 msgid "_Auto detect"
 msgstr "_Otomatik sapta"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr "Etiketleri uygula..."
 
@@ -7945,7 +7969,7 @@ msgstr "%d adet dizinde mükerrer ileti bulunamadı.\n"
 msgid "Select folder to go to"
 msgstr "Gidilecek dizini seçin"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr "Dizin kurallarından önce uygulanacak işlem kuralları"
 
@@ -7953,7 +7977,7 @@ msgstr "Dizin kurallarından önce uygulanacak işlem kuralları"
 msgid "Processing rules to apply after folder rules"
 msgstr "Dizin kurallarından sonra uygulanacak işlem kuralları"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr "Süzme ayarları"
 
@@ -8113,7 +8137,7 @@ msgstr "Yeni ileti _oluştur"
 
 #: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
 msgid "Claws Mail - Message View"
-msgstr "Claws Mail - İleti Görünümü"
+msgstr "Claws Mail - Posta İçeriği"
 
 #: src/messageview.c:845
 msgid "<No Return-Path found>"
@@ -8292,8 +8316,8 @@ msgstr ""
 "\n"
 "  İleti silindi ya da başka bir dizine taşındı"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr "Öğrenirken bir sorun meydana geldi.\n"
 
@@ -8406,7 +8430,7 @@ msgid "Go back to email"
 msgstr "E-postaya geri dön"
 
 #: 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:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Çok bölümlü iletinin bir bölümü kaydedilemedi: %s"
@@ -8465,8 +8489,8 @@ msgstr "Hedef dizini seç"
 msgid "'%s' is not a directory."
 msgstr "'%s' bir dizin değil."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr "Farklı kaydet"
 
@@ -8523,7 +8547,7 @@ msgstr "Tür:"
 msgid "Size:"
 msgstr "Boyut:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: 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
 msgid "Description:"
@@ -8634,6 +8658,77 @@ msgstr "Haber grubu aboneliğinden çık"
 msgid "Rename newsgroup folder"
 msgstr "Haber grubu dizinini yeniden adlandır"
 
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr "OAuth2 kimlik denetim kodu eksik\n"
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr "OAuth2 bağlantısında hata\n"
+
+#: src/oauth2.c:253 src/oauth2.c:367
+msgid "OAuth2 SSL connection error\n"
+msgstr "OAuth2 SSL bağlantısında hata\n"
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr "OAuth2 erişim bilgileri alındı\n"
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr "OAuth2 erişim bilgileri alınmadı\n"
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr "OAuth2 yenileme bilgisi alındı\n"
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "OAuth2 yenileme bilgisi alınmadı\n"
+
+#: src/oauth2.c:452
+msgid "OAuth2 socket write error\n"
+msgstr "OAuth2 soket yazma hatası\n"
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr "OAuth2 soket zaman aşım hatası \n"
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr "OAuth2 erişim bilgisi hâlâ taze\n"
+
+#: src/oauth2.c:534
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr "OAuth2 erişim bilgisini yenileyerek elde ediyor\n"
+
+#: src/oauth2.c:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr "OAuth2 yeni bir erişim bilgisini kimlik koduyla alıyor\n"
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr "OAuth2 erişim bilgisi güncellendi\n"
+
+#: src/oauth2.c:583
+#, c-format
+msgid "OAuth2 original: %s\n"
+msgstr "OAuth2 aslı: %s\n"
+
+#: src/oauth2.c:584
+#, c-format
+msgid "OAuth2 encoded: %s\n"
+msgstr "OAuth2 şifreli: %s\n"
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr ""
+"OAuth2 çözümlenmiş: %s\n"
+"\n"
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr "Ana şifreyi girin"
@@ -9592,7 +9687,7 @@ msgstr "Bundan daha büyük iletiler denetlenmez"
 
 #: 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
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr "KB"
 
@@ -10102,13 +10197,13 @@ msgstr "Gömülü nesneleri eklentiler kullanarak yorumla"
 
 #: src/plugins/fancy/fancy_prefs.c:170
 msgid "Open in Viewer (remote content is enabled)"
-msgstr "Görüntüleyicide aç (uzak içerik açıldı)"
+msgstr "Görüntüleyicide aç (uzak içerik etkin)"
 
 #: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "Bir şey yapma (uzak içerik kapatıldı)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "Vekil (Proxy)"
@@ -10160,7 +10255,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:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
+#: src/prefs_account.c:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Göz_at"
@@ -10169,89 +10264,89 @@ msgstr "Göz_at"
 msgid "Select stylesheet"
 msgstr "Sitil seç"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr "Uzak içerik yüklemesi kapatıldı"
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr "Görüntüleri yükle"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr "Uzak içeriği aç"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr "Javascript'i Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr "Eklentileri Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr "Java'yı aç"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
 msgstr "Bağlantıları harici bir tarayıcı ile aç"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Bir hata oluştu: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s kusurlu ya da desteklenmeyen bir besleme"
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr "Webde Ara"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr "Okuyucuda Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr "Tarayıcıda Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr "Görüntüyü Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
 msgstr "Bağlantıyı Kopyala"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
 msgstr "Bağlantıyı İndir"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr "Görüntüyü Farklı Kaydet"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr "Görüntüyü Kopyala"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr "Beslemeyi içe aktar"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Okuyucu"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10474,7 +10569,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:1921
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
 msgid "Authentication"
 msgstr "Kimlik Doğrulama"
 
@@ -10529,7 +10624,7 @@ msgstr "GData entegrasyonu"
 #: 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 "Libavatar"
 
@@ -10651,8 +10746,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: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:323 src/prefs_account.c:1697
+#: src/prefs_account.c:1855 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "saat"
 
@@ -10732,11 +10827,11 @@ msgstr ""
 "Kullanıcı simgesi olmadığında yönlendirilmeyi istediğiniz URL'yi yazın. "
 "Öntanımlı turuncu simgeyi kullanmak istiyorsanız boş bırakın."
 
-#: src/plugins/libravatar/libravatar_prefs.c:397
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "_Diğer sitelere yönlendirmeye izin ver"
 
-#: 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"
@@ -10744,23 +10839,23 @@ msgstr ""
 "Libravatar sunucusundan alınan gravatar.com gibi diğer avatar sunucularına "
 "yönlendirme çağrılarını takip et"
 
-#: src/plugins/libravatar/libravatar_prefs.c:407
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "_Federe sunucuları aç"
 
-#: 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 "Avatarı, gönderenin libravatar sunucusundan almaya çalış"
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr "Zaman aşımı iste"
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "saniye"
 
-#: 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."
@@ -10768,15 +10863,15 @@ msgstr ""
 "Genel soket G/Ç zaman aşımını kullanmak için 0 yap. Azamî değer genel soket "
 "G/Ç zaman aşımından az olmalı."
 
-#: src/plugins/libravatar/libravatar_prefs.c:472
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Simge geçici belleği"
 
-#: src/plugins/libravatar/libravatar_prefs.c:476
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "Öntanımlı kayıp simge modu"
 
-#: src/plugins/libravatar/libravatar_prefs.c:480
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Ağ"
 
@@ -10815,8 +10910,8 @@ msgid ""
 "Viewer plugin for HTML emails, using the litehtml library (http://www."
 "litehtml.com/)."
 msgstr ""
-"HTML e-postalar litehtml kütüphanesi (http://www.litehtml.com/)"
-"kullarak gösteren bir eklenti"
+"HTML e-postaları litehtml kütüphanesi (http://www.litehtml.com/) kullanarak "
+"gösteren bir eklenti."
 
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder"
@@ -10907,7 +11002,7 @@ msgstr "Kimlik denetimi mevcut değil"
 msgid "sending error on Sieve session: %s\n"
 msgstr "Sieve oturumu hatası gönderiliyor: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
 msgid "_Filter"
 msgstr "_Süz"
 
@@ -10964,7 +11059,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve Filtresi%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 "Yükleniyor..."
 
@@ -11036,7 +11131,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Sieve'yi aç"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr "Sunucu bilgisi"
 
@@ -11087,28 +11182,28 @@ msgstr "Kimlik denetimini belirt"
 
 #: 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:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 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: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/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
 msgid "Password"
 msgstr "Parola"
 
-#: 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:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr "Kimlik doğrulama yöntemi"
 
-#: 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/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
 msgid "Automatic"
 msgstr "Otomatik"
@@ -11720,95 +11815,95 @@ msgstr "Biçim:"
 msgid "Optimized:"
 msgstr "En iyileştirilmiş:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "PDF özellikleri"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "Şifreyi girin"
 
-#: 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 "Bu belge kilitlenmiş ve açılması için bir şifre girilmelidir."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1387
 #, c-format
 msgid "%s Document"
 msgstr "%s adet belge"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
 msgstr "%d adetten"
 
-#: 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 "Bilinmeyen bir sebepten PDF yorumlanamadı."
 
-#: 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 "Belge Fihristi"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "İlk Sayfa"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr "Önceki Sayfa"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "Sonraki Sayfa"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "Son Sayfa"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "Yakınlaş"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "Uzaklaş"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "Sayfaya Sığdır"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "Sayfa Genişliğine Sığdır"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "Sola Çevir"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "Sağa Çevir"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "Belgeyi Yazdır"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "Belge Bilgisi"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "Sayfa Numarası"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "Yakınlaşma Çarpanı"
 
-#: 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 "
@@ -11821,13 +11916,13 @@ msgstr ""
 "\n"
 "Geri bildirim için: 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 Okuyucu"
 
-#: 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 "
@@ -11878,19 +11973,29 @@ msgstr "Lütfen hesap için parolayı giriniz:"
 msgid "Bad passphrase.\n"
 msgstr "Kötü parola.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Anahtarı içe aktar"
 
-#: 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 and import it?"
 msgstr ""
-"Anahtar, anahtarlığınızda yok. Claws Mail'in anahtarınızı bir anahtar "
-"sunucusundan içe aktarmasını istiyor musunuz?"
+"Anahtar, anahtarlığınızda yok. Claws Mail'in içe aktarmasını istiyor musunuz?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "_No"
+msgstr "_Hayır"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "anahtar sunucusundan"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr "Web Key Dizininden"
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
@@ -11898,15 +12003,15 @@ msgstr ""
 "\n"
 "  Anahtar 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 "   Bu anahtar anahtarlığınızda yok.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   İçe aktarılabilir. "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -11914,17 +12019,17 @@ msgstr ""
 "çevrim içi çalışırken,\n"
 "   ya da "
 
-#: 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 ""
-"aşağıdaki komutla: \n"
+"aşağıdaki komutlardan herhangi biriyle: \n"
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -11932,29 +12037,27 @@ msgstr ""
 "\n"
 "  Anahtar ID'si içe aktarılıyor "
 
-#: 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 "   Bu anahtar anahtarlığınıza eklendi.\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 "   Bu anahtar anahtarlığınıza eklenemedi.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Anahtar sunucuları bazen yavaş olabiliyor.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Aşağıdaki komutu kullanarak elle eklemeyi deneyebilirsiniz:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
+msgstr "   Aşağıdaki komutu kullanarak elle eklemeyi deneyebilirsiniz:"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr "ya da"
+
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   Bu anahtar anahtarlığınızda var.\n"
 
@@ -11990,7 +12093,7 @@ msgstr "Temel işlemler"
 
 #: src/plugins/pgpcore/prefs_gpg.c:142
 msgid "Automatically check signatures"
-msgstr "İmzaları doğrudan denetle"
+msgstr "İmzaları kendilipinden denetle"
 
 #: src/plugins/pgpcore/prefs_gpg.c:145
 msgid "Use keyring for address autocompletion"
@@ -12014,8 +12117,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:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "dakikada"
 
@@ -12635,8 +12738,8 @@ msgstr "Python uçbirimini göster..."
 msgid "Refresh"
 msgstr "Yenile"
 
-#: 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/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
 msgid "Browse"
 msgstr "Gözat"
@@ -12712,7 +12815,7 @@ msgstr ""
 "penceresinde çalıştırılmalarını sağlayabilirsiniz.\n"
 "\n"
 "~/.claws-mail/python-scripts/auto/ dizinine belirlediğiniz eylemler "
-"gerçekleştiğinde doğrudan çalışan betikleri koyabilirsiniz. Şu anda, bu "
+"gerçekleştiğinde kendiliğinden çalışan betikleri koyabilirsiniz. Şu anda, bu "
 "dizindeki aşağıdaki dosyalar tanınmakta:\n"
 "\n"
 "compose_any\n"
@@ -12955,7 +13058,7 @@ msgstr "Şu tarihten daha yeni tarihli iletilerdeki yorumları al"
 
 #: 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/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "gün"
 
@@ -12977,7 +13080,7 @@ msgstr "Yenileme sıklığı"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:465
 msgid "Set to 0 to disable automatic refreshing for this feed"
-msgstr "Bu besleme için doğrudan yenilemeyi iptal etmek için 0 yazın"
+msgstr "Bu besleme için kendiliğinden yenilemeyi iptal etmek için 0 yazın"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:517
 msgid "_OK"
@@ -13655,45 +13758,45 @@ msgstr "Kesinleştirilmemiş kabul"
 msgid "Decline"
 msgstr "Reddet"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr "Bir Göreviniz var."
 
-#: 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:718
 msgid "Details follow:"
 msgstr "Detayları:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "Bir toplantı oluşturdunuz."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr "Bir toplantıya davet edildiniz."
 
-#: 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 "Davet edildiğiniz bir toplantı iptal edildi."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr "Bir buluşmayı yönlendirdiniz."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr "(tekrarlayan etkinlik)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr "(bu etkinlik tekrarlayan bir etkinliğin parçası)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Bilinmeyen bir toplantı teklifine bir cevap aldınız."
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13702,35 +13805,35 @@ msgstr ""
 "Toplantı öneriniz için bir cevap aldınız.\n"
 "%s teferruatı aşağıda olan daveti %s:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr "Hata - takvimin MIME bölümü alınamadı."
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr "Hata - takvim bölümü bulunamadı."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr "Hata - bilinmeyen takvim bileşen türü."
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
 msgstr "Katılımcılara bildirim gönder"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr "Toplantıyı iptal et"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Bu toplantıyı iptal etmek istediğinizden emin misiniz?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr "Hesap bulunamadı"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13738,68 +13841,68 @@ msgstr ""
 "Katılımcılarla eşleşen bir hesabınız yok.\n"
 "Yine de cevaplamak istiyor musunuz?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr "Yine de cevapla"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr "Cevapla"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr "Toplantıyı düzenle..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr "Toplantıyı iptal et"
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr "Web siteyi aç"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr "Bu saatte meşgulsünüz."
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "Etkinlik:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Düzenleyen:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "Konum:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "Özet:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr "Başlama Tarihi:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr "Bitme Tarihi:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "Katılımcılar:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr "Eylem:"
 
@@ -14416,95 +14519,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:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "POP protokol hatası\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "geçersiz UIDL cevabı: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: %d eski iletisi siliniyor [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: %d iletisi atlanıyor [%s] (%d bayt)\n"
 
-#: src/pop.c:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "posta kutusu kilitli\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "oturum zaman aşımına uğradı\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "komut desteklenmiyor\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "POP oturumunda hata oluştu\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "TOP komutu desteklenmiyor\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr "Haberler (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "Yerel mbox dosyası"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr "Hiç biri (sadece SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr "Hesabın adı"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
 msgstr "Öntanımlı kullan"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr "Kişisel bilgiler"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr "Tam adı"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
 msgstr "E-Posta adresi"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
-msgstr "Doğrudan ayarla"
+msgstr "Kendiliğinden ayarla"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14512,77 +14615,81 @@ msgstr ""
 "Uyarı: Claws Mail'in bu sürümü\n"
 "IMAP ve Haberler desteği olmadan derlenmiş."
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr "Bu sunucu kimlik doğrulaması istiyor"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr "Bağlanırken kimlik denetimi yap"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr "Haberler sunucusu"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr "Alımın yapılacağı sunucu"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr "Yerel posta kutusu"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr "SMTP sunucu (gönder)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr "SMTP sunucu yerine mail komutunu kullan"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr "postaları gönderecek komut"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr "Hesap%d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr "Yerel"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr "Öntanımlı Gelen Kutusu"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Süzülmemiş iletiler bu dizinde tutulacak"
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
-msgstr "Güvenli kimlik doğrulaması kullan (APOP)"
+#: src/prefs_account.c:1634
+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
+msgid "Select"
+msgstr "_Seç"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr "Sonra sil"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 gün ve 0 saat : derhal sil"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr "Alınan ileti boyutu sınırı"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14590,94 +14697,94 @@ msgstr ""
 "Bu boyutun üstündeki iletiler tamamen indirilmeyecek. Seçtiğiniz zaman "
 "tamamen indirebilecek ya da silebileceksiniz."
 
-#: src/prefs_account.c:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr "Azamî indirilecek yazı sayısı"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr "0 girildiyse sonsuz"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr "Düz metin"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr "IMAP sunucu dizini"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr "(genellikle boş)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
 msgstr "Sadece abone olunan dizinleri göster"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1831
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Verimli ağ kullanımı yöntemi (etiketlerin alınmasını önler)"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1833
 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:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Otomatik denetle"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr "Genel ayarları kullan"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Yeni iletileri denetle"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr "İletileri alırken süz"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr "İletileri alırken eklenti kullanarak süzmeye izin ver"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1908
 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:1894 src/prefs_customheader.c:210
+#: 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
 msgid "Header"
 msgstr "Üstbilgi"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr "İleti-ID Oluştur"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
 msgstr "İleti-ID içinde hesap posta adresini gönder"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr "Uygulama adı üstbilgisini ekle"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı üstbilgi ekle"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Kimlik Doğrulama (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14685,173 +14792,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:2033
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr "Göndermeden önce POP ile kimlik denetimi yap"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr "POP kimlik doğrulaması zaman aşımı"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2233
+msgid "Authorization"
+msgstr "Yetkilendirme"
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr "OAuth2 E-posta Servis Sunucusu Seç"
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr "İstemci ID"
+
+#: src/prefs_account.c:2296
+msgid "Client secret"
+msgstr "İstemci gizli değeri"
+
+#: src/prefs_account.c:2328
+msgid "Obtain authorization code"
+msgstr "Yetkilendirme kodunu al"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr "İsteği öntanımlı tarayıcı ile aç"
+
+#: src/prefs_account.c:2338
+msgid "Copy link"
+msgstr "Bağlantıyı Kopyala"
+
+#: src/prefs_account.c:2350
+msgid "Authorization code"
+msgstr "Yetkilendirme kodu"
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr "Tarayıcıdaki URL'yi ya da sağlanan kimlik doğrulama bilgisini yapıştır"
+
+#: src/prefs_account.c:2364
+msgid "Complete authorization"
+msgstr "Yetkilendirmeyi tamamla"
+
+#: src/prefs_account.c:2368
+msgid "Authorize"
+msgstr "Yetkilendir"
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr "İmza"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
-msgstr "İmzayı doğrudan ekle"
+msgstr "İmzayı kendiliğinden ekle"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr "İmza ayracı"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
-msgstr "Aşağıdaki adresleri doğrudan ata"
+msgstr "Aşağıdaki adresleri kendiliğinden ata"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr "İmlâ denetim sözlükleri"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Öntanımlı sözlük"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Öntanımlı diğer sözlük"
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Yaz"
 
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: 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
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr "Öntanımlı gizlilik sistemi"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "İletileri her zaman imzala"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "İletileri her zaman şifrele"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2792
 msgid "Always sign messages when replying to a signed message"
 msgstr "İmzalı bir iletiyi yanıtlarken iletileri her zaman imzala"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2795
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Şifrelenmiş bir iletiyi yanıtlarken iletileri her zaman şifrele"
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2798
 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:2481
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr "Şifrelenmiş iletileri metin dosyası olarak kaydet"
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
 msgid "Don't use SSL/TLS"
 msgstr "SSL/TLS kullanma"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: 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 "SSL/TLS kullan"
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Şifreli oturumuna başlamak için STARTTLS komutunu kullan"
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr "Gönder (SMTP)"
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:3004
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "SSL/TLS kullanma (fakat, gerekliyse, STARTTLS kullan)"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr "İstemci sertifikaları"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr "Alım için sertifika"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "PKCS12 ya da PEM olarak istemci sertifikası"
 
-#: src/prefs_account.c:2732
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr "Gönderim için sertifika"
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "Geçerli SSL/TLS sertifikaları doğrudan kabul et"
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr "Bloklanmamış SSL/TLS Kullan"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3106
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "SSL/TLS bağlantı sorunlarınız varsa bunu kapatın"
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "Vekil sunucu (proxy) kullan"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3207
 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:2890
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
 msgstr "Genel vekil sunucu (proxy) ayarlarını kullan"
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "Kimlik doğrulaması kullan"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
 msgstr "Göndermek için vekil sunucu (proxy) kullan"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14859,27 +15010,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:3079
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr "SMTP portu"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr "POP portu"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr "IMAP portu"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr "NNTP portu"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr "Alan adı"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14887,148 +15038,152 @@ msgstr ""
 "Alan adı, oluşturulan İleti-ID'sinde ve SMTP sunuculara bağlanırken "
 "kullanılacak."
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr "Sunucuyla iletişim kurmak için komut kullan"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3451
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mükerrer iletileri okundu olarak ve renkle işaretle:"
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr "Gönderilen iletileri buraya koy"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr "Kuyruktaki iletileri buraya koy"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr "Taslak iletilerini buraya koy"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr "Silinen iletileri buraya koy"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr "Hesap adı girilmemiş."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
 msgstr "Posta adresi girilmemiş."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr "SMTP sunucu girilmemiş."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr "Kullanıcı ID girilmemiş."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr "POP sunucu girilmemiş."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr "Öntanımlı Gelen Kutusu yok."
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr "IMAP sunucu girilmemiş."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr "NNTP sunucu girilmemiş."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3626
 msgid "local mailbox filename is not entered."
 msgstr "yerel posta kutusunun adı girilmemiş."
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
 msgstr "mail komutu girilmemiş"
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3642
 msgid "User ID cannot contain a newline character."
 msgstr "Kullanıcı ID'si yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3647
 msgid "Password cannot contain a newline character."
 msgstr "Şifre yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3678
 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:3361
+#: src/prefs_account.c:3683
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP şifresi yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr "alan aldı belirtilmedi."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr "gönderilen dizini seçilmedi."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr "kuyruk dizini seçilmedi."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr "taslak dizini seçilmedi."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "çöp dizini seçilmedi."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr "Al"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Şablonlar"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr "Yeni hesap için tercihler"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Hesap tercihleri"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "Başarısız oldu (yanlış adres)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr "İmza dosyasını seç"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "Sertifika dosyasını seç"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr "Protokol"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (eklenti yüklü değil)"
@@ -15296,7 +15451,7 @@ 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"
 
-#: src/prefs_common.c:456
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15519,12 +15674,12 @@ msgid ""
 "script when using the 'Display as text' contextual menu item"
 msgstr ""
 "Bu seçenek, 'Metin olarak göster' menü seçeneği kullanıldığında bir betik "
-"aracılığıyla ileti görünümünde gösterilecek MIME bölümleri etkinleştirir."
+"aracılığıyla posta içeriğinde gösterilecek MIME bölümleri etkinleştirir."
 
-#: 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:180
+#: src/prefs_message.c:362
 msgid "Message View"
-msgstr "İleti Görünümü"
+msgstr "Posta İçeriği"
 
 #: src/prefs_ext_prog.c:283
 msgid "External Programs"
@@ -16061,27 +16216,43 @@ msgstr "Fontlar"
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Eklenmiş görüntüleri doğrudan göster"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr "Eklenmiş görüntüleri öntanımlı olarak yeniden boyutlandır"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
 msgstr "Görüntüye tıklama boyutlandırılmasını sağlar"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:96
+msgid "Fit image"
+msgstr "Görüntüyü sığdır"
+
+#: src/prefs_image_viewer.c:99
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "Görüntüye sağ tıklama görüntünün yükseklik/genişlik boyutlandırmasını açar"
+
+#: src/prefs_image_viewer.c:102
+msgid "Height"
+msgstr "Yükseklik"
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr "Genişlik"
+
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr "Görüntüleri satır içinde göster"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr "Görüntüleri yazdır"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr "Görüntü Gösterici"
 
@@ -16285,11 +16456,11 @@ msgstr "gövde bölümü"
 msgid "whole message"
 msgstr "tüm ileti"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr "İşaretlenmiş"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr "Silinmiş"
 
@@ -16297,11 +16468,11 @@ msgstr "Silinmiş"
 msgid "Replied"
 msgstr "Cevaplanmış"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr "Yönlendirilmiş"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "İstenmeyen"
@@ -16310,7 +16481,7 @@ msgstr "İstenmeyen"
 msgid "Has attachment"
 msgstr "Eklentisi olan"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr "İmzalanmış"
 
@@ -16591,83 +16762,91 @@ msgstr ""
 msgid "Current condition rules"
 msgstr "duruma dair kullanılan kurallar"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Üstbilgiler"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
-msgstr "Postaları gösterirken üst kısımda üstbilgileri göster"
+msgstr "Üstbilgi bölümünü posta içeriğinin üstünde göster"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
-msgstr "Posta gösteriminde (X-)Face göster"
+msgstr "Posta içeriğinde (X-)Face göster"
+
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "Mümkünse (X-)Face'yi adres defterine kaydet"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
-msgstr "Postaları gösteriminde Face göster"
+msgstr "Posta içeriğinde Face göster"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr "Mümkünse Face'yi adres defterine kaydet"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
-msgstr "Posta gösteriminde üstbilgileri göster"
+msgstr "Posta içeriğinde üstbilgileri göster"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "HTML İletiler"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "HTML iletileri metin olarak yorumla"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Sadece HTML barındıran iletileri mümkünse eklenti ile görüntüle"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Çok bölümlü/alternatifli bir iletinin HTML bölümünü seç"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Satır boşluğu"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "benek"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Kaydır"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Yarım sayfa"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Yumuşak kaydır"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Adım"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Eklenti tanımlarını göster (isimlerden ziyâde)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Alıntı"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Çift tıklayınca alıntı metnini sakla"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Bu işaretleri alıntı işareti olarak yorumla"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Metin Seçenekleri"
 
@@ -16698,7 +16877,7 @@ msgstr "Yapılandırma uyarısı"
 
 #: src/prefs_msg_colors.c:155
 msgid "Message view"
-msgstr "Posta gösterimi"
+msgstr "Posta İçeriği"
 
 #: src/prefs_msg_colors.c:162
 msgid "Enable coloration of message text"
@@ -17195,7 +17374,7 @@ msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr ""
-"Eğer 'Doğrudan' seçildiyse, kullanılan yerel ayar için en uygun kodlama "
+"Eğer 'Otomatik' seçildiyse, kullanılan yerel ayar için en uygun kodlama "
 "seçilecektir."
 
 #: src/prefs_send.c:267
@@ -17330,8 +17509,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:520 src/send_message.c:524
-#: src/send_message.c:529
+#: src/prefs_send.c:420 src/send_message.c:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "Gönderme"
 
@@ -18130,7 +18309,7 @@ msgstr "Alıcı anahtarı tanımlanmadı."
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64 çözümünde hata]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr "İletinin bir parçası çözülemedi"
 
@@ -18492,88 +18671,88 @@ msgstr "'%s' yerine geçecek metni girin"
 msgid "Enter variable"
 msgstr "Değişken girin"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "İleti şu komut kullanılarak gönderiliyor: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Komut yürütülemedi: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Komut yürütülürken hata oluştu: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "Bağlantı kuruluyor"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "SMTP'den önce POP yapılıyor"
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "SMTP'den önce POP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, 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:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "İleti başarıyla gönderildi."
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "HELO gönderiliyor..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "Kimlik denetimi"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "İleti gönderiliyor..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "EHLO gönderiliyor..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM gönderiliyor..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO gönderiliyor..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "DATA gönderiliyor..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "Çıkılıyor..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "İleti gönderiliyor"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "İleti gönderilirken hata oluştu."
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18872,61 +19051,61 @@ msgstr "Gönderen: %s, %s"
 msgid "To: %s, on %s"
 msgstr "Alıcı: %s, %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr "Makalenin yazarı siz değilsiniz."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4574
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Seçilen %d adet iletiyi gerçekten silmek istiyor musunuz?"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "İletiyi  Sil"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin bulunulan dizinle aynı."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4796
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Seçilen iletilerin taşınacağı dizini seçin"
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr "Kopyalama için seçilen hedef dizin bulunulan dizinle aynı."
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4881
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Seçilen iletilerin kopyalanacağı dizini seçin"
 
-#: src/summaryview.c:5036
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr "İçeriği Güncelle ya da Üzerine Yaz"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr "Var olan dosyanın üzerine mi yazılsın yoksa içeriği mi güncellensin?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr "İçeriği _güncelle"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr "Ü_zerine yaz"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "'%s' dosyası kaydedilemedi."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5090
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
@@ -18934,27 +19113,27 @@ msgstr ""
 "%d adet iletiyi birer birer yazdırmak üzeresiniz. Devam etmek istiyor "
 "musunuz?"
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr "Zincirleme konular oluşturuluyor..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr "Bu kuralları geç"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5799
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Ait olduğu hesaptan bağımsız olarak bu kuralları uygula"
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5802
 msgid "Apply these rules if they apply to the current account"
 msgstr "Mevcut hesaba uygunsa bu kuralları uygula"
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr "Filtreleme"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18962,74 +19141,74 @@ msgstr ""
 "Bir hesaba ait bazı süzme kuralları mevcut.\n"
 "Lütfen bu kurallarla ne yapmak istediğinizi seçin:"
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr "Süzülüyor..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr "Ayarlar işleniyor"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6095
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Seçilen tüm iletilerin renk etiketlerini öntanımlı değerlere getirmeyi "
 "istiyor musunuz?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6097
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Bu renk etiketinin seçilen tüm iletilere uygulanmasını istiyor musunuz?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Reset color label"
 msgstr "Renk etiketini sıfırla"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Set color label"
 msgstr "Renk etiketini ata"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr "Dikkate alınmayan zincirleme konu"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr "Takip edilen zincirleme konu"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Cevaplandı ve yönlendirildi - cevabı görmek için tıklayın"
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr "Cevaplandı - cevabı görmek için tıklayın"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr "Taşınacak"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr "Kopyalanacak"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr "İmzalanmış, eklentisi olan"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr "Şifrelenmiş, eklentisi olan"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr "Şifrelenmiş"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr "Eklentisi olan"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19038,11 +19217,11 @@ msgstr ""
 "Düzenli ifade (regexp) hatası:\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8402
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Dizin listesine geri dön (Okunmamış iletileriniz var)"
 
-#: src/summaryview.c:8403
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr "Dizin listesine geri dön"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a8a94adec..bfa51da8c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.14.0git127\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2020-02-21 10:44+0800\n"
+"POT-Creation-Date: 2021-07-05 14:06+0800\n"
 "PO-Revision-Date: 2019-07-23 10:02+8\n"
 "Last-Translator: Mark Chang <mark.cyj at gmail.com>\n"
 "Language-Team: Mark Chang <mark.cyj at gmail.com>\n"
@@ -54,48 +54,48 @@ msgstr "包含遠端資料夾的帳號無法被複製"
 msgid "Copy of %s"
 msgstr "複製 %s"
 
-#: src/account.c:1119
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "你確認要刪除帳號 '%s' 嗎?"
 
-#: src/account.c:1121
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr "(無標題)"
 
-#: src/account.c:1122
+#: src/account.c:1129
 msgid "Delete account"
 msgstr "刪除帳號"
 
-#: src/account.c:1596
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1602
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "「收信」將從選取的帳號下取回郵件"
 
-#: src/account.c:1609 src/addrduplicates.c:472 src/addressadd.c:223
-#: src/addressbook.c:128 src/compose.c:7473 src/editaddress.c:1474
+#: src/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
 #: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: 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
 msgid "Name"
 msgstr "名稱"
 
-#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/account.c:1625 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr "伺服器"
 
@@ -145,7 +145,8 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
+#: 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/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -215,7 +216,7 @@ msgstr "無法複製通訊錄到當前位置"
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "無法移動資料夾到當前位置"
 
-#: src/addr_compl.c:689 src/addressbook.c:5018
+#: src/addr_compl.c:699 src/addressbook.c:5009
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "群組"
@@ -286,8 +287,8 @@ msgid ""
 "with the default set?"
 msgstr "確認要以預設值覆蓋所有的屬性名稱嗎?"
 
-#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
-#: src/addressbook.c:484 src/edittags.c:286
+#: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:462
+#: src/addressbook.c:479 src/edittags.c:286
 #: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
 #: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "_Delete"
@@ -331,7 +332,7 @@ msgstr "在不同的通訊錄中顯示重複的項目"
 
 #: src/addrduplicates.c:144
 msgid "Find address book email duplicates"
-msgstr "尋找通訊錄中重複的email"
+msgstr "尋找通訊錄中重複的電子郵件"
 
 #: src/addrduplicates.c:145
 msgid ""
@@ -356,11 +357,11 @@ msgstr "地址"
 msgid "Address book path"
 msgstr "通訊錄路徑"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1445 src/addressbook.c:1498
+#: src/addrduplicates.c:791 src/addressbook.c:1436 src/addressbook.c:1489
 msgid "Delete address(es)"
 msgstr "刪除地址"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1499
+#: src/addrduplicates.c:792 src/addressbook.c:1490
 msgid "Really delete the address(es)?"
 msgstr "確定要刪除地址嗎?"
 
@@ -368,7 +369,7 @@ msgstr "確定要刪除地址嗎?"
 msgid "Delete address"
 msgstr "刪除地址"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1446
+#: src/addrduplicates.c:842 src/addressbook.c:1437
 msgid "This address data is readonly and cannot be deleted."
 msgstr "這個地址資訊是唯讀的,而且不能被刪除"
 
@@ -389,7 +390,7 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressadd.c:599 src/addressbook.c:3268 src/addressbook.c:3319
+#: src/addressadd.c:599 src/addressbook.c:3259 src/addressbook.c:3310
 msgid "Add address(es)"
 msgstr "新增連絡人地址"
 
@@ -397,7 +398,7 @@ msgstr "新增連絡人地址"
 msgid "Can't add the specified address"
 msgstr "無法新增指定的連絡人地址"
 
-#: src/addressbook.c:129 src/addressbook.c:5006 src/editaddress.c:1247
+#: 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
 msgid "Email Address"
@@ -407,136 +408,126 @@ msgstr "Email 地址"
 msgid "_Book"
 msgstr "通訊錄(_B)"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
+#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
+#: src/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
-#: src/messageview.c:216
-msgid "_Help"
-msgstr "協助(_H)"
-
-#: src/addressbook.c:411 src/addressbook.c:469
+#: src/addressbook.c:410 src/addressbook.c:464
 msgid "New _Book"
 msgstr "新增通訊錄(_B)"
 
-#: src/addressbook.c:412 src/addressbook.c:470
+#: src/addressbook.c:411 src/addressbook.c:465
 msgid "New _Folder"
 msgstr "新增資料夾(_F)"
 
-#: src/addressbook.c:413
+#: src/addressbook.c:412
 msgid "New _vCard"
 msgstr "新增vCard(_v)"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:416
 msgid "New _JPilot"
 msgstr "新增JPilot(_J)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:419
 msgid "New LDAP _Server"
 msgstr "新增 LDAP Server"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:423
 msgid "_Edit book"
 msgstr "編輯通訊錄"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:424
 msgid "_Delete book"
 msgstr "刪除通訊錄"
 
-#: src/addressbook.c:427 src/compose.c:624
+#: src/addressbook.c:426 src/compose.c:632
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "儲存"
 
-#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "關閉"
 
-#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
+#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
 msgid "_Select all"
 msgstr "全選"
 
-#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
+#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
 msgid "C_ut"
 msgstr "剪下"
 
-#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
+#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
+#: src/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "複製"
 
-#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
-#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "貼上"
 
-#: src/addressbook.c:440 src/addressbook.c:486
+#: src/addressbook.c:439 src/addressbook.c:481
 msgid "New _Address"
 msgstr "新連絡人"
 
-#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
+#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
 msgid "New _Group"
 msgstr "新群組"
 
-#: src/addressbook.c:443 src/addressbook.c:493
+#: src/addressbook.c:442 src/addressbook.c:488
 msgid "_Mail To"
 msgstr "寄給"
 
-#: src/addressbook.c:444 src/addressbook.c:497
+#: src/addressbook.c:443 src/addressbook.c:492
 msgid "_Merge"
 msgstr "合併(_M)"
 
-#: src/addressbook.c:448
+#: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr "匯入 _LDIF 檔案..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Import M_utt file..."
 msgstr "匯入 M_utt 檔案..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Import _Pine file..."
 msgstr "匯入 _Pine 檔案..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:451
 msgid "Export _HTML..."
 msgstr "匯出 _HTML 檔案..."
 
-#: src/addressbook.c:453
+#: src/addressbook.c:452
 msgid "Export LDI_F..."
 msgstr "匯出 LDI_F 檔案..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:454
 msgid "Find duplicates..."
 msgstr "尋找重複連絡人..."
 
-#: src/addressbook.c:456
+#: src/addressbook.c:455
 msgid "Edit custom attributes..."
 msgstr "編輯使用者屬性"
 
-#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
-#: src/messageview.c:340
-msgid "_About"
-msgstr "關於"
-
-#: src/addressbook.c:495
+#: src/addressbook.c:490
 msgid "_Browse Entry"
 msgstr "瀏覽(_B)"
 
-#: src/addressbook.c:509 src/crash.c:457 src/crash.c:476 src/importldif.c:114
+#: 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
@@ -544,120 +535,120 @@ msgstr "瀏覽(_B)"
 msgid "Unknown"
 msgstr "未知"
 
-#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
 msgid "Success"
 msgstr "成功"
 
-#: src/addressbook.c:517 src/importldif.c:122
+#: src/addressbook.c:512 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "錯誤的命令"
 
-#: src/addressbook.c:518 src/importldif.c:123
+#: src/addressbook.c:513 src/importldif.c:123
 msgid "File not specified"
 msgstr "未指定檔案"
 
-#: src/addressbook.c:519 src/importldif.c:124
+#: src/addressbook.c:514 src/importldif.c:124
 msgid "Error opening file"
 msgstr "檔案開啟失敗"
 
-#: src/addressbook.c:520 src/importldif.c:125
+#: src/addressbook.c:515 src/importldif.c:125
 msgid "Error reading file"
 msgstr "讀取檔案錯誤"
 
-#: src/addressbook.c:521 src/importldif.c:126
+#: src/addressbook.c:516 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "已達檔案結尾"
 
-#: src/addressbook.c:522 src/importldif.c:127
+#: src/addressbook.c:517 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "記憶體配置錯誤"
 
-#: src/addressbook.c:523 src/importldif.c:128
+#: src/addressbook.c:518 src/importldif.c:128
 msgid "Bad file format"
 msgstr "檔案格式錯誤"
 
-#: src/addressbook.c:524 src/importldif.c:129
+#: src/addressbook.c:519 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "檔案寫入錯誤"
 
-#: src/addressbook.c:525 src/importldif.c:130
+#: src/addressbook.c:520 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "目錄開啟錯誤"
 
-#: src/addressbook.c:526 src/importldif.c:131
+#: src/addressbook.c:521 src/importldif.c:131
 msgid "No path specified"
 msgstr "指定的路徑不存在"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error connecting to LDAP server"
 msgstr "連線至LDAP伺服器錯誤"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "Error initializing LDAP"
 msgstr "LDAP初始化錯誤"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "Error binding to LDAP server"
 msgstr "LDAP伺服器綁定錯誤"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error searching LDAP database"
 msgstr "搜尋LDAP資料庫錯誤"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Timeout performing LDAP operation"
 msgstr "進行LDAP操作超時"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜尋標準錯誤"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP的搜尋標準進入點不存在"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "LDAP search terminated on request"
 msgstr "LDAP搜尋被要求終止"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:539
 msgid "Error starting STARTTLS connection"
 msgstr "TLS連線起始失敗"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:540
 msgid "Distinguished Name (dn) is missing"
 msgstr "缺少識別名稱?"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:541
 msgid "Missing required information"
 msgstr "缺少要求的資訊"
 
-#: src/addressbook.c:547
+#: src/addressbook.c:542
 msgid "Another contact exists with that key"
 msgstr "發現另一個連絡人存在相同的金鑰"
 
-#: src/addressbook.c:548
+#: src/addressbook.c:543
 msgid "Strong(er) authentication required"
 msgstr "需要更強而有力的認證碼"
 
-#: src/addressbook.c:916
+#: src/addressbook.c:911
 msgid "Sources"
 msgstr "來源"
 
-#: src/addressbook.c:920 src/prefs_matcher.c:643 src/prefs_other.c:493
+#: src/addressbook.c:915 src/prefs_matcher.c:643 src/prefs_other.c:493
 #: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:1118 src/editldap.c:794
+#: src/addressbook.c:1109 src/editldap.c:794
 msgid "Search"
 msgstr "搜尋"
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1481
 msgid "Delete group"
 msgstr "刪除群組"
 
-#: src/addressbook.c:1491
+#: src/addressbook.c:1482
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -665,26 +656,26 @@ msgstr ""
 "確認要刪除群組嗎?\n"
 "所有的地址將遺失"
 
-#: src/addressbook.c:2218
+#: src/addressbook.c:2209
 msgid "Cannot paste. Target address book is readonly."
 msgstr "無法貼上,此地址是唯讀的"
 
-#: src/addressbook.c:2228
+#: src/addressbook.c:2219
 msgid "Cannot paste into an address group."
 msgstr "無法貼在地址群組上"
 
-#: src/addressbook.c:2965
+#: src/addressbook.c:2956
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "確認要刪除%s內所有搜尋的結果和地址嗎?"
 
-#: src/addressbook.c:2968 src/addressbook.c:2994 src/addressbook.c:3001
+#: 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
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:2968
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -692,20 +683,20 @@ msgid ""
 msgstr ""
 "確認刪除%s嗎?如果只刪除資料夾,則裡面原有的地址都將被自動移至上層資料夾內"
 
-#: src/addressbook.c:2980 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: 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
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2972
 msgid "Delete _folder only"
 msgstr "只刪除資料夾(_f)"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2972
 msgid "Delete folder and _addresses"
 msgstr "刪除資料夾和地址(_a)"
 
-#: src/addressbook.c:2992
+#: src/addressbook.c:2983
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -714,7 +705,7 @@ msgstr ""
 "確認刪除%s嗎?\n"
 "所有的地址將不會遺失"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:2990
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -723,28 +714,28 @@ msgstr ""
 "確認刪除%s嗎?\n"
 "所有的地址都將遺失"
 
-#: src/addressbook.c:3113
+#: src/addressbook.c:3104
 #, c-format
 msgid "Search '%s'"
 msgstr "尋找 %s"
 
-#: src/addressbook.c:3251 src/addressbook.c:3300
+#: src/addressbook.c:3242 src/addressbook.c:3291
 msgid "New Contacts"
 msgstr "新增連絡人"
 
-#: src/addressbook.c:4137
+#: src/addressbook.c:4128
 msgid "New user, could not save index file."
 msgstr "新連絡人無法儲存至索引檔中"
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4132
 msgid "New user, could not save address book files."
 msgstr "新連絡人無法儲存至通訊錄檔案"
 
-#: src/addressbook.c:4151
+#: src/addressbook.c:4142
 msgid "Old address book converted successfully."
 msgstr "舊通訊錄轉換成功"
 
-#: src/addressbook.c:4156
+#: src/addressbook.c:4147
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -752,7 +743,7 @@ msgstr ""
 "舊通訊錄已轉換,\n"
 "無法儲存新地址索引檔"
 
-#: src/addressbook.c:4169
+#: src/addressbook.c:4160
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -760,7 +751,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "但已建立新的空通訊錄檔案"
 
-#: src/addressbook.c:4175
+#: src/addressbook.c:4166
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -768,7 +759,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "無法儲存新的地址索引檔"
 
-#: src/addressbook.c:4180
+#: src/addressbook.c:4171
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -776,52 +767,52 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "且無法建立新的通訊錄檔案"
 
-#: src/addressbook.c:4187 src/addressbook.c:4193
+#: src/addressbook.c:4178 src/addressbook.c:4184
 msgid "Addressbook conversion error"
 msgstr "通訊錄轉換失敗"
 
-#: src/addressbook.c:4308
+#: src/addressbook.c:4299
 msgid "Addressbook Error"
 msgstr "通訊錄錯誤"
 
-#: src/addressbook.c:4309
+#: src/addressbook.c:4300
 msgid "Could not read address index"
 msgstr "無法讀取地址索引"
 
-#: src/addressbook.c:4640
+#: src/addressbook.c:4631
 msgid "Busy searching..."
 msgstr "正在搜尋..."
 
-#: src/addressbook.c:4970 src/prefs_send.c:220
+#: src/addressbook.c:4961 src/prefs_send.c:220
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:4982
+#: src/addressbook.c:4973
 msgid "Address Books"
 msgstr "通訊錄"
 
-#: src/addressbook.c:4994
+#: src/addressbook.c:4985
 msgid "Person"
 msgstr "人員"
 
-#: src/addressbook.c:5030 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3149 src/prefs_folder_column.c:77
+#: 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
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:5042
+#: src/addressbook.c:5033
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5054 src/addressbook.c:5066
+#: src/addressbook.c:5045 src/addressbook.c:5057
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5078
+#: src/addressbook.c:5069
 msgid "LDAP servers"
 msgstr "LDAP伺服器"
 
-#: src/addressbook.c:5090
+#: src/addressbook.c:5081
 msgid "LDAP Query"
 msgstr "LDAP查詢"
 
@@ -928,18 +919,18 @@ msgstr "地址更新"
 msgid "Update failed. Changes not written to Directory."
 msgstr "更新錯誤!所有的改變將不會被儲存"
 
-#: src/alertpanel.c:144 src/compose.c:9795
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:157 src/compose.c:5856 src/compose.c:6401
-#: src/compose.c:12258 src/file_checker.c:84 src/file_checker.c:108
+#: src/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:5091
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5793 src/inc.c:726
+#: 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
 msgid "Error"
 msgstr "錯誤"
@@ -1052,36 +1043,36 @@ msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 
-#: src/common/session.c:201 src/imap.c:1233
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr "SSL/TLS 交握失敗\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr "找不到有效SMTP認證方法\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "指定的SMPT認證方法是無效的\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr "錯誤的SMTP回應\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP執行時期發生錯誤\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr "認證發生錯誤\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "訊息太多(最大的容許量是 %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr "無法執行STARTTLS\n"
 
@@ -1218,639 +1209,647 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4028
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "星期日"
 
-#: src/common/utils.c:4029
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "星期一"
 
-#: src/common/utils.c:4030
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/common/utils.c:4031
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/common/utils.c:4032
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/common/utils.c:4033
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "星期五"
 
-#: src/common/utils.c:4034
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/common/utils.c:4036
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "一月"
 
-#: src/common/utils.c:4037
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "二月"
 
-#: src/common/utils.c:4038
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "三月"
 
-#: src/common/utils.c:4039
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "四月"
 
-#: src/common/utils.c:4040
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4041
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "六月"
 
-#: src/common/utils.c:4042
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "七月"
 
-#: src/common/utils.c:4043
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "八月"
 
-#: src/common/utils.c:4044
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "九月"
 
-#: src/common/utils.c:4045
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "十月"
 
-#: src/common/utils.c:4046
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "十一月"
 
-#: src/common/utils.c:4047
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "十二月"
 
-#: src/common/utils.c:4049
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "星期日"
 
-#: src/common/utils.c:4050
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "星期一"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "星期二"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "星期三"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "星期四"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "星期五"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "星期六"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "一月"
 
-#: src/common/utils.c:4058
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "二月"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "三月"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "四月"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "六月"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "七月"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "八月"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "九月"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "十月"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "十一月"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "十二月"
 
-#: src/common/utils.c:4079
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "上午"
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "下午"
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "上午"
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "下午"
 
-#: src/compose.c:596
+#: src/compose.c:198
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+"您已選擇簽章及(或)加密此信件,但是尚未選擇一個獨立的系統\n"
+"\n"
+"已取消簽證章及加密此信件"
+
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "新增(_A)..."
 
-#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/compose.c:599 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr "屬性(_P)"
 
-#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: src/compose.c:609
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "拼字(_S)"
 
-#: src/compose.c:611 src/compose.c:678
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "選用(_O)"
 
-#: src/compose.c:615
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
+msgid "_Help"
+msgstr "協助(_H)"
+
+#: src/compose.c:623
 msgid "S_end"
 msgstr "傳送(_e)"
 
-#: src/compose.c:616
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "稍後傳送(_l)"
 
-#: src/compose.c:619
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "附加檔案(_A)"
 
-#: src/compose.c:620
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "插入檔案(_I)"
 
-#: src/compose.c:621
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "插入簽名(_g)"
 
-#: src/compose.c:622
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "覆蓋簽名(_R)"
 
-#: src/compose.c:626
+#: src/compose.c:634
 msgid "_Print"
 msgstr "列印(_P)"
 
-#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
-#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "剪下(_t)"
 
-#: src/compose.c:639
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "特殊貼上(_S)"
 
-#: src/compose.c:640
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "如引言(_q)"
 
-#: src/compose.c:641
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "已換行(_W)"
 
-#: src/compose.c:642
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "不換行(_U)"
 
-#: src/compose.c:644 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "全選(_a)"
 
-#: src/compose.c:646
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "進階(_d)"
 
-#: src/compose.c:647
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "向後移動一個位元"
 
-#: src/compose.c:648
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "向前移動一個位元"
 
-#: src/compose.c:649
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "向後移動一個字"
 
-#: src/compose.c:650
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "向前移動一個字"
 
-#: src/compose.c:651
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "移至列首"
 
-#: src/compose.c:652
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "移至列尾"
 
-#: src/compose.c:653
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "移至上一列"
 
-#: src/compose.c:654
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "移至下一列"
 
-#: src/compose.c:655
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "向後刪除一個字元"
 
-#: src/compose.c:656
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "向前刪除一個字元"
 
-#: src/compose.c:657
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "向後刪除一個字"
 
-#: src/compose.c:658
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "向前刪除一個字"
 
-#: src/compose.c:659
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "刪除列"
 
-#: src/compose.c:660
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "刪除至列尾"
 
-#: src/compose.c:663 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "尋找(_F)"
 
-#: src/compose.c:666
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "目前的段落換行(_W)"
 
-#: src/compose.c:667
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "所有的長列換行(_l)"
 
-#: src/compose.c:669
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "用外部編輯器進行編輯(_x)"
 
-#: src/compose.c:672
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "檢查所有或勾選的項目(_C)"
 
-#: src/compose.c:673
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "標示所有拼錯的單字(_H)"
 
-#: src/compose.c:674
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "向後檢查拼錯的單字(_b)"
 
-#: src/compose.c:675
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "向前檢查拼錯的單字(_F)"
 
-#: src/compose.c:682
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "回復模式(_m)"
 
-#: src/compose.c:684
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "隱私系統(_S)"
 
-#: src/compose.c:688
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "優先權(_P)"
 
-#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "字元編碼(_e)"
 
-#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "西歐"
 
-#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "波羅的海"
 
-#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "希伯來"
 
-#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "阿拉伯"
 
-#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "西里爾"
 
-#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "日文"
 
-#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "中文"
 
-#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "韓文"
 
-#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "泰文"
 
-#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "通訊錄"
 
-#: src/compose.c:708
+#: src/compose.c:716
 msgid "_Template"
 msgstr "樣板"
 
-#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "動作"
 
-#: src/compose.c:719
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
+msgid "_About"
+msgstr "關於"
+
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "自動換行"
 
-#: src/compose.c:720
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "自動縮排(_i)"
 
-#: src/compose.c:721
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "簽名"
 
-#: src/compose.c:722
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "加密"
 
-#: src/compose.c:723
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "要求回條"
 
-#: src/compose.c:724
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "移除參考"
 
-#: src/compose.c:725
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "顯示尺標"
 
-#: src/compose.c:730 src/compose.c:740
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "一般"
 
-#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
 #: src/summaryview.c:433
 msgid "_All"
 msgstr "所有"
 
-#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_Sender"
 msgstr "傳送者"
 
-#: src/compose.c:733
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "寄送清單"
 
-#: src/compose.c:738
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "最高"
 
-#: src/compose.c:739
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "高"
 
-#: src/compose.c:741
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "低"
 
-#: src/compose.c:742
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "最低"
 
-#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "自動"
 
-#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "萬國碼 (_UTF-8)"
 
-#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "中歐 (ISO-8859-_2)"
 
-#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "希臘 (ISO-8859-_7)"
 
-#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "士耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:1015 src/compose.c:1697
-msgid ""
-"You have opted to sign and/or encrypt this message but have not selected a "
-"privacy system.\n"
-"\n"
-"Signing and encrypting have been disabled for this message."
-msgstr ""
-"您已選擇簽章及(或)加密此信件,但是尚未選擇一個獨立的系統\n"
-"\n"
-"已取消簽證章及加密此信件"
-
-#: src/compose.c:1051
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr "新訊息寄件者格式錯誤"
 
-#: src/compose.c:1144
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr "新訊息標題格式錯誤"
 
-#: src/compose.c:1176 src/quote_fmt.c:563
+#: src/compose.c:1181 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "新訊息內容樣板在第%d行出現錯誤"
 
-#: src/compose.c:1445
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "無法回覆,原始信件可能不存在"
 
-#: src/compose.c:1630 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "回寄信件內的寄件者樣板包含一個無效的郵件地址"
 
-#: src/compose.c:1679 src/quote_fmt.c:583
+#: src/compose.c:1684 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "回寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "轉寄信件內的寄件者樣板包含一個無效的郵件地址"
 
-#: src/compose.c:1883 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "轉寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:2059
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
 msgstr "回覆:多重郵件"
 
-#: src/compose.c:2566
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "改寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:2633 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "副本:"
 
-#: src/compose.c:2636 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "密件副本:"
 
-#: src/compose.c:2639 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "回信給:"
 
-#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "新聞群組:"
 
-#: src/compose.c:2645 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "跟隨至:"
 
-#: src/compose.c:2648 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "回覆至:"
 
-#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "收件者:"
 
-#: src/compose.c:2842
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "無法夾帶檔案(字元轉換失敗)"
 
-#: src/compose.c:2848
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1865,73 +1864,73 @@ msgstr[1] ""
 "下列檔案已經夾帶:\n"
 "%s"
 
-#: src/compose.c:3128
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "樣板內\"引用標示\"有誤"
 
-#: src/compose.c:3657
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "無法取得檔案'%s'大小"
 
-#: src/compose.c:3675
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "你可以在訊息內容中插入一個檔案 %s,確認要這樣幹嗎?"
 
-#: src/compose.c:3678
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr "你確定嗎?"
 
-#: src/compose.c:3679 src/compose.c:10844 src/compose.c:11738
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/compose.c:3804
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空白的"
 
-#: src/compose.c:3805
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr "清空檔案"
 
-#: src/compose.c:3806
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr "直接夾檔(_A)"
 
-#: src/compose.c:3815
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s"
 
-#: src/compose.c:3842
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr "訊息: %s"
 
-#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " 已編輯"
 
-#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新信件 %s"
 
-#: src/compose.c:4862 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[無主題] - 新信件 %s"
 
-#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "新信件"
 
-#: src/compose.c:4891 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1939,59 +1938,59 @@ msgstr ""
 "尚未指定郵件的傳送地址\n"
 "傳送前請選擇一個郵件地址"
 
-#: src/compose.c:5108 src/compose.c:5145
+#: src/compose.c:5126 src/compose.c:5163
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "只存在一個預設的收件者 '%s',確認寄出?"
 
-#: src/compose.c:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
-#: src/prefs_account.c:3758 src/toolbar.c:487 src/toolbar.c:519
+#: 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
 msgid "Send"
 msgstr "傳送"
 
-#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
-#: src/compose.c:5794 src/folderview.c:2546 src/messageview.c:859
+#: src/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
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: src/compose.c:5166
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr "尚未指定收件者"
 
-#: src/compose.c:5181
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "主題空白 %s"
 
-#: src/compose.c:5182 src/compose.c:5225
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "確認寄出?"
 
-#: src/compose.c:5183 src/compose.c:5226
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "儲存至草稿?"
 
-#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr "稍後寄送"
 
-#: src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr "草稿(_Q)"
 
-#: src/compose.c:5224
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "傳送給 %d 接收者. %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5271
 msgid "Could not queue message."
 msgstr "此訊息無法稍後再送出"
 
-#: src/compose.c:5256
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2002,7 +2001,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5260
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2013,7 +2012,7 @@ msgstr ""
 "\n"
 "簽名天敗:  %s"
 
-#: src/compose.c:5265
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2024,7 +2023,7 @@ msgstr ""
 "\n"
 "加密失敗:  %s"
 
-#: src/compose.c:5270
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2034,7 +2033,7 @@ msgstr ""
 "\n"
 "字元轉換失敗"
 
-#: src/compose.c:5274
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2044,7 +2043,7 @@ msgstr ""
 "\n"
 "無法取得收件者的加密金鑰"
 
-#: src/compose.c:5337 src/compose.c:5397
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2052,7 +2051,7 @@ msgstr ""
 "草稿信件無法被傳送\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5393
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
@@ -2061,7 +2060,7 @@ msgstr ""
 "%s\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5790
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2071,7 +2070,7 @@ msgstr ""
 "無法轉換訊息的字元編碼至指定的 %s 編碼\n"
 "確認以 %s 傳送?"
 
-#: src/compose.c:5852
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2083,98 +2082,98 @@ msgstr ""
 "訊息內容將被打斷以利傳輸\n"
 "確定要傳送嗎?"
 
-#: src/compose.c:6087
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr "加密警告"
 
-#: src/compose.c:6088
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr "繼續(_o)"
 
-#: src/compose.c:6137
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr "傳送郵件時找不到有效的帳號"
 
-#: src/compose.c:6146
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "選擇的帳號並非NNTP:無法傳輸"
 
-#: src/compose.c:6400
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "附加檔案%s不存在,忽略嗎?"
 
-#: src/compose.c:6402 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "終止傳送"
 
-#: src/compose.c:6402
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr "忽略附加檔案"
 
-#: src/compose.c:6458
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr "原始的第%s部份"
 
-#: src/compose.c:7058
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr "新增至通訊錄"
 
-#: src/compose.c:7225
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr "刪除目錄"
 
-#: src/compose.c:7229 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "按下 <tab> 可自動完成郵件地址"
 
-#: src/compose.c:7461
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr "Mime格式"
 
-#: src/compose.c:7467 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: 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
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:7529
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr "儲存訊息到"
 
-#: src/compose.c:7560 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:434
+#: src/plugins/spamassassin/spamassassin_gtk.c:437
 msgid "_Browse"
 msgstr "瀏覽"
 
-#: src/compose.c:7576
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr "選擇要儲存郵件的目錄"
 
-#: src/compose.c:8033
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "標頭"
 
-#: src/compose.c:8038
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "附件檔"
 
-#: src/compose.c:8052
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "其它"
 
-#: src/compose.c:8067
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "主旨"
 
-#: src/compose.c:8291
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2183,92 +2182,114 @@ msgstr ""
 "拼字檢查無法正確啟用\n"
 "%s"
 
-#: src/compose.c:8438
+#: src/compose.c:8456
 msgid "_From:"
 msgstr "寄件者:"
 
-#: src/compose.c:8455
+#: src/compose.c:8473
 msgid "Account to use for this email"
 msgstr "此郵件使用的帳號"
 
-#: src/compose.c:8457
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr "使用的寄件者地址"
 
-#: src/compose.c:8639
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr "無法載入隱私系統'%s',此訊息將無法被簽證或加密"
 
-#: src/compose.c:8750 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "空白(_N)"
 
-#: src/compose.c:8851 src/prefs_template.c:752
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "此樣板內容的第%d行發現錯誤"
 
-#: src/compose.c:8948
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "樣板中 '%s' 欄位格式錯誤"
 
-#: src/compose.c:9372
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr "無效的MINE型式"
 
-#: src/compose.c:9387
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或空白"
 
-#: src/compose.c:9461
+#: src/compose.c:9479
 msgid "Properties"
 msgstr "屬性"
 
-#: src/compose.c:9479
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr "MIME型式"
 
-#: src/compose.c:9512
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr "編碼中"
 
-#: src/compose.c:9532
+#: src/compose.c:9550
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:9533
+#: src/compose.c:9551
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/compose.c:9792
+#: src/compose.c:9646
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"無法將信件內容寫入檔案:\n"
+"%s"
+
+#: src/compose.c:9704
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"無法產生下列命令\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9743
 #, c-format
+msgid "External editor stopped with an error:%s"
+msgstr "外部編輯圖終止,錯誤碼:%s"
+
+#: src/compose.c:9817
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
-"外部編輯器使用中\n"
-"強制終止此行程嗎?\n"
-"行程id: %d"
+"外部編輯器正在使用中\n"
+"要強制終止此程序嗎?\n"
+"程序id: %d"
 
-#: src/compose.c:10265 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail 需要網路的存取權才能傳送此郵件"
 
-#: src/compose.c:10458
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10462
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10463
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2276,24 +2297,24 @@ msgstr ""
 "無法儲存為草稿\n"
 "確定要終止離開或放棄此郵件?"
 
-#: src/compose.c:10465
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr "終止離開"
 
-#: src/compose.c:10465
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr "放棄郵件"
 
-#: src/compose.c:10654 src/compose.c:10668
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:10682
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "無法讀取檔案'%s'"
 
-#: src/compose.c:10684
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2302,50 +2323,50 @@ msgstr ""
 "目前的編碼檔案'%s'包含無效的字元\n"
 "插入可能是無效的"
 
-#: src/compose.c:10763
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr "放棄訊息"
 
-#: src/compose.c:10764
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr "此訊息已經被修改過了,要放棄嗎?"
 
-#: src/compose.c:10765 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "放棄"
 
-#: src/compose.c:10765 src/compose.c:10770
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr "儲存至草稿(_S)"
 
-#: src/compose.c:10768 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "儲存異動"
 
-#: src/compose.c:10769
+#: src/compose.c:10734
 msgid "This message has been modified. Save the latest changes?"
 msgstr "此訊息已經被修改過了,要儲存最後的修改嗎?"
 
-#: src/compose.c:10770
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr "不要儲存"
 
-#: src/compose.c:10841
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "確定要使用樣板 '%s'嗎?"
 
-#: src/compose.c:10843
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr "使用樣板"
 
-#: src/compose.c:10844 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
 #: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "覆蓋(_R)"
 
-#: src/compose.c:11731
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2356,20 +2377,20 @@ msgid_plural ""
 msgstr[0] "確定要將此一檔案內容插入至郵件訊息中?還是要將它附加至郵件?"
 msgstr[1] "確定要將%d個檔案的內容插入至郵件訊息中?還是要將它們附加至郵件?"
 
-#: src/compose.c:11737
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr "確定插入或附加檔案?"
 
-#: src/compose.c:11738
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr "附加檔案(_A)"
 
-#: src/compose.c:11956
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "第%d格式有誤"
 
-#: src/compose.c:12252
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2584,7 +2605,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:2158
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "檔案"
@@ -2633,12 +2654,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "輸入新名稱給資料夾"
 
-#: src/editgroup.c:556 src/foldersel.c:572 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr "新增資料夾"
 
-#: src/editgroup.c:557 src/foldersel.c:573 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr "輸入名稱給新資料夾"
@@ -2667,13 +2688,13 @@ msgstr "新增JPilot進入點"
 msgid "Edit LDAP - Select Search Base"
 msgstr "編輯LDAP - 選擇搜尋基準"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "主機名稱"
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "通訊埠"
@@ -2733,7 +2754,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
@@ -2880,8 +2901,8 @@ msgstr "綁定密碼"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "以\"Bind DN\"進行連線時,此密碼將被使用"
 
-#: 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/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
 msgid "Show password"
 msgstr "顯示密碼"
@@ -2903,11 +2924,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜尋結果中可以接收的最大登入數量"
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr "基本"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "延伸"
 
@@ -3045,8 +3066,8 @@ msgstr "樣式"
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
 #: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1040
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
+#: 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
 msgid "None"
 msgstr "無"
 
@@ -3275,7 +3296,7 @@ msgstr "匯出通訊錄至 LDIF 檔"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr "匯出至 mbox 檔案"
 
@@ -3340,17 +3361,17 @@ msgstr "名稱太長"
 msgid "Not specified."
 msgstr "未指定"
 
-#: 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 "缺少檔案 %s,確認要用使用來自於 %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 "無法從 %s 複制到 %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 "
@@ -3450,51 +3471,51 @@ msgstr "無法套用此動作\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "此動作 [ %s ] 套用後沒有其它的處理程序\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "套用規則 '%s' [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "套用規則 <unnamed> [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "關閉規則 '%s' [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "關閉規則 <unnamed> [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr "未確定的"
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr "結合"
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr "手動地"
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr "資料夾處理中"
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr "前處理"
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr "後處理"
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3511,11 +3532,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3550,48 +3571,52 @@ msgstr "草稿"
 msgid "Processing (%s)...\n"
 msgstr "處理 (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "正在複製 %s 到 %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "正在移動 %s 到 %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "正在為 %s 更新緩衝..."
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr "郵件處理..."
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "離線同步化 %s ...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr "資料夾名稱開頭或結尾不能為'.'"
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr "資料夾名稱開頭或結尾不能為'.'"
 
-#: src/foldersel.c:250
+#: src/foldersel.c:251
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:574 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: 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
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:582 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:576 src/imap_gtk.c:198 src/mh_gtk.c:147
+msgid "Inherit properties and processing rules from parent folder"
+msgstr "從上層資料夾繼承屬性並處理"
+
+#: src/foldersel.c:586 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
 #: src/plugins/rssyl/rssyl_cb_menu.c:202
@@ -3600,7 +3625,7 @@ msgstr "新資料夾"
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' 不能被包含在資料夾名稱內"
 
-#: src/foldersel.c:597 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: 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
@@ -3608,7 +3633,7 @@ msgstr "'%c' 不能被包含在資料夾名稱內"
 msgid "The folder '%s' already exists."
 msgstr "資料夾 '%s' 已經存在"
 
-#: src/foldersel.c:604 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:608 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
@@ -3657,13 +3682,13 @@ msgstr "設定已顯示行數"
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr "新郵件"
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "未讀郵件"
@@ -3682,7 +3707,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "設定資料夾訊息..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr "將所有的郵件標示為已讀"
 
@@ -3692,11 +3717,11 @@ msgid ""
 "read?"
 msgstr "確定要將此資料夾及其下的子目錄內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:871 src/summaryview.c:4292
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "確定要將此資料內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr "將所有的郵件標示為未讀"
 
@@ -3706,16 +3731,16 @@ msgid ""
 "unread?"
 msgstr "確定要將此資料夾及其下的子目錄內所有的郵件標示為未讀嗎?"
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:877 src/summaryview.c:4338
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "確定要將此資料內所有的郵件標示為未讀嗎?"
 
-#: src/folderview.c:1067 src/imap.c:4643
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "掃描資料夾 %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4647 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "掃描資料夾 %s..."
@@ -3772,7 +3797,7 @@ msgstr "刪除所以回收桶內的郵件"
 msgid "_Empty trash"
 msgstr "清空回收桶(_E)"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "離線警告"
 
@@ -3792,7 +3817,7 @@ msgstr "傳送所有暫存郵件?"
 msgid "Some errors occurred while sending queued messages."
 msgstr "傳送暫存郵件時發生一些錯誤"
 
-#: src/folderview.c:2557 src/main.c:2812 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3858,7 +3883,7 @@ msgstr "移動失敗"
 msgid "Processing configuration for folder %s"
 msgstr "進行資料夾 %s 配置"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr "目的資料夾只能被用來儲存子資料夾"
 
@@ -3908,7 +3933,7 @@ msgstr "未知的"
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得新聞群組清單"
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr "完成"
 
@@ -3940,11 +3965,11 @@ msgstr ""
 
 #: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"版權所有 (C) 1999-2019\n"
+"版權所有 (C) 1999-2021\n"
 "Claws Mail 團隊及\n"
 "Hiroyuki Yamamoto"
 
@@ -4093,44 +4118,44 @@ msgstr ""
 "你將會伴隨此程式收到一份 GNU General Public License 的複本,如果沒有收到,請"
 "參閱"
 
-#: src/gtk/about.c:718 src/main.c:2636
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr "通信統計\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2646 src/main.c:2649
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr "開始於: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2655
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr "收件傳輸量\n"
 
-#: src/gtk/about.c:741 src/main.c:2658
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "已接收郵件: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2664
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr "外寄傳輸量\n"
 
-#: src/gtk/about.c:751 src/main.c:2667
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "新/改寄的郵件: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2671
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "回覆的郵件: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2675
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "轉寄的郵件: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2679
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "所有寄出的郵件: %d\n"
@@ -4338,20 +4363,20 @@ msgstr ""
 "這個拼字檢查器無法改變替換的字典\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1862
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "失敗: 找不到服務記錄"
 
-#: src/gtk/gtkutils.c:1865
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "失敗: 網路錯誤"
 
-#: src/gtk/gtkutils.c:1868
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "未知的錯誤(%d)"
 
-#: src/gtk/gtkutils.c:1938
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "配置..."
 
@@ -4595,7 +4620,7 @@ msgstr "代理人:"
 msgid "Content-Type"
 msgstr "內容種類"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr "內容種類:"
 
@@ -4623,7 +4648,7 @@ msgstr "優先權"
 msgid "Precedence:"
 msgstr "優先權:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "組織"
 
@@ -4945,7 +4970,8 @@ msgstr ""
 #: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
-#: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/libravatar/libravatar_prefs.c:563
+#: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
@@ -4958,7 +4984,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/spamassassin/spamassassin_gtk.c:673
 #: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "外掛程式"
@@ -5001,11 +5027,11 @@ msgid "_Hide"
 msgstr "隱藏(_H)"
 
 #: 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: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
 msgid "Account"
 msgstr "帳號"
 
@@ -5225,51 +5251,51 @@ msgstr ""
 "擴展性的搜尋允許使用者自定標準法則,郵件必需排序而且顯示在郵件清單內\n"
 "下列符號是允許被使用的:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr "搜尋過程出現一些錯誤,請檢視你的歷程"
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr "寄件者/收件者/密件/主旨/標籤"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "循環"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "黏貼"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "預先輸入"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "執行所選擇的"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "清除目前的搜尋"
 
-#: 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 "編輯搜尋規則"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr "關於擴展符號的資訊"
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr "資訊(_I)"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr "編輯(_d)"
 
-#: 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:349
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "清除(_l)"
@@ -5445,211 +5471,211 @@ msgstr "(無寄件者)"
 msgid "(No Subject)"
 msgstr "(無主旨)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr "錯誤:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "檔案名稱"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr "檔案大小:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr "載入圖片"
 
-#: src/imap.c:577
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr "IMAP4 連線中斷\n"
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: 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
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP 發生%s錯誤:"
 
-#: src/imap.c:622
+#: src/imap.c:628
 msgid "authenticated"
 msgstr " 已認證"
 
-#: src/imap.c:625
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr "沒有認證"
 
-#: src/imap.c:628
+#: src/imap.c:634
 msgid "bad state"
 msgstr " 錯誤狀態"
 
-#: src/imap.c:631
+#: src/imap.c:637
 msgid "stream error"
 msgstr " stream 錯誤"
 
-#: src/imap.c:634
+#: src/imap.c:640
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr " 解析錯誤(很可能是因為不符合伺服器的RFC規範)"
 
-#: src/imap.c:638
+#: src/imap.c:644
 msgid "connection refused"
 msgstr "連線被拒絕"
 
-#: src/imap.c:641
+#: src/imap.c:647
 msgid "memory error"
 msgstr "記憶體錯誤"
 
-#: src/imap.c:644
+#: src/imap.c:650
 msgid "fatal error"
 msgstr " 內部錯誤"
 
-#: src/imap.c:647
+#: src/imap.c:653
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr " 協定錯誤(很可能是因為不符合伺服器的RFC規範)"
 
-#: src/imap.c:651
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr " 連線沒有被接受"
 
-#: src/imap.c:654
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr " APPEND 錯誤"
 
-#: src/imap.c:657
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr " NOOP 錯誤"
 
-#: src/imap.c:660
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr " 登出錯誤"
 
-#: src/imap.c:663
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr " 容量錯誤"
 
-#: src/imap.c:666
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr " 檢查錯誤"
 
-#: src/imap.c:669
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr " 關閉錯誤"
 
-#: src/imap.c:672
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr " 刪除錯誤"
 
-#: src/imap.c:675
+#: src/imap.c:681
 msgid "COPY error"
 msgstr " 複製錯誤"
 
-#: src/imap.c:678
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr " UID 複制錯誤"
 
-#: src/imap.c:681
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr " 建立錯誤"
 
-#: src/imap.c:684
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr " 刪除錯誤"
 
-#: src/imap.c:687
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr " 檢驗錯誤"
 
-#: src/imap.c:690
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr " 擷取錯誤"
 
-#: src/imap.c:693
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr " UID取得錯誤"
 
-#: src/imap.c:696
+#: src/imap.c:702
 msgid "LIST error"
 msgstr " LIST 錯誤"
 
-#: src/imap.c:699
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr " 登入錯誤"
 
-#: src/imap.c:702
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr " LSUB 錯誤"
 
-#: src/imap.c:705
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr " 重新命名錯誤"
 
-#: src/imap.c:708
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr " 搜尋錯誤"
 
-#: src/imap.c:711
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr " UID搜尋錯誤"
 
-#: src/imap.c:714
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr " 選擇錯誤"
 
-#: src/imap.c:717
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr " 狀態錯誤"
 
-#: src/imap.c:720
+#: src/imap.c:726
 msgid "STORE error"
 msgstr " 儲存錯誤"
 
-#: src/imap.c:723
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr " UID儲存錯誤"
 
-#: src/imap.c:726
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr " 訂閱錯誤"
 
-#: src/imap.c:729
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr " 取消定閱錯誤"
 
-#: src/imap.c:732
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr " STARTLS錯誤"
 
-#: src/imap.c:735
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr " INVAL錯誤"
 
-#: src/imap.c:738
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr " 擴展錯誤"
 
-#: src/imap.c:741
+#: src/imap.c:747
 msgid "SASL error"
 msgstr " SASL 錯誤"
 
-#: src/imap.c:745
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr " SSL 錯誤"
 
-#: src/imap.c:749
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "未知的錯誤 [%d]"
 
-#: src/imap.c:955
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5661,7 +5687,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了CRAM-MD5 SASL外掛程式,CRAM-MD5登入才能"
 "正常運作"
 
-#: src/imap.c:961
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5673,7 +5699,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了DIGEST-MD5 SASL外掛程式,DIGEST-MD5登入"
 "才能正常運作"
 
-#: src/imap.c:967
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5685,7 +5711,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了SCRAM SASL外掛程式,SCRAM-SHA-1登入才能"
 "正常運作"
 
-#: src/imap.c:973
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5697,7 +5723,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了CRAM-MD5 SASL外掛程式,CRAM-MD5登入才能"
 "正常運作"
 
-#: src/imap.c:979
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5709,36 +5735,36 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了DIGEST-MD5 SASL外掛程式,DIGEST-MD5登入"
 "才能正常運作"
 
-#: src/imap.c:986
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "連線到 %s 失敗:登入被拒絕 %s"
 
-#: src/imap.c:990
+#: src/imap.c:1003
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "連線到 %s 失敗:登入被拒絕 %s\n"
 
-#: src/imap.c:1008
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "連線到 %s 失敗"
 
-#: src/imap.c:1015 src/imap.c:1018
+#: src/imap.c:1028 src/imap.c:1031
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 連線到 %s 已經被中斷,正在重新連線...\n"
 
-#: src/imap.c:1048 src/imap.c:3693 src/imap.c:4352 src/imap.c:4446
-#: src/imap.c:4624 src/imap.c:5435
+#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail 需要有網路的存取能力,才能夠存取 IMAP 伺服器"
 
-#: src/imap.c:1158 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr "不安全的連線"
 
-#: src/imap.c:1159 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5751,108 +5777,108 @@ msgstr ""
 "\n"
 "確認要繼續連線到這個伺服器嗎?此通訊將不安全"
 
-#: src/imap.c:1165 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr "繼續保持連線"
 
-#: src/imap.c:1174
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "帳號 '%s':連線到 IMAP4 伺服器:  %s:%d..."
 
-#: src/imap.c:1239
+#: src/imap.c:1252
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d"
 
-#: src/imap.c:1242
+#: src/imap.c:1255
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d\n"
 
-#: src/imap.c:1274 src/imap.c:4114
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr "無法啟始 STARTTLS 通信\n"
 
-#: src/imap.c:1343
+#: src/imap.c:1359
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "無法登入到 IMAP 伺服器 %s \n"
 
-#: src/imap.c:1346
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "無法登入到 IMAP 伺服器 %s"
 
-#: src/imap.c:1774
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr "加入郵件..."
 
-#: src/imap.c:1979 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr "複製郵件..."
 
-#: src/imap.c:2504
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr "因伺服器錯誤造成搜尋失敗"
 
-#: src/imap.c:2586
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr "無法設定已刪除旗標\n"
 
-#: src/imap.c:2593 src/imap.c:5065
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr "無法刪掉\n"
 
-#: src/imap.c:2944
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "在沒有訂閱的資料夾 %s 內尋找..."
 
-#: src/imap.c:2947
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "在%s尋找子資料夾..."
 
-#: src/imap.c:3235
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法建立郵件箱:LIST錯誤\n"
 
-#: src/imap.c:3248
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr "無法建立郵件箱\n"
 
-#: src/imap.c:3379
+#: src/imap.c:3422
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "無法將郵件箱口稱從 %s 變更為 %s\n"
 
-#: src/imap.c:3492
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr "無法刪除郵件箱\n"
 
-#: src/imap.c:3771
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr "LIST 失敗\n"
 
-#: src/imap.c:3856
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr "標示郵件..."
 
-#: src/imap.c:3959
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾: %s\n"
 
-#: src/imap.c:4111
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "伺服器需要以 STARTTLS 進行登入\n"
 
-#: src/imap.c:4121
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr "不能刷新功能\n"
 
-#: src/imap.c:4126
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5861,20 +5887,20 @@ msgstr ""
 "連線到 %s 失敗:伺服器需要 STARTTLS,但是目前的 Claws Mail 被編譯成不支援 "
 "STARTTLS 的版本\n"
 
-#: src/imap.c:4134
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr "伺服器登入被關閉\n"
 
-#: src/imap.c:4357
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr "取得郵件..."
 
-#: src/imap.c:5058
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "無法設定被刪除的旗標: %d\n"
 
-#: src/imap.c:6093
+#: src/imap.c:6136
 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"
@@ -5955,10 +5981,6 @@ msgstr ""
 "(如果要建立一個資料夾而只用來保存子資料夾且沒有郵件,\n"
 "請在資料夾後加上 '/'"
 
-#: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties and processing rules from parent folder"
-msgstr "從上層資料夾繼承屬性並處理"
-
 #: 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
@@ -6079,7 +6101,7 @@ msgstr "訂閱(_S)"
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-#: src/import.c:113 src/import.c:208
+#: src/import.c:113 src/import.c:209
 msgid "Import mbox file"
 msgstr "匯入 mbox 檔案"
 
@@ -6091,11 +6113,11 @@ msgstr "指定 mbox 檔案和目的資料夾"
 msgid "Destination folder:"
 msgstr "目的資料夾"
 
-#: src/import.c:203
+#: src/import.c:204
 msgid "Source mbox filename can't be left empty."
 msgstr "未指定有效的 mbox 檔案"
 
-#: src/import.c:208
+#: src/import.c:209
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6103,15 +6125,19 @@ msgstr ""
 "目的資料夾尚未設定\n"
 "確定要匯入 mbox 到收件夾嗎?"
 
-#: src/import.c:230
+#: src/import.c:231
 msgid "Can't find the destination folder."
 msgstr "找不到目的資料夾"
 
-#: src/import.c:263
+#: src/import.c:236
+msgid "Importing mbox file..."
+msgstr "匯入mbox檔案..."
+
+#: src/import.c:258
 msgid "Select importing file"
 msgstr "選擇匯戶檔案"
 
-#: src/import.c:281
+#: src/import.c:276
 msgid "Select folder to import to"
 msgstr "選擇要匯入的路徑"
 
@@ -6260,142 +6286,142 @@ msgstr "選擇 Pine 檔案"
 msgid "Import Pine file into Address Book"
 msgstr "匯入 Pine 檔至通訊錄"
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail 需要網路才能取得郵件"
 
-#: src/inc.c:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr "%s 失敗\n"
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr "取回新郵件"
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr "待命"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr "已取消"
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "正在取回"
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "完成 (%d 郵件 (%s) 已取回)"
 msgstr[1] "完成 (%d 郵件 (%s) 已取回"
 
-#: src/inc.c:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr "已完成 (沒有新郵件)"
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: 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: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
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:394
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr "超時"
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "已完成 (%d 新郵件)"
 msgstr[1] "已完成 (%d 新郵件)"
 
-#: src/inc.c:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr "已完成 (沒有新郵件)"
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 正在取回新郵件"
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "帳號 '%s': POP3 伺服器連線中: %s:%d..."
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "無法連線至 POP3 伺服器: %s:%d"
 
-#: src/inc.c:927
+#: src/inc.c:932
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線至 POP3 伺服器: %s:%d\n"
 
-#: src/inc.c:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "正在從 %s (%s) 取回郵件..."
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在取得新郵件 (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在取得新郵件 (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在取得新郵件 (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在取得郵件大小 (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr "離開中"
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在取得郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "正在取回 (%d 郵件 (%s) 已接收)"
 msgstr[1] "正在取回 (%d 郵件 (%s) 已接收)"
 
-#: src/inc.c:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "連線至 %s:%d 失敗"
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤"
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6404,37 +6430,37 @@ msgstr ""
 "處理郵件時發生錯誤\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr "沒有足夠的磁碟空間"
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr "無法寫入檔案"
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr "通訊錯誤"
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "連線至 %s:%d 時通訊錯誤"
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr "遠端伺服器關閉連線"
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "連線至 %s:%d 時被遠端伺服器關閉連線"
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr "郵件箱已鎖定"
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6443,11 +6469,11 @@ msgstr ""
 "郵件箱已鎖定:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6456,52 +6482,52 @@ msgstr ""
 "認證失敗:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr "連線已超時。可以在選項/其它/雜項中增加超時設定值,或許可以回復"
 
-#: src/inc.c:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "連線至 %s:%d 超時"
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr "已取消合併\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1766
+#: 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
 msgid "seconds"
 msgstr "秒"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 msgstr[1] "小時"
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%s 目前處於離線模式,要回復 %d %s 嗎?"
 
-#: src/inc.c:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%s 目前處於離線模式,要回復嗎?"
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr "僅一次有效(_l)"
 
@@ -6547,7 +6573,7 @@ msgstr ""
 "檔案 '%s' 已經存在\n"
 "無法建立資料夾"
 
-#: src/main.c:375
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6556,7 +6582,7 @@ msgstr ""
 "發現 %s 的配置設定\n"
 "確認要合併配置設定內容嗎?"
 
-#: src/main.c:377
+#: src/main.c:382
 #, c-format
 msgid ""
 "\n"
@@ -6569,11 +6595,11 @@ msgstr ""
 "你的 Sylpheed 過濾條件可以使用一個在 %s 的有效 script 進行轉換\n"
 " "
 
-#: src/main.c:389
+#: src/main.c:394
 msgid "Keep old configuration"
 msgstr "保留舊有的配置設定內容"
 
-#: src/main.c:392
+#: src/main.c:397
 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 "
@@ -6582,31 +6608,31 @@ msgstr ""
 "保留備份可以允許你未來回復至舊的版本,但是,如果你有 IMAP 或是新聞資料時,將"
 "會花費一些時間,同時,也會占去磁碟上的部份空間"
 
-#: src/main.c:400
+#: src/main.c:405
 msgid "Migration of configuration"
 msgstr "配置設定的合併內容"
 
-#: src/main.c:411
+#: src/main.c:416
 msgid "Copying configuration... This may take a while..."
 msgstr "正在複製配置內容... 這將會花費一些時間..."
 
-#: src/main.c:420
+#: src/main.c:425
 msgid "Migration failed!"
 msgstr "合併失敗"
 
-#: src/main.c:429
+#: src/main.c:434
 msgid "Migrating configuration..."
 msgstr "正在合併配置內容..."
 
-#: src/main.c:1141
+#: src/main.c:1146
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib 沒有支援 gthread(_t)\n"
 
-#: src/main.c:1161 src/main.c:1165 src/main.c:1169
+#: src/main.c:1166 src/main.c:1170 src/main.c:1174
 msgid "(or older)"
 msgstr "(或較舊的)"
 
-#: src/main.c:1510
+#: src/main.c:1515
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6623,7 +6649,7 @@ msgstr[1] ""
 "以下這些外掛程式載入失敗,請檢查外掛程式配置以獲取更多的資訊:\n"
 "%s"
 
-#: src/main.c:1552
+#: src/main.c:1557
 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 "
@@ -6632,7 +6658,7 @@ msgstr ""
 "Claws Mail已偵測到郵件配置,但是它並不完整。這可能是源自於一個無效的 IMAP 帳"
 "號。請嘗試使用郵件箱的最上層資料夾內的\"重建資料夾\"功能進行修復"
 
-#: src/main.c:1558
+#: src/main.c:1563
 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 "
@@ -6641,36 +6667,71 @@ msgstr ""
 "Claws Mail已偵測到郵件配置,但是它無法載入。這可能是源自於一個過時的延伸外掛"
 "程式,請重新安裝外掛程式後,再試一次。"
 
-#: src/main.c:1799
+#: src/main.c:1804
 msgid "Missing filename\n"
 msgstr "找不到案名稱\n"
 
-#: src/main.c:1806
+#: src/main.c:1811
 msgid "Cannot open filename for reading\n"
 msgstr "無法開啟要讀取的檔案名稱\n"
 
-#: src/main.c:1817
+#: src/main.c:1822
 msgid "Malformed header\n"
 msgstr "變形的標頭\n"
 
-#: src/main.c:1824
+#: src/main.c:1829
 msgid "Duplicated 'To:' header\n"
 msgstr "重複的'收件者:'標頭\n"
 
-#: src/main.c:1835
+#: src/main.c:1840
 msgid "Missing required 'To:' header\n"
 msgstr "遺失必要的'收件者:'標頭\n"
 
-#: src/main.c:1980
+#: src/main.c:1866
+msgid "%s. Try -h or --help for usage.\n"
+msgstr "嘗試使用 -h 或 -help 取得用法\n"
+
+#: src/main.c:1893 src/main.c:1956
+msgid "Missing file argument for option %s"
+msgstr "缺少選項 %s 的參數"
+
+#: src/main.c:1915
+msgid "Missing or empty uri argument for option %s"
+msgstr "缺少選項 %s 的uri參數或該參數是空值"
+
+#: src/main.c:1918
+msgid "Missing uri argument for option %s"
+msgstr "缺少選項 %s 的uri參數"
+
+#: src/main.c:1951
+#, c-format
+msgid "Missing at least one non-empty file argument for option %s"
+msgstr "選項 %s 至少缺了一個有效的參數檔"
+
+#: src/main.c:2020
+#, c-format
+msgid "Missing folder, type and request arguments for option %s"
+msgstr "選項 %s 缺少目錄、型別和需要的參數"
+
+#: src/main.c:2023
+#, c-format
+msgid "Missing type and request arguments for option %s"
+msgstr "選項 %s 缺少型別和需要的參數"
+
+#: src/main.c:2026
+msgid "Missing request argument for option %s"
+msgstr "缺少選項%s要求的參數"
+
+#: src/main.c:2042
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用方式: %s [選項]...\n"
 
-#: src/main.c:1982
+#: src/main.c:2044
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [郵件地址]    開啟新郵件視窗"
 
-#: src/main.c:1983
+#: src/main.c:2045
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6687,11 +6748,11 @@ msgstr ""
 "行,接著是\n"
 "                         郵件的內容,直到檔案結束"
 
-#: src/main.c:1988
+#: src/main.c:2050
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      如果可能的話加入訂閱的 URI"
 
-#: src/main.c:1989
+#: src/main.c:2051
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6701,7 +6762,7 @@ msgstr ""
 "                         以指定的附加檔案開啟新郵件視窗\n"
 "                         "
 
-#: src/main.c:1992
+#: src/main.c:2054
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6711,23 +6772,23 @@ msgstr ""
 "                         以指定的附加檔案夾在新開啟的郵件視窗\n"
 "                         "
 
-#: src/main.c:1995
+#: src/main.c:2057
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新郵件"
 
-#: src/main.c:1996
+#: src/main.c:2058
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帳號的新郵件"
 
-#: src/main.c:1997
+#: src/main.c:2059
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     取消接收郵件"
 
-#: src/main.c:1998
+#: src/main.c:2060
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       取消傳送郵件"
 
-#: src/main.c:1999
+#: src/main.c:2061
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6745,15 +6806,15 @@ msgstr ""
 "                         需求: 尋找字串\n"
 "                         遞迴: 若字串的開頭為 0, n, N, f or F,將會失敗"
 
-#: src/main.c:2006
+#: src/main.c:2068
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 傳送所有暫存的郵件"
 
-#: src/main.c:2007
+#: src/main.c:2069
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [資料夾]...   顯示所有郵件的數量"
 
-#: src/main.c:2008
+#: src/main.c:2070
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6761,61 +6822,62 @@ msgstr ""
 "  --status-full [資料夾]...\n"
 "                         顯示每一個資料夾的狀態"
 
-#: src/main.c:2010
+#: src/main.c:2072
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           顯示統計資訊"
 
-#: src/main.c:2011
+#: src/main.c:2073
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     重置統計資訊"
 
-#: src/main.c:2012
+#: src/main.c:2074
 msgid ""
-"  --select folder[/msg]  jumps to the specified folder/message\n"
-"                         folder is a folder id like 'folder/sub_folder'"
+"  --select folder[/msg]  jump to the specified folder/message\n"
+"                         folder is a folder id like 'folder/sub_folder', a "
+"file:// uri or an absolute path"
 msgstr ""
 "  --select 資料夾[/郵件]  跳至指定的資料夾/郵件\n"
-"                         資料夾是一個資料夾 id 像是'資料夾/子資料夾(_f)'"
+"                         資料夾是一個資料夾 id 像是'資料夾/子資料夾',一個"
+"file:// uri或是絕對路徑"
 
-#: src/main.c:2014
+#: src/main.c:2076
 msgid "  --online               switch to online mode"
 msgstr "  --online               切換至上線模式"
 
-#: src/main.c:2015
+#: src/main.c:2077
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切換至離線模式"
 
-#: src/main.c:2016
+#: src/main.c:2078
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       離開 Claws Mail"
 
-#: src/main.c:2017
-msgid "  --debug                debug mode"
-msgstr "  --debug                除錯模式"
+#: src/main.c:2079
+msgid "  --debug -d             debug mode"
+msgstr "  --debug -d               除錯模式"
 
-#: src/main.c:2018
+#: src/main.c:2080
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         釘住除錯模式"
 
-#: src/main.c:2019
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h              顯示這個說明並離開"
+#: src/main.c:2081
+msgid "  --help -h              display this help"
+msgstr "  --help -h              顯示這個說明"
 
-#: src/main.c:2020
-msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           顯示版本資訊並離開"
+#: src/main.c:2082
+msgid "  --version -v           output version information"
+msgstr "  --version -v           顯示版本資訊"
 
-#: src/main.c:2021
+#: src/main.c:2083
 msgid ""
-"  --version-full -V      output version and built-in features information "
-"and exit"
-msgstr "  --version-full -V      顯示版本資訊及內鍵的功能資訊並離開 "
+"  --version-full -V      output version and built-in features information"
+msgstr "  --version-full -V      顯示版本資訊及內鍵的功能資訊 "
 
-#: src/main.c:2022
+#: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           顯示配置路徑"
 
-#: src/main.c:2023
+#: src/main.c:2085
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -6823,40 +6885,55 @@ msgstr ""
 "  --alternate-config-dir [路徑]\n"
 "                         使用指定的配置路徑"
 
-#: src/main.c:2025
+#: src/main.c:2087
 msgid ""
-"  --geometry -geometry WxH+X+Y\n"
+"  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 msgstr ""
-"  --geometry -geometry WxH+X+Y\n"
-"\t\t\t\t\t\t\t設定主視窗的大小"
+"  --geometry -geometry [WxH][+X+Y]\n"
+"							設定主視窗的大小"
 
-#: src/main.c:2078
-msgid "Unknown option. Try -h or --help for usage.\n"
-msgstr "未知的選項。試著用 -h 或 -help 取得用法\n"
+#: src/main.c:2104
+#, c-format
+msgid "Missing directory argument for option %s"
+msgstr "缺少選項 %s 的路徑參數"
+
+#: src/main.c:2112
+#, c-format
+msgid "Missing geometry argument for option %s"
+msgstr "缺少選項 %s 的幾何參數"
 
-#: src/main.c:2096
+#: src/main.c:2123
+#, c-format
+msgid "Missing folder argument for option %s"
+msgstr "缺少選項 %s 的目錄參數"
+
+#: src/main.c:2156 src/main.c:2159
+msgid "Unknown option %s"
+msgstr "未知的選項 %s"
+
+#: src/main.c:2175
 #, c-format
 msgid "Processing (%s)..."
 msgstr "處理 (%s)..."
 
-#: src/main.c:2099
+#: src/main.c:2178
 msgid "top level folder"
 msgstr "最上層資料夾"
 
-#: src/main.c:2181
+#: src/main.c:2260
 msgid "Queued messages"
 msgstr "已暫存郵件"
 
-#: src/main.c:2182
+#: src/main.c:2261
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "尚有未傳送郵件在暫存區,確定要離開嗎?"
 
-#: src/main.c:2940
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager(網路管理員):網路是上線的\n"
 
-#: src/main.c:2946
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager(網路管理員):網路是離線的\n"
 
@@ -7618,7 +7695,7 @@ msgstr "降冪"
 msgid "_Auto detect"
 msgstr "自動偵測(_A)"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr "指定標籤"
 
@@ -7783,7 +7860,7 @@ msgstr "資料夾 %d 內沒有重複的郵件\n"
 msgid "Select folder to go to"
 msgstr "選擇要前往的資料夾"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr "在資料夾的規則進行前套用"
 
@@ -7791,7 +7868,7 @@ msgstr "在資料夾的規則進行前套用"
 msgid "Processing rules to apply after folder rules"
 msgstr "在資料夾的規則進行後套用"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr "過濾配置"
 
@@ -8132,8 +8209,8 @@ msgstr ""
 "\n"
 "  郵件已被刪除或移至其它資料夾"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr "學習過程中發生錯誤\n"
 
@@ -8243,7 +8320,7 @@ msgid "Go back to email"
 msgstr "回到電子郵件"
 
 #: src/mimeview.c:1815 src/mimeview.c:1907 src/mimeview.c:2149
-#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:440
+#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "無法儲存多重郵件的一個部份:%s"
@@ -8303,8 +8380,8 @@ msgstr "選擇目的資料夾"
 msgid "'%s' is not a directory."
 msgstr "'%s'並不是一個路徑"
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr "另存新檔"
 
@@ -8361,7 +8438,7 @@ msgstr "型式:"
 msgid "Size:"
 msgstr "大小:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: 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
 msgid "Description:"
@@ -8470,6 +8547,75 @@ msgstr "取消訂閱新聞群組"
 msgid "Rename newsgroup folder"
 msgstr "新聞群組資料夾重新命名"
 
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr "OAuth2 缺少認證碼\n"
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr "OAuth2 連線錯誤\n"
+
+#: src/oauth2.c:253 src/oauth2.c:367
+msgid "OAuth2 SSL connection error\n"
+msgstr "OAuth2 SSL 連線錯誤\n"
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr "已取得OAuth2 的取存token\n"
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr "未取得OAuth2 的取存token\n"
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr "已取得OAuth2 的更新token\n"
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "未取得OAuth2 的更新token\n"
+
+#: src/oauth2.c:452
+msgid "OAuth2 socket write error\n"
+msgstr "OAuth2 Socket寫入錯誤\n"
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr "OAuth2 socket 逾時錯誤\n"
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr "OAuth2 存取token仍有效\n"
+
+#: src/oauth2.c:534
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr "OAuth2 正以更新token取得存取token\n"
+
+#: src/oauth2.c:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr "OAuth2 正以認證碼嘗試更新存取token\n"
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr "OAuth2 存取token已更新\n"
+
+#: src/oauth2.c:583
+msgid "OAuth2 original: %s\n"
+msgstr "OAuth2 原始的:%s\n"
+
+#: src/oauth2.c:584
+msgid "OAuth2 encoded: %s\n"
+msgstr "OAuth2 已加密: %s\n"
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr ""
+"OAuth2 已解碼: %s\n"
+"\n"
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr "在鍵入密碼時擷取輸入內容"
@@ -8650,7 +8796,7 @@ msgstr "已保留地址的通訊錄路徑"
 #: 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/spamassassin/spamassassin_gtk.c:463
+#: src/plugins/spamassassin/spamassassin_gtk.c:466
 #: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
 #: src/prefs_matcher.c:690
 msgid "Select..."
@@ -9297,9 +9443,9 @@ msgstr "Bogofilter"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:118
-#: src/plugins/spamassassin/spamassassin_gtk.c:459
-#: src/plugins/spamassassin/spamassassin_gtk.c:508
-#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:686
+#: src/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
@@ -9393,25 +9539,25 @@ msgstr "垃圾郵件學習中"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Process messages on receiving"
 msgstr "收信時處理郵件"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:374
+#: src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Maximum size"
 msgstr "最大容量"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:383
+#: src/plugins/spamassassin/spamassassin_gtk.c:386
 msgid "Messages larger than this will not be checked"
 msgstr "郵件大小超過此將不被檢查"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1616
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr "KB"
 
@@ -9429,14 +9575,14 @@ msgstr "只標示為垃圾郵件"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:432
+#: src/plugins/spamassassin/spamassassin_gtk.c:435
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr "這是用來儲存已被判定為垃圾郵件的資料夾。清空它用來作為回收桶。"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:438
+#: src/plugins/spamassassin/spamassassin_gtk.c:441
 msgid "Click this button to select a folder for storing spam"
 msgstr "按下此鍵選擇一個資料夾作為儲存垃圾郵件使用"
 
@@ -9464,13 +9610,13 @@ msgstr "只執行在MH資料夾內的郵件"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:453
+#: src/plugins/spamassassin/spamassassin_gtk.c:456
 msgid "Whitelist senders found in address book/folder"
 msgstr "在通訊錄或資料夾中發現白名單的寄件者"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:457
+#: src/plugins/spamassassin/spamassassin_gtk.c:460
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9480,7 +9626,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:467
+#: src/plugins/spamassassin/spamassassin_gtk.c:470
 msgid "Click this button to select a book or folder in the address book"
 msgstr "按下此鍵在通訊錄中選擇一本書或資料夾"
 
@@ -9507,7 +9653,7 @@ msgstr "bogofilter執行檔案的路徑"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:445
+#: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Mark spam as read"
 msgstr "將垃圾郵件標記為已讀"
 
@@ -9572,7 +9718,7 @@ msgstr ""
 "可以在/Configuration/Preferences/Plugins/Bsfilter中找到所有的選項"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:424
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid "Save spam in"
 msgstr "儲存垃圾郵件在"
 
@@ -9915,7 +10061,7 @@ msgstr "在顯示視窗中開啟 (使用遠端資源)"
 msgid "Do nothing (remote content is disabled)"
 msgstr "無效 (使用遠端資源)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "代理伺服器"
@@ -9929,6 +10075,7 @@ msgid "Use proxy"
 msgstr "使用代理伺服器"
 
 #: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "遠端資源"
 
@@ -9945,6 +10092,7 @@ msgstr ""
 "對於郵件中有夾帶的圖片、scripts、外掛物件或Java applets,則依然可以進行處理"
 
 #: src/plugins/fancy/fancy_prefs.c:245
+#: src/plugins/litehtml_viewer/lh_prefs.c:121
 msgid "Enable loading of remote content"
 msgstr "載入遠端資源"
 
@@ -9963,7 +10111,7 @@ msgstr "此檔案內的CSS將套用在所有的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:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
+#: src/prefs_account.c:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "瀏覽(W)"
@@ -9972,89 +10120,89 @@ msgstr "瀏覽(W)"
 msgid "Select stylesheet"
 msgstr "選擇風格"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr "不載入遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr "載入圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr "使用遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr "啟用 Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr "啟用外掛程式"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr "啟用 Java"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
 msgstr "以外部瀏覽器開啟連結"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "發生錯誤: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s 是一個畸形或不支援的輸入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr "搜尋瀏覽器"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr "在檢視器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr "在瀏覽器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr "開啟圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
 msgstr "複製連結"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
 msgstr "下載連結"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr "另存圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr "複製圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr "匯入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML 檢視器"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10266,7 +10414,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:1921
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
 msgid "Authentication"
 msgstr "認證"
 
@@ -10316,30 +10464,30 @@ msgstr ""
 msgid "GData integration"
 msgstr "GData整合"
 
-#: src/plugins/libravatar/libravatar.c:332
-#: src/plugins/libravatar/libravatar.c:397
-#: src/plugins/libravatar/libravatar.c:457
-#: src/plugins/libravatar/libravatar_prefs.c:546
+#: src/plugins/libravatar/libravatar.c:334
+#: src/plugins/libravatar/libravatar.c:399
+#: src/plugins/libravatar/libravatar.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:564
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: src/plugins/libravatar/libravatar.c:339
+#: src/plugins/libravatar/libravatar.c:341
 msgid "Failed to register avatar header update hook"
 msgstr "註冊 avatar 標頭的更新 hook 失敗"
 
-#: src/plugins/libravatar/libravatar.c:348
+#: src/plugins/libravatar/libravatar.c:350
 msgid "Failed to register avatar image render hook"
 msgstr "註冊 avatar 圖示的渲染 hook 失敗"
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:356
 msgid "Failed to create avatar image cache directory"
 msgstr "建立 avatar 圖示的快取目錄失敗"
 
-#: src/plugins/libravatar/libravatar.c:364
+#: src/plugins/libravatar/libravatar.c:366
 msgid "Failed to load missing items cache"
 msgstr "載入遺失的項目快取失敗"
 
-#: src/plugins/libravatar/libravatar.c:407
+#: src/plugins/libravatar/libravatar.c:409
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10367,33 +10515,33 @@ msgstr ""
 "\n"
 "歡迎回覆當 <ricardo at mones.org> \n"
 
-#: src/plugins/libravatar/libravatar_prefs.c:137
+#: src/plugins/libravatar/libravatar_prefs.c:146
 msgid "Error reading cache stats"
 msgstr "讀取暫存狀態錯誤"
 
-#: src/plugins/libravatar/libravatar_prefs.c:141
+#: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr "使用在 %s 內的 %d 檔案, %d 目錄和 %d 其它項目以及 %d 錯誤"
 
-#: src/plugins/libravatar/libravatar_prefs.c:150
+#: src/plugins/libravatar/libravatar_prefs.c:159
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
 msgstr "使用在 %s 內的 %d 檔案, %d 目錄和 %d 其它項目"
 
-#: src/plugins/libravatar/libravatar_prefs.c:164
+#: src/plugins/libravatar/libravatar_prefs.c:173
 msgid "Clear icon cache"
 msgstr "清除快取圖示"
 
-#: src/plugins/libravatar/libravatar_prefs.c:165
+#: src/plugins/libravatar/libravatar_prefs.c:174
 msgid "Are you sure you want to remove all cached avatar icons?"
 msgstr "你確定要移除所有的快取圖示嗎?"
 
-#: src/plugins/libravatar/libravatar_prefs.c:178
+#: src/plugins/libravatar/libravatar_prefs.c:187
 msgid "Not enough memory for operation"
 msgstr "沒有足夠的記憶體進行操作"
 
-#: src/plugins/libravatar/libravatar_prefs.c:183
+#: src/plugins/libravatar/libravatar_prefs.c:192
 #, c-format
 msgid ""
 "Icon cache successfully cleared:\n"
@@ -10404,11 +10552,11 @@ msgstr ""
 "• %u 找不到已經移除的項目\n"
 "• %u 檔案已移除"
 
-#: src/plugins/libravatar/libravatar_prefs.c:188
+#: src/plugins/libravatar/libravatar_prefs.c:197
 msgid "Icon cache successfully cleared!"
 msgstr "圖示快取清除完成!"
 
-#: src/plugins/libravatar/libravatar_prefs.c:191
+#: src/plugins/libravatar/libravatar_prefs.c:200
 #, c-format
 msgid ""
 "Errors clearing icon cache:\n"
@@ -10423,82 +10571,98 @@ msgstr ""
 "• %u 檔案讀取錯誤\n"
 "• %u 檔案無法移除"
 
-#: src/plugins/libravatar/libravatar_prefs.c:198
+#: src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Error clearing icon cache."
 msgstr "清除圖示快取發生錯誤"
 
-#: src/plugins/libravatar/libravatar_prefs.c:213
+#: src/plugins/libravatar/libravatar_prefs.c:222
 msgid "_Use cached icons"
 msgstr "使用快取圖示(_U)"
 
-#: src/plugins/libravatar/libravatar_prefs.c:214
+#: src/plugins/libravatar/libravatar_prefs.c:223
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr "保持磁碟上的圖示以利重用將改為創造另外的網路要求"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
+#: src/plugins/libravatar/libravatar_prefs.c:238
 msgid "Cache refresh interval"
 msgstr "快取刷新的間隔時間"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
-#: 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/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
 msgid "hours"
 msgstr "小時"
 
-#: src/plugins/libravatar/libravatar_prefs.c:305
+#: src/plugins/libravatar/libravatar_prefs.c:316
 msgid "Mystery man"
 msgstr "神祕人"
 
-#: src/plugins/libravatar/libravatar_prefs.c:306
+#: src/plugins/libravatar/libravatar_prefs.c:317
 msgid "Identicon"
 msgstr "特徵圖示"
 
-#: src/plugins/libravatar/libravatar_prefs.c:307
+#: src/plugins/libravatar/libravatar_prefs.c:318
 msgid "MonsterID"
 msgstr "怪物ID"
 
-#: src/plugins/libravatar/libravatar_prefs.c:308
+#: src/plugins/libravatar/libravatar_prefs.c:319
 msgid "Wavatar"
 msgstr "Wavatar"
 
-#: src/plugins/libravatar/libravatar_prefs.c:309
+#: src/plugins/libravatar/libravatar_prefs.c:320
 msgid "Retro"
 msgstr "Retro"
 
-#: src/plugins/libravatar/libravatar_prefs.c:310
+#: src/plugins/libravatar/libravatar_prefs.c:321
+msgid "Robohash"
+msgstr "機器人交握"
+
+#: src/plugins/libravatar/libravatar_prefs.c:322
+msgid "Pagan"
+msgstr "Pagan"
+
+#: src/plugins/libravatar/libravatar_prefs.c:323
 msgid "Custom URL"
 msgstr "使用者URL"
 
-#: src/plugins/libravatar/libravatar_prefs.c:313
+#: src/plugins/libravatar/libravatar_prefs.c:326
 msgid "A blank image"
 msgstr "一個空白影像"
 
-#: src/plugins/libravatar/libravatar_prefs.c:314
+#: src/plugins/libravatar/libravatar_prefs.c:327
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr "一個低調的低反差淡灰色輪廓"
 
-#: src/plugins/libravatar/libravatar_prefs.c:315
+#: src/plugins/libravatar/libravatar_prefs.c:328
 msgid "A generated geometric pattern"
 msgstr "一個已經建立的幾何樣本"
 
-#: src/plugins/libravatar/libravatar_prefs.c:316
+#: src/plugins/libravatar/libravatar_prefs.c:329
 msgid "A generated full-body monster"
 msgstr "一個已經建立的全身怪物"
 
-#: src/plugins/libravatar/libravatar_prefs.c:317
+#: src/plugins/libravatar/libravatar_prefs.c:330
 msgid "A generated almost unique face"
 msgstr "一個已經建立的且幾乎是獨一無二的臉"
 
-#: src/plugins/libravatar/libravatar_prefs.c:318
+#: src/plugins/libravatar/libravatar_prefs.c:331
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr "一個已經建立的8位元拱形點矩陣圖示"
 
-#: src/plugins/libravatar/libravatar_prefs.c:319
+#: src/plugins/libravatar/libravatar_prefs.c:332
+msgid "A generated robotic character"
+msgstr "一個已經建立的機器人特徵"
+
+#: src/plugins/libravatar/libravatar_prefs.c:333
+msgid "A generated retro adventure game character"
+msgstr "一個已經建立的幾何樣本"
+
+#: src/plugins/libravatar/libravatar_prefs.c:334
 msgid "Redirect to a user provided URL"
 msgstr "改寄至使用者提供的URL"
 
-#: src/plugins/libravatar/libravatar_prefs.c:333
+#: src/plugins/libravatar/libravatar_prefs.c:348
 msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
@@ -10506,11 +10670,11 @@ msgstr ""
 "當沒有有效的使用者圖示時,輸入你想要改寄的URL若要使用預設的libravatar橘色圖"
 "示,請在URL處留白"
 
-#: src/plugins/libravatar/libravatar_prefs.c:382
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "允許改寄給其它的站台(_A)"
 
-#: src/plugins/libravatar/libravatar_prefs.c:383
+#: src/plugins/libravatar/libravatar_prefs.c:399
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -10518,23 +10682,23 @@ msgstr ""
 "跟隨來自於已收到的libravatar伺服器改寄回應到其它的avatar服務,像是gravatar."
 "com"
 
-#: src/plugins/libravatar/libravatar_prefs.c:392
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "啟用聯合伺服器(_E)"
 
-#: src/plugins/libravatar/libravatar_prefs.c:393
+#: src/plugins/libravatar/libravatar_prefs.c:409
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "嘗試從寄件者區域內的libravatar伺服器取得avatar"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr "要求已超時"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "秒"
 
-#: src/plugins/libravatar/libravatar_prefs.c:411
+#: 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."
@@ -10542,18 +10706,56 @@ msgstr ""
 "設定為0將使用全域的socket I/O 超時設定值。最大值必定小於全域的socket I/O 的超"
 "時設定值"
 
-#: src/plugins/libravatar/libravatar_prefs.c:455
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "快取圖示"
 
-#: src/plugins/libravatar/libravatar_prefs.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "預設為缺少圖示模式"
 
-#: src/plugins/libravatar/libravatar_prefs.c:463
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "網路"
 
+#: src/plugins/litehtml_viewer/lh_prefs.c:116
+msgid ""
+"Loading remote resources can lead to some privacy issues.\n"
+"When remote content loading is disabled, nothing will be requested\n"
+"from the network."
+msgstr ""
+"載入遠端資源可以導入部份隱私功能。若將\n"
+"遠端資源載入功能關閉,將不會存在任何來\n"
+"自於網路的要求。"
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:133
+msgid "Size of image cache in megabytes"
+msgstr "影像快取大小 megabytes"
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:148
+msgid "Default font"
+msgstr "預設字型"
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+msgid "Open Link"
+msgstr "開啟連結"
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+msgid "Copy Link Location"
+msgstr "複製連結路徑"
+
+#: src/plugins/litehtml_viewer/plugin.c:50
+msgid "LiteHTML viewer"
+msgstr "LiteHTML 檢視器"
+
+#: src/plugins/litehtml_viewer/plugin.c:55
+msgid ""
+"Viewer plugin for HTML emails, using the litehtml library (http://www."
+"litehtml.com/)."
+msgstr ""
+"HTML格式的郵件檢視器,使用litehtml library (http://www."
+"litehtml.com/)."
+
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder"
 msgstr "郵件箱資料夾"
@@ -10643,7 +10845,7 @@ msgstr "認證方法無效"
 msgid "sending error on Sieve session: %s\n"
 msgstr "在Sieve程序中發生傳送錯誤: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
 msgid "_Filter"
 msgstr "過濾器(_F)"
 
@@ -10700,7 +10902,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - 過濾器%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 "載入..."
 
@@ -10771,7 +10973,7 @@ msgstr "在伺服器上使用ManageSieve協定管理Sieve過濾器"
 msgid "Enable Sieve"
 msgstr "啟用Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr "伺服器資訊"
 
@@ -10822,28 +11024,28 @@ msgstr "指定認證"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
-#: src/prefs_account.c:1967
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 msgid "User ID"
 msgstr "使用者名稱"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c: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/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
 msgid "Password"
 msgstr "密碼"
 
-#: 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:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr "認證方式"
 
-#: 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/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
 msgid "Automatic"
 msgstr "自動"
@@ -10909,8 +11111,8 @@ msgstr "遞迴性的選擇"
 msgid "No new messages"
 msgstr "沒有新郵件"
 
-#: src/plugins/notification/notification_plugin.c:216
-#: src/plugins/notification/notification_plugin.c:420
+#: src/plugins/notification/notification_plugin.c:220
+#: src/plugins/notification/notification_plugin.c:424
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -10922,43 +11124,43 @@ msgstr "沒有新郵件"
 msgid "Notification"
 msgstr "通知"
 
-#: src/plugins/notification/notification_plugin.c:221
+#: src/plugins/notification/notification_plugin.c:225
 msgid "The Notification plugin needs threading support."
 msgstr "這個通知外掛程式需要執行緒的支援"
 
-#: src/plugins/notification/notification_plugin.c:228
+#: src/plugins/notification/notification_plugin.c:232
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr "此通知外掛程式註冊資料夾項目更新hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:236
+#: src/plugins/notification/notification_plugin.c:240
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr "此通知外掛程式註冊資料夾更新hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:246
+#: src/plugins/notification/notification_plugin.c:250
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr "此通知外掛程式註冊msginfo更新hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:256
+#: src/plugins/notification/notification_plugin.c:260
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr "此通知外掛程式註冊離線切換hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:267
+#: src/plugins/notification/notification_plugin.c:271
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr "此通知外掛程式註冊主視窗關閉hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:280
+#: src/plugins/notification/notification_plugin.c:284
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr "此通知外掛程式註冊取得iconified hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:293
+#: src/plugins/notification/notification_plugin.c:297
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr "此通知外掛程式註冊帳號清單改變hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:306
+#: src/plugins/notification/notification_plugin.c:310
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr "此通知外掛程式註冊佈景主題改變hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:425
+#: src/plugins/notification/notification_plugin.c:429
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -10972,7 +11174,7 @@ msgstr ""
 "\n"
 "歡迎回覆給 <berndth at gmx.de>"
 
-#: src/plugins/notification/notification_plugin.c:450
+#: src/plugins/notification/notification_plugin.c:454
 msgid "Various tools"
 msgstr "不同的工具"
 
@@ -11455,95 +11657,95 @@ msgstr "格式:"
 msgid "Optimized:"
 msgstr "已最佳化:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "PDF屬性"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: 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 "此文件已被鎖定,需要輸入正確的密碼才能開啟"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1387
 #, c-format
 msgid "%s Document"
 msgstr "%s 文件"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
 msgstr "%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 "PDF因為未知原因開啟(渲染)失敗"
 
-#: 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 "文件索引"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "第一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr "上一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "下一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "最後一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "放大"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "縮小"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "滿版"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "寬度放滿頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "列印文件"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "文件資訊"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "頁碼"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "縮放倍率因子"
 
-#: 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 "
@@ -11556,13 +11758,13 @@ msgstr ""
 "\n"
 "歡迎任何的回覆至: 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檢視器"
 
-#: 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 "
@@ -11612,18 +11814,29 @@ msgstr "請輸入密碼:"
 msgid "Bad passphrase.\n"
 msgstr "錯誤的密碼\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "金鑰匯入"
 
-#: 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 and import it?"
 msgstr ""
-"這個金鑰並不在你的鑰匙圈內。你希望 Claws Mail 嘗試從金鑰伺服器匯入它嗎? "
+"這個金鑰並不在你的鑰匙圈內。你希望 Claws Mail 嘗試匯入它嗎? "
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "_No"
+msgstr "_N否"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "使用代理伺服器"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr "來自網路金鑰路徑"
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
@@ -11631,15 +11844,15 @@ msgstr ""
 "\n"
 "  金鑰 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 "   這個金鑰並不在你的鑰匙圈內\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   這可能是可以匯入的"
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -11647,9 +11860,9 @@ msgstr ""
 "當處於上線工作狀態時,\n"
 "   或 "
 
-#: 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 ""
@@ -11657,7 +11870,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -11665,29 +11878,28 @@ msgstr ""
 "\n"
 "  正在匯入金鑰 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 "   這個金鑰已經被匯入你的鑰匙圈內\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 "   這個金鑰不能被匯入你的鑰匙圈內\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   金鑰伺服器有時很緩慢\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
 msgstr ""
-"   你可以嘗試以手動方式用命令:\n"
-"匯入\n"
-"     "
+"   你可以嘗試以手動匯入方式,以命令:"
+
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr "或"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   這個金鑰已經在你的鑰匙圈內了\n"
 
@@ -11746,8 +11958,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:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "分"
 
@@ -12356,8 +12568,8 @@ msgstr "顯示 Python 控制台..."
 msgid "Refresh"
 msgstr "更新"
 
-#: 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/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
 msgid "Browse"
 msgstr "瀏覽"
@@ -12667,7 +12879,7 @@ msgstr "如果可以的話擷取註解,貼文出現至今少於"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1585 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
+#: src/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "天"
 
@@ -12994,7 +13206,7 @@ msgid "Password:"
 msgstr "密碼:"
 
 #: src/plugins/spamassassin/spamassassin.c:78
-#: src/plugins/spamassassin/spamassassin_gtk.c:671
+#: src/plugins/spamassassin/spamassassin_gtk.c:674
 msgid "SpamAssassin"
 msgstr "垃圾暗殺者(SpamAssassin)"
 
@@ -13059,67 +13271,67 @@ msgstr ""
 "\n"
 "可以在/Configuration/Preferences/Plugins/SpamAssassin中找到所有的選項"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Localhost"
 msgstr "本地主機"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:95
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:94
+#: src/plugins/spamassassin/spamassassin_gtk.c:97
 msgid "Unix Socket"
 msgstr "Unix Socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:122
+#: src/plugins/spamassassin/spamassassin_gtk.c:125
 msgid "Select folder to save spam to"
 msgstr "選擇儲存垃圾郵件的資料夾"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:274
+#: src/plugins/spamassassin/spamassassin_gtk.c:277
 msgid "Enable SpamAssassin plugin"
 msgstr "啟用 SpamAssassin 外掛程式"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:278
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Transport"
 msgstr "傳送"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:286
+#: src/plugins/spamassassin/spamassassin_gtk.c:289
 msgid "Type of transport"
 msgstr "傳送的型別"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:307
+#: src/plugins/spamassassin/spamassassin_gtk.c:310
 msgid "User"
 msgstr "使用者"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:320
+#: src/plugins/spamassassin/spamassassin_gtk.c:323
 msgid "User to use with spamd server"
 msgstr "使用spamd伺服器的使用者"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:322
+#: src/plugins/spamassassin/spamassassin_gtk.c:325
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:340
+#: src/plugins/spamassassin/spamassassin_gtk.c:343
 msgid "Hostname or IP address of spamd server"
 msgstr "spamd伺服器的主機名稱或IP位址"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:354
 msgid "Port of spamd server"
 msgstr "spamd伺服器的通訊埠"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:360
 msgid "Path of Unix socket"
 msgstr "Unix socket的路徑"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Use compression"
 msgstr "使用壓縮模式"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:368
+#: src/plugins/spamassassin/spamassassin_gtk.c:371
 msgid "Enable compression if spamd uses it, otherwise disable it."
 msgstr "若spamd使用了壓縮,就啟用壓縮功能,否則,停止此功能"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:403
+#: src/plugins/spamassassin/spamassassin_gtk.c:406
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13345,45 +13557,45 @@ msgstr "暫時接受"
 msgid "Decline"
 msgstr "拒絕"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr "你有一個待執行項目"
 
-#: 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:718
 msgid "Details follow:"
 msgstr "細節如下:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "你已經建立了一個會議"
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr "你已收到一個會議的邀請"
 
-#: 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 "一個你已收到的會議邀請已取消"
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr "你已轉發一個約會"
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr "(此事件重現)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr "(這個事件是一個重現性事件的一部份)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "你收到了一個未知的計畫會議回覆"
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13392,35 +13604,35 @@ msgstr ""
 "你收到了一個計畫的會議回覆\n"
 "%s 有 %s 個邀請,細節如下:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr "錯誤 - 無法取得行事曆的 MIME 部份"
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr "錯誤 - 找不到行事曆"
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr "錯誤 - 未知的行事曆型式"
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
 msgstr "傳送通知給出席人員"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr "取消會議"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "你確定要取消這個會議嗎?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr "找不到帳號"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13428,68 +13640,68 @@ msgstr ""
 "你沒有任何符合出席人員的帳號\n"
 "確定要回覆嗎?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr "直接回覆"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr "回答"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr "編輯會議..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr "取消會議..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr "執行網站"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr "你這個時間是忙碌的"
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "事件:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "發起人:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "地點:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "摘要:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr "開始:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr "結束:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "出席人員:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr "動作:"
 
@@ -14102,95 +14314,95 @@ msgstr "在問候語中的時間戳記語法錯誤\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "在問候語中的時間戳記語法錯誤 (非ASCII)\n"
 
-#: src/pop.c:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr "POP3 協定錯誤\n"
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "無效的 UIDL 回應: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP3: 刪除已過期的郵件 %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: 略過郵件 %d [%s] (%d 位元)\n"
 
-#: src/pop.c:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr "郵件箱已鎖定\n"
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr "通信超時\n"
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr "未支援的命令\n"
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr "POP3通信發生錯誤\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr "未支援的頂端命令\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr "新聞 (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "本地 mbox 檔案"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr "空  (只針對SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr "帳號名稱"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
 msgstr "設定為預設值"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr "個人資訊"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
 msgstr "郵件地址"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "自動配置"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
 msgstr "取消"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14198,339 +14410,387 @@ msgstr ""
 "警告:此 Claws Mail 編譯版本未支援\n"
 "IMPA 和 新聞功能"
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr "此伺服器要求認證"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr "連線時進行認證"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr "新聞伺服器"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr "POP3 伺服器 (接收)"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr "本地郵件夾"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr "SMTP 伺服器 (傳送)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr "與其使用郵件命令,不如使用 SMTP 伺服器"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr "傳送郵件命令"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr "帳號 %d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr "本地"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr "預設收件夾"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "未過濾郵件將被儲存在這個資料夾"
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
-msgstr "使用安全認證 (APOP)"
+#: src/prefs_account.c:1634
+msgid "Authenticate before POP connection"
+msgstr "POP連線前進行認證"
+
+#: src/prefs_account.c:1658 src/prefs_account.c:2259
+msgid "Select"
+msgstr "選擇"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr "郵件接收後從伺服器上移除"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr "超過"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 天 0 小時後: 立刻移除"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
 "郵件超過此限制將被部份接收,當選擇它們後,你將可以把它們全部下找或刪除。"
 
-#: src/prefs_account.c:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr "可允許最大的郵件下載數量"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr "若設為0代表沒有限制"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr "尋找字串:"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr "(通常是空白的)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
 msgstr "只顯示訂閱資料夾"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1831
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "寬頻效果模式 (防止接到遠端的標籤)"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1833
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "此模式使用較少的頻寬,對於某此伺服器可能會有速度較慢的情況發生"
 
-#: src/prefs_account.c:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "自動檢查"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr "使用全域設定"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "檢查新郵件頻率"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr "接收郵件時允許使用外掛程式進行過濾"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1908
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'接收郵件' 檢查此帳號的新郵件"
 
-#: src/prefs_account.c:1894 src/prefs_customheader.c:210
+#: 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
 msgid "Header"
 msgstr "郵件標頭"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr "產生  Message-ID"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
 msgstr "將傳送帳號的郵件地址放入  Message-ID"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr "加入使用者代理郵件標頭"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr "加入使用者自訂郵件標頭"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 認證 (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "若以下欄位空白,將以使用者名稱和密碼進行接收"
 
-#: src/prefs_account.c:2033
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr "傳送前用 POP3 認證"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr "POP 認證超時:"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2233
+msgid "Authorization"
+msgstr "認證"
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr "選擇 OAuth2 電子郵件服務提供者"
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr "客戶端 ID"
+
+#: src/prefs_account.c:2296
+msgid "Client secret"
+msgstr "客戶端安全"
+
+#: src/prefs_account.c:2328
+msgid "Obtain authorization code"
+msgstr "取得認證碼"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr "按照要求開啟預設的瀏覽器"
+
+#: src/prefs_account.c:2338
+msgid "Copy link"
+msgstr "複製連結"
+
+#: src/prefs_account.c:2350
+msgid "Authorization code"
+msgstr "認證碼"
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr "貼上來自於瀏覽器的完整URL或提供認證token"
+
+#: src/prefs_account.c:236
+msgid "Complete authorization"
+msgstr "完成認證"
+
+#: src/prefs_account.c:2368
+msgid "Authorize"
+msgstr "授權"
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr "簽名"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
 msgstr "自動插入簽名"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr "簽名分隔線"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
 msgstr "自動設置轉寄地址"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr "併字檢查字典"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "預設定典"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "預設替代定典"
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
 #: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "新郵件"
 
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "回覆"
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: 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
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr "預設的隱私系統"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "總是進行郵件簽章"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "總是將郵件加密"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2792
 msgid "Always sign messages when replying to a signed message"
 msgstr "當回覆簽章郵件時,總是將郵件進行簽章"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2795
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "當回覆已加密郵件時,總是將郵件進行加密"
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2798
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "除了收件者外,將已傳送的郵件用私有金鑰進行加密"
 
-#: src/prefs_account.c:2481
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr "將已傳送的加密郵件儲存為明碼文件"
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
 msgid "Don't use SSL/TLS"
 msgstr "不使用 SSL/TLS"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: 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 "使用 SSL/TLS"
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "使用 STARTTLS 命令啟用加密通訊"
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr "傳送 (SMTP)"
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:3004
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "不使用 SSL/TLS (若需要,使用 STARTTLS)"
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr "客戶端認證"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr "進行接收認證"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "客戶端認證檔案為 PKCS12 或 PEM 檔"
 
-#: src/prefs_account.c:2732
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr "進行傳送認證"
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "自動接放不明的合法 SSL/TLS 認證"
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr "使用非阻斷式 SSL/TLS"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3106
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "如果發生 SSL/TLS 連線問題,請把此功能關閉"
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr "使用代理伺服器"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3207
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "使用預設值"
 
-#: src/prefs_account.c:2890
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
 msgstr "使用全域的代理伺服器設定"
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr "使用認證"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr "使用者名稱"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
 msgstr "使用代理伺服器寄送郵件"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14538,174 +14798,178 @@ msgstr ""
 "若關閉此功能,郵件將忽略任何設置的代理伺服器,轉而使用已設置的外部伺服器直接"
 "連線並寄送郵件"
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr "SMTP 通訊埠"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr "POP3 通訊埠"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr "IMAP4 通訊埠"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr "NNTP 通訊埠"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr "網域名稱將被用來產生 Message-ID 以及當要連接到 SMTP 伺服器時"
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr "以命令和伺服器進行通訊"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3451
 msgid "Mark cross-posted messages as read and color:"
 msgstr "標示已傳送郵件為已讀並更改顏色"
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr "郵已傳送郵件放在"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr "將暫存郵件放在"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr "將草稿郵件放在"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr "將刪除的郵件放在"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr "未指定帳號名稱"
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
 msgstr "未指定郵件地方"
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr "未指定 SMTP 伺服器"
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr "使用者 ID 未指定"
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr "未指定 POP3 伺服器"
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr "預設收件夾不存在"
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr "IMAP4 伺服器未指定"
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr "NNTP 伺服器未指定"
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3626
 msgid "local mailbox filename is not entered."
 msgstr "本地郵件夾名稱未指定"
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
 msgstr "郵件命令未指定"
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3642
 msgid "User ID cannot contain a newline character."
 msgstr "使用者名稱不能包含新行的字元"
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3647
 msgid "Password cannot contain a newline character."
 msgstr "密碼不能包含新行的字元"
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3678
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP的使用者名稱不能包含新行的字元"
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3683
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP的密碼不能包含新行的字元"
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr "尚未指定收件者"
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr "尚未選擇已傳送資料夾"
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr "尚未選擇暫存資料夾"
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr "尚未選擇草稿資料夾"
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "尚未選擇回收資料夾"
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "樣版"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr "隱私"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr "進階"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr "新帳號選項"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帳號選項"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "失敗 (錯誤的地址)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr "繼擇簽名檔案"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "選擇認證檔案"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr "通訊協定"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (未載入外掛程式)"
@@ -14971,7 +15235,7 @@ msgstr ""
 "\\n\\n開始轉寄郵件:\\n\\n?d{日期: %d\\n}?f{寄件者: %f\\n}?t{收件者: %t"
 "\\n}?c{副本: %c\\n}?n{新聞群組: %n\\n}?s{主旨: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:451
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15195,8 +15459,8 @@ msgstr ""
 "此選項啟用了在郵件檢視器顯示MIME郵件的功能,當你使用 '以文字顯示' 功能項目"
 "時,它可以透過一個腳本達成"
 
-#: 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:180
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "郵件檢視"
 
@@ -15730,27 +15994,43 @@ msgstr "字型"
 msgid "Preferences"
 msgstr "選項"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "自動顯示附件圖片"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr "預設為改變附件圖片大小"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
 msgstr "點擊圖片以切換縮放"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:96
+msgid "Fit image"
+msgstr "滿版"
+
+#: src/prefs_image_viewer.c:99
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "在圖片上點擊右鍵以以切換寬/長滿版"
+
+#: src/prefs_image_viewer.c:102
+msgid "Height"
+msgstr "高"
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr "寬"
+
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr "在郵件內顯示影像"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr "列印圖片"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr "圖片檢視器"
 
@@ -15953,11 +16233,11 @@ msgstr "內文部份"
 msgid "whole message"
 msgstr "全部郵件"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr "已標示"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr "已刪除"
 
@@ -15965,11 +16245,11 @@ msgstr "已刪除"
 msgid "Replied"
 msgstr "已回覆"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr "已轉寄"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "垃圾郵件"
@@ -15978,7 +16258,7 @@ msgstr "垃圾郵件"
 msgid "Has attachment"
 msgstr "有附加檔額"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr "簽章"
 
@@ -16254,83 +16534,91 @@ msgstr ""
 msgid "Current condition rules"
 msgstr "目前條件規則"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "標頭"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "在郵件區上方顯示標頭"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr "在郵件區顯示(X-)Face"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "如果可能的話,在通訊錄中儲存(X-)Face"
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr "在郵件區顯示Face"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr "如果可能的話,在通訊錄中儲存Face"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "在郵件區顯示標頭"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "HTML格式郵件"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "以文字顯示HTML格式郵件"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "盡可能以外掛程式顯示純HTML郵件"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "選擇多類型郵件的HTML部份"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "行距"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "畫素"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "捲動"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "半頁"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "平滑捲動"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "步驟"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "顯示附件說明 (優先於附件名稱)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "引言"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "雙擊折疊引言"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "視此字元為引言標示:"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "字串選項"
 
@@ -16985,8 +17273,8 @@ msgid ""
 "characters"
 msgstr "當郵件內容包含非ASCII編碼字元時需指定傳送加碼方式"
 
-#: 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:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr "傳送"
 
@@ -17779,7 +18067,7 @@ msgstr "接收的金鑰尚未定義"
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64編碼錯誤]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr "無法解析部份的訊息"
 
@@ -18125,88 +18413,88 @@ msgstr "輸入文字以覆蓋 '%s'"
 msgid "Enter variable"
 msgstr "輸入變數"
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "使用此命令傳送郵件: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "不能執行此命令: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "當執行此命令時發生錯誤: %s"
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr "在SMTP之前執行POP..."
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr "在SMTP之前POP"
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "帳號'%s':連線到SMTP伺服器: %s:%d..."
 
-#: src/send_message.c:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr "郵件傳送成功"
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr "傳送 HELO..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr "傳送郵件..."
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr "傳送 HELO..."
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr "傳送郵件來自..."
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr "傳送 RCPT 到..."
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr "傳送 DATA..."
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr "離開..."
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "傳送郵件 (%d / %d 位元)"
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr "傳送郵件"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr "在傳送郵件時發生錯誤"
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18505,91 +18793,91 @@ msgstr "寄件者: %s,  以 %s"
 msgid "To: %s, on %s"
 msgstr "收件者: %s, 以 %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr "你不是文章的作者"
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4574
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "你確定要刪除 %d 封選擇的郵件嗎?"
 msgstr[1] "你確定要刪除 %d 封選擇的郵件嗎?"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "刪除郵件"
 msgstr[1] "刪除郵件"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr "目的資料夾和目前的相同"
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4796
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "選擇路徑將選定的郵件移至該位置"
 msgstr[1] "選擇路徑將選定的郵件移至該位置"
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr "要複製的目的資料夾和目前的相同"
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4881
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "選擇路徑,將所有選定複製到該位置"
 msgstr[1] "選擇路徑,將所有選定複製到該位置"
 
-#: src/summaryview.c:5036
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr "擴展或覆寫"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr "擴展或覆寫已存在的檔案?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr "擴展(_A)"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "無法儲存檔案 '%s'"
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5090
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "你想要列印%d封件,一封一封的印,你確定要繼續嗎?"
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr "建立串列..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr "略過這些規則"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5799
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "不管帳號是屬於誰的,全部套用這些規則"
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5802
 msgid "Apply these rules if they apply to the current account"
 msgstr "如果這些規則已經套用在目前的帳號,就套用吧!"
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr "過濾"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18597,71 +18885,71 @@ msgstr ""
 "有一些過濾規則屬於一個特定帳號\n"
 "請選擇要使用這些規則做什麼:"
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr "過濾..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr "處理配置"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6095
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "你確定要重置所有已選擇郵件的顏色標籤嗎?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6097
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr "你確定要將顏色標籤套用到所有已選擇的郵件上嗎?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Reset color label"
 msgstr "重置顏色標籤"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Set color label"
 msgstr "設定顏色標籤"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr "忽略串列"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr "關注串列"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr "已回覆但是也轉發了 - 點選以檢視回覆"
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr "已回覆 - 點選以檢視回覆"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr "將被移動"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr "將被複製"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr "已簽名,有附件"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr "已加密,有附件"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr "已加密"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr "有附件"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18670,11 +18958,11 @@ msgstr ""
 "正規表示式 (regexp) 發生錯誤:\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8402
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "回到資料夾清單 (你有未讀郵件)"
 
-#: src/summaryview.c:8403
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr "回到資料夾清單"
 
@@ -19480,3 +19768,6 @@ msgid ""
 msgstr ""
 "Claws Mail 已經準備好了\n"
 "點擊儲存後開始"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "使用安全認證 (APOP)"

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list