[Commits] [SCM] claws branch, master, updated. 3.14.0-38-g04456e3

ticho at claws-mail.org ticho at claws-mail.org
Sun Aug 28 20:11:47 CEST 2016


The branch, master has been updated
       via  04456e3b73d55d596276e5b21fe5bae90cbf2084 (commit)
      from  1a39f2503672862f2c51a46c68056c63177d7445 (commit)

Summary of changes:
 po/ca.po              |  802 ++---
 po/cs.po              |  802 ++---
 po/da.po              | 1066 +++----
 po/de.po              |  802 ++---
 po/en_GB.po           | 3973 ++++++++++++------------
 po/es.po              |  881 +++---
 po/fi.po              |  851 +++---
 po/fr.po              |  969 +++---
 po/he.po              | 4214 ++++++++++++++------------
 po/hu.po              |  802 ++---
 po/id_ID.po           | 8087 ++++++++++++++++++++++++-------------------------
 po/it.po              |  802 ++---
 po/nb.po              | 4108 +++++++++++++------------
 po/nl.po              |  802 ++---
 po/pt_BR.po           |  802 ++---
 po/ru.po              |  802 ++---
 po/sk.po              |  802 ++---
 po/sv.po              |  851 +++---
 po/tr.po              | 2357 +++++++-------
 po/zh_TW.po           | 1252 +++++---
 src/compose.c         |    4 +-
 src/gtk/filesel.c     |    4 +-
 src/gtk/filesel.h     |    2 +-
 src/gtk/w32_filesel.c |    4 +-
 24 files changed, 18369 insertions(+), 17472 deletions(-)


- Log -----------------------------------------------------------------
commit 04456e3b73d55d596276e5b21fe5bae90cbf2084
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sun Aug 28 20:11:03 2016 +0200

    Make filesel API more consistent.
    
    One of the functions, filesel_select_multiple_files_open(),
    was missing the path parameter.

diff --git a/po/ca.po b/po/ca.po
index 5a110b2..94ea528 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.7.8\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-03 10:44+0200\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-08-03 11:04+0200\n"
 "Last-Translator: David Medina <opensusecatala at gmail.com>\n"
 "Language-Team: Miquel Oliete i Baliarda <ktalanet at yahoo.es>\n"
@@ -88,7 +88,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "\"Rep missatges\" recupera els missatges des dels comptes seleccionats"
 
 #: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1264
+#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -101,7 +101,7 @@ msgstr "\"Rep missatges\" recupera els missatges des dels comptes seleccionats"
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4128
+#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -820,8 +820,8 @@ msgstr "Llibretes d'adreces"
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:343
-#: src/folderview.c:431 src/prefs_account.c:2786 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
+#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -963,18 +963,18 @@ msgstr "Actualització d'adreces"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Actualització fallida. Canvis no escrits al directori."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Anunci"
 
-#: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
-#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
+#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
 msgid "Warning"
 msgstr "Avís"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5632 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Error"
@@ -1007,43 +1007,43 @@ msgstr "Nom LDAP"
 msgid "Attribute Value"
 msgstr "Valor de l'atribut"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Res"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "un visualitzador"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "un analitzador MIME"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "carpetes"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "filtratge"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "una interfície de privacitat"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "un notificador"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "una utilitat"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "coses"
 
-#: src/common/plugin.c:332
+#: src/common/plugin.c:334
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1051,25 +1051,25 @@ msgstr ""
 "Aquest connector proporciona %s (%s), que ja és proporcionat pel connector "
 "%s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Connector ja carregat"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Ha fallat assignar memòria per al connector"
 
-#: src/common/plugin.c:480
+#: src/common/plugin.c:482
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Aquest connector no té llicència de GPL v3 ni cap llicència compatible "
 "posterior."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Aquest connector és per al Claws Mail GTK1."
 
-#: src/common/plugin.c:771
+#: src/common/plugin.c:769
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1078,7 +1078,7 @@ msgstr ""
 "La vostra versió del Claws Mail és més nova que la versió amb la qual el "
 "connector \"%s\" va ser compilat."
 
-#: src/common/plugin.c:774
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1086,13 +1086,13 @@ msgstr ""
 "La vostra versió del Claws Mail és més nova que la versió amb la qual el "
 "connector va ser compilat."
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:781
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 "La vostra versió del Claws Mail és massa antiga per al connector \"%s\"."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 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."
 
@@ -1262,212 +1262,212 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Dilluns"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Dijous"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Divendres"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Gener"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrer"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Març"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maig"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juny"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juliol"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agost"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Setembre"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembre"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Desembre"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "dg."
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "dl."
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "dt."
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "dc."
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "dj."
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "dv."
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "ds."
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "gen."
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "febr."
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "març"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "abr."
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "maig"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "juny"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul."
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "ag."
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "set."
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "nov."
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "des."
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "a. m."
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "p. m. "
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "a. m."
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "p. m."
@@ -1481,7 +1481,7 @@ msgstr "_Afegeix..."
 msgid "_Remove"
 msgstr "_Esborra"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Propietats..."
 
@@ -1924,7 +1924,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "N'esteu segur?"
 
-#: src/compose.c:3628 src/compose.c:10529 src/compose.c:11390
+#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
 msgid "_Insert"
 msgstr "_Insereix"
 
@@ -1979,7 +1979,7 @@ msgstr ""
 "Seleccioneu algun compte abans d'enviar."
 
 #: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
-#: src/prefs_account.c:3310 src/toolbar.c:406 src/toolbar.c:424
+#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Envia"
 
@@ -1989,8 +1989,8 @@ msgstr ""
 "L'únic destinatari és l'adreça CC per defecte. Ho voleu enviar de tota "
 "manera?"
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5633
-#: src/folderview.c:2445 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
+#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Envia"
@@ -2026,7 +2026,7 @@ msgstr "Voleu posar-lo a la cua de tota manera?"
 msgid "Send later"
 msgstr "Envia'l després"
 
-#: src/compose.c:5169 src/compose.c:9993
+#: src/compose.c:5169 src/compose.c:9999
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2036,7 +2036,7 @@ msgstr ""
 "\n"
 "Conversió de joc de caràcters fallida."
 
-#: src/compose.c:5172 src/compose.c:9996
+#: src/compose.c:5172 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2046,7 +2046,7 @@ msgstr ""
 "\n"
 "No s'ha pogut obtenir la clau d'encriptació del receptor."
 
-#: src/compose.c:5178 src/compose.c:9990
+#: src/compose.c:5178 src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2091,7 +2091,7 @@ msgstr ""
 "Useu \"Envia els missatges de la cua\" de la finestra principal per tornar-"
 "ho a intentar."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2102,7 +2102,7 @@ msgstr ""
 "al joc de caràcters %s especificat.\n"
 "Voleu enviar-lo com a %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2115,73 +2115,73 @@ msgstr ""
 "\n"
 "Voleu enviar-lo de tota manera?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "No s'ha pogut encriptar el correu: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Avís d'encriptació"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "C_ontinua"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "No hi ha cap compte disponible per enviar correus!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 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:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "L'adjunt %s ja no existeix. Voleu ignorar-lo?"
 
-#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancel·la l'enviament"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ignora l'adjunt"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Secció %s original"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Afegeix a la lli_breta d'adreces"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Esborra el contingut de l'entrada"
 
-#: src/compose.c:6997 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Useu <tab> per a l'autocompleció des de la llibreta d'adreces"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Mida"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Desa el missatge a "
 
-#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2192,23 +2192,23 @@ msgstr "Desa el missatge a "
 msgid "_Browse"
 msgstr "Na_vega"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "Ca_pçalera"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Adjunts"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "Alt_res"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "Ass_umpte:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2217,19 +2217,19 @@ msgstr ""
 "No s'ha pogut iniciar el corrector ortogràfic.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_De:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Compte a usar per a aquest correu electrònic"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Adreça del remitent per usar"
 
-#: src/compose.c:8373
+#: src/compose.c:8379
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2238,68 +2238,68 @@ msgstr ""
 "El sistema de privacitat \"%s\" no s'ha pogut carregar. No podreu signar o "
 "encriptar aquest missatge."
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Cap"
 
-#: src/compose.c:8575 src/prefs_template.c:760
+#: src/compose.c:8581 src/prefs_template.c:760
 #, 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:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Error de format al \"Des de\" de la plantilla."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Error de format al \"Per a\" de la plantilla."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Error de format al Cc de la plantilla."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Error de format al Bcc de la plantilla."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Hi ha un error a la plantilla de Respon-a"
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Error de format a l'assumpte de la plantilla."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Tipus MIME no vàlid."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "El fitxer no existeix o és buit."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Propietats"
 
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Codificació"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Camí"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Nom del fitxer"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2310,15 +2310,15 @@ msgstr ""
 "Voleu acabar el procés?\n"
 "Id. del grup del procés: %d"
 
-#: src/compose.c:9959 src/messageview.c:1096
+#: src/compose.c:9965 src/messageview.c:1096
 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:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "No s'ha pogut posar el missatge a la cua."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2329,15 +2329,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "No s'ha pogut desar l'esborrany."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "No s'ha pogut desar l'esborrany"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2345,24 +2345,24 @@ msgstr ""
 "No s'ha pogut desar l'esborrany.\n"
 "Voleu cancel·lar la sortida o descartar aquest missatge?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Cancel·la la sortida"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Descarta el missatge"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Selecciona un fitxer"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No s'ha pogut llegir el ftxer \"%s\"."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2371,54 +2371,54 @@ msgstr ""
 "El fitxer \"%s\" contenia caràcters no vàlids per a\n"
 "la codificació actual, la inserció pot ser incorrecta."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Descarta el missatge"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Aquest missatge ha estat modificat. Voleu descartar-lo?"
 
-#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Descarta"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "De_sa a la carpeta d'esborranys"
 
-#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Desa els canvis"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 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:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "No ho _desis"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voleu aplicar la plantilla \"%s\"?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Aplica la plantilla"
 
-#: src/compose.c:10529 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10535 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Inserir o adjuntar?"
 
-#: src/compose.c:11388
+#: src/compose.c:11400
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2426,16 +2426,16 @@ msgstr ""
 "Voleu inserir el contingut de/dels fitxer(s) dins el cos del missatge o "
 "adjuntar-lo al correu?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Adjunta-ho"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de format de la cita a la línia %d."
 
-#: src/compose.c:11902
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2653,7 +2653,7 @@ msgid " Check File "
 msgstr " Comprova el fitxer"
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1970
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Fitxer"
@@ -2803,7 +2803,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3383
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
@@ -2986,7 +2986,7 @@ msgstr ""
 "El número mínim d'entrades que s'haurien de retornar als resultats de la "
 "cerca."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Bàsiques"
 
@@ -3710,61 +3710,61 @@ msgstr "La carpeta '%s' ja existeix."
 msgid "Can't create the folder '%s'."
 msgstr "No s'ha pogut crear la carpeta \"%s\"."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Marc_a-ho tot com a llegit"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Marca tots els llegits recursi_vament"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "Exec_uta regles de processament"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Cerca a la carpeta..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "Pr_ocessament..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Buida la _paperera..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Envia de la _cua..."
 
-#: src/folderview.c:385 src/folderview.c:432
+#: src/folderview.c:389 src/folderview.c:436
 #: src/plugins/notification/notification_lcdproc.c:141
 #: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
 msgid "New"
 msgstr "Nous"
 
-#: src/folderview.c:386 src/folderview.c:433
+#: src/folderview.c:390 src/folderview.c:437
 #: src/plugins/notification/notification_lcdproc.c:145
 #: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
 msgid "Unread"
 msgstr "Sense llegir"
 
-#: src/folderview.c:387 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:391 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:435 src/summaryview.c:445
+#: src/folderview.c:439 src/summaryview.c:445
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:765
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr "Establint informació de carpeta..."
 
-#: src/folderview.c:837
+#: src/folderview.c:845
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3772,100 +3772,100 @@ msgstr ""
 "Realment voleu marcar tots els missatges d'aquesta carpeta i les seves "
 "subcarpetes com a llegits?"
 
-#: src/folderview.c:839 src/summaryview.c:4115
+#: src/folderview.c:847 src/summaryview.c:4115
 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:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Marca-ho tot com a llegit"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "S'explora la carpeta %s/%s..."
 
-#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1030 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Explorant la carpeta %s..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Reconstrueix l'arbre de carpetes"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Refer l'arbre de directoris esborrarà les memòries cau locals. Voleu "
 "continuar?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruint l'arbre de carpetes..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Explorant l'arbre de carpetes..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No s'ha pogut explorar la carpeta %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Comprovant si hi ha missatges nous a totes les carpetes..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Tancant la carpeta %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Obrint la carpeta %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "No s'ha pogut obrir la carpeta."
 
-#: src/folderview.c:2386 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Empty trash"
 msgstr "Buida la paperera"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Voleu esborrar tots els missatges de la paperera?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "Buida la pap_erera"
 
-#: src/folderview.c:2431 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Avís de desconnexió"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Esteu treballant sense connexió. Ho voleu anul·lar?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Envia els missatges de la cua"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Voleu enviar tots els missatges de la cua?"
 
-#: src/folderview.c:2453 src/toolbar.c:2647
+#: src/folderview.c:2466 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "S'han produït alguns errors enviant els missatges de la cua."
 
-#: src/folderview.c:2456 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2469 src/main.c:2743 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3874,64 +3874,64 @@ msgstr ""
 "S'han produït alguns errors enviant els missatges de la cua:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Realment voleu copiar la carpeta \"%s\" a \"%s\"?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Realment voleu convertir la carpeta \"%s\" en subcarpeta de \"%s\"?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Copia la carpeta"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Mou la carpeta"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiant %s a %s..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movent %s a %s..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "La destinació i l'origen són iguals."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "No es pot copiar la carpeta a una de les seves subcarpetes."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "No es pot moure la carpeta a una de les seves subcarpetes."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No es poden moure carpetes entre bústies diferents."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "La còpia ha fallat!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "El desplaçament ha fallat!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Processant la configuració per a la carpeta %s"
 
-#: src/folderview.c:3068 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 "La carpeta de destinació només es pot usar per emmaguetzemar subcarpetes."
@@ -4275,63 +4275,63 @@ msgstr "Notes de la ve_rsió"
 msgid "_Statistics"
 msgstr "E_stadístiques"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Taronja"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Vermell"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Blau cel"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Blau"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Verd"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Marró"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Gris"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Marró clar"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Vermell fosc"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Rosa fosc"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Blau cel"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Daurat"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Verd brillant"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5067,7 +5067,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:734 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:728 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Connectors"
 
@@ -5110,9 +5110,9 @@ msgid "_Hide"
 msgstr "Oc_ulta"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3273 src/prefs_account.c:3291 src/prefs_account.c:3309
-#: src/prefs_account.c:3327 src/prefs_account.c:3345 src/prefs_account.c:3363
-#: src/prefs_account.c:3382 src/prefs_account.c:3475
+#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
+#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
+#: src/prefs_account.c:3395 src/prefs_account.c:3488
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5821,8 +5821,8 @@ msgstr "La connexió amb %s fa fallat"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexió IMAP4 amb %s s'ha desconnectat. Reconnectant...\n"
 
-#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
-#: src/imap.c:4622 src/imap.c:5433
+#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
+#: src/imap.c:4620 src/imap.c:5431
 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."
 
@@ -5863,85 +5863,85 @@ msgstr "No s'ha pogut connectar amb el servidor IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No s'ha pogut connectar amb el servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4112
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr "No es pot iniciar la sessió TLS.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, 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:1327
+#: src/imap.c:1325
 #, 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:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Afegint missatges..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Copiant missatges..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "no s'han pogut establir els indicadors esborrats\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "no es pot suprimir\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscant carpetes no subscrites a %s..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscant subcarpetes de %s..."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no s'ha pogut crear la bústia: LIST ha fallat\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "no es pot crear la bústia\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, 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:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "no es pot esborrar la bústia\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST ha fallat\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Marcant missatges..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "No s'ha pogut seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor requereix TLS per accedir-hi.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "No es poden refrescar les capacitats.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5950,20 +5950,20 @@ msgstr ""
 "La connexió a %s ha fallat: el servidor requereix TLS, però s'ha compilat el "
 "Claws Mail sense sense suport TLS.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Les entrades al servidor estan inhabilitades.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Obtenint el missatge..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no s'han pogut establir els indicadors esborrats: %d\n"
 
-#: src/imap.c:6091
+#: src/imap.c:6089
 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"
@@ -7906,7 +7906,7 @@ msgstr "Sobreescriu el fitxer mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Aquest fitxer ja existeix. Voleu sobreescriure'l?"
 
-#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Sobreescriu"
@@ -7956,7 +7956,7 @@ msgstr "Cerca finalitzada"
 msgid "Compose _new message"
 msgstr "Escriu un missatge _nou"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
+#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de missatge"
 
@@ -7995,46 +7995,46 @@ msgstr ""
 "oficialment adreçat a vós. \n"
 "Es recomana no enviar el justificant de recepció."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Obtenint missatge (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1008
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No es pot desencriptar: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1493 src/messageview.c:1501
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "El missatge no compleix l'estàndard MIME. Pot ser mostrat erròniament."
 
-#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
+#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Desa com a"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Se sobreescriu el fitxer existent?"
 
-#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No s'ha pogut desar el fitxer \"%s\"."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Mostra-ho tot: %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Només es mostra el primer megabyte de text."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1950
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8042,19 +8042,19 @@ msgstr ""
 "Heu demanat un justificant de recepció per a aquest missatge: ha estat "
 "mostrat pel destinatari."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Heu demanat justificant de recepció en aquest missatge."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Aquest missatge sol·licita un justificant de recepció."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Envia un justificant de recepció"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8062,7 +8062,7 @@ msgstr ""
 "Aquest missatge s'ha descarregat parcialment,\n"
 "i s'ha esborrat del servidor."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8071,15 +8071,15 @@ msgstr ""
 "Aquest missatge s'ha obtingut parcialment;\n"
 "és de %s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Marca per descarregar"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Marca per esborrar"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8089,12 +8089,12 @@ msgstr ""
 "és de %s i es descarregarà."
 
 # RML To be consistent with previous one.
-#: src/messageview.c:2021 src/messageview.c:2034
+#: src/messageview.c:2024 src/messageview.c:2037
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8103,11 +8103,11 @@ msgstr ""
 "Aquest missatge s'ha obtingut parcialment;\n"
 "és de %s i s'esborrarà."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Notificació de justificant de recepció"
 
-#: src/messageview.c:2101
+#: src/messageview.c:2104
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8119,19 +8119,19 @@ msgstr ""
 "Si us plau, escolliu el compte que voleu utilitzar per fer l'enviament de la "
 "notificació de recepció:"
 
-#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Envia la notificació"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No es pot imprimit: el missatge no conté text."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8139,7 +8139,7 @@ msgstr ""
 "\n"
 "  No hi ha missatges en aquesta carpeta"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8147,7 +8147,7 @@ msgstr ""
 "\n"
 "  El missatge s'ha esborrat"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8155,7 +8155,7 @@ msgstr ""
 "\n"
 "  El missatge ha estat esborrat o mogut a una altra carpeta."
 
-#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
+#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "S'ha produït un error mentre s'aprenia.\n"
@@ -8391,34 +8391,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "no s'ha pogut seleccionar el grup: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1054 src/news.c:1224
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "no s'ha pogut establir el grup: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "interval d'articles no vàlid: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1133 src/news.c:1157 src/news.c:1181
 msgid "couldn't get xhdr\n"
 msgstr "no s'ha pogut obtenir xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtenint xover %d - %d a %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "no s'ha pogut obtenir xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "línia xover no vàlida\n"
 
-#: src/news.c:1446
+#: src/news.c:1449
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -9383,7 +9383,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:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "kb"
 
@@ -9962,7 +9962,7 @@ msgstr "El CSS en aquest fitxer s'aplicarà a totes les seccions d'HTML"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1442 src/prefs_account.c:1531 src/prefs_account.c:2002
+#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Na_vega"
@@ -10270,7 +10270,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:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Autenticació"
 
@@ -10457,7 +10457,7 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Interval d'actualització de la memòria cau"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1487
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1490
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr "hores"
@@ -10845,7 +10845,7 @@ msgstr "Especifiqueu l'autenticació"
 #: src/plugins/managesieve/sieve_prefs.c:240
 #: src/plugins/vcalendar/vcal_prefs.c:348
 #: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
-#: src/prefs_account.c:1795
+#: src/prefs_account.c:1798
 msgid "User ID"
 msgstr "ID de l'usuari"
 
@@ -10853,18 +10853,18 @@ msgstr "ID de l'usuari"
 #: src/plugins/rssyl/rssyl_feed_props.c:395
 #: src/plugins/vcalendar/vcal_prefs.c:356
 #: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
-#: src/prefs_account.c:1815 src/prefs_account.c:2529 src/prefs_account.c:2551
+#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
 #: src/wizard.c:1215 src/wizard.c:1635
 msgid "Password"
 msgstr "Contrasenya"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1570
-#: src/prefs_account.c:1767
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
+#: src/prefs_account.c:1770
 msgid "Authentication method"
 msgstr "Mètode d'autenticació"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1580
-#: src/prefs_account.c:1776 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
+#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
 msgid "Automatic"
 msgstr "Automàtic"
 
@@ -11801,7 +11801,7 @@ 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:163 src/plugins/rssyl/rssyl_feed_props.c:476
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
 msgstr "minuts"
@@ -12428,8 +12428,8 @@ msgstr "Mostra la consola de Python"
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2518
-#: src/prefs_account.c:2540 src/prefs_account.c:2809 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
+#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Navega"
@@ -12768,7 +12768,7 @@ msgstr "Obtén els comentaris d'articles de menys de "
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1480 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
 msgid "days"
 msgstr "dies"
 
@@ -13405,7 +13405,7 @@ msgid "Next month"
 msgstr "Mes següent"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:735
+#: src/plugins/vcalendar/vcal_prefs.c:729
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13837,15 +13837,15 @@ msgstr "Aquesta setmana"
 msgid "Later"
 msgstr "Més tard"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Acceptada: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Refusada: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Acceptada provisionalment:"
 
@@ -14294,12 +14294,12 @@ msgstr "hi ha hagut un error a la sessió POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "ordre TOP no suportada\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1451 src/prefs_account.c:2446
+#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
 #: src/wizard.c:1499
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1564 src/prefs_account.c:2461
+#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14388,40 +14388,40 @@ msgstr "ordre per enviar els correus"
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Bústia d'entrada per defecte"
 
-#: src/prefs_account.c:1438 src/prefs_account.c:1445 src/prefs_account.c:1527
-#: src/prefs_account.c:1534
+#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
+#: src/prefs_account.c:1537
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Els missatges sense filtrar es desaran en aquesta carpeta"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Usa l'autenticació segura (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Esborra els missatges del servidor quan s'hagin rebut"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Esborra després de"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1484
+#: src/prefs_account.c:1477 src/prefs_account.c:1487
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dies i 0 hores: esborra immediatament"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Límit de la mida de recepció"
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1503
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14429,82 +14429,82 @@ msgstr ""
 "Els missatges que sobrepassin aquest límit es recuperaran parcialment. Quan "
 "els seleccioneu podreu descarregar-los completament o esborrar-los."
 
-#: src/prefs_account.c:1540 src/prefs_account.c:2476
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr "Nombre màxim d'articles per descarregar"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "sense límit si s'especifica 0"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Text pla"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "Directori del servidor IMAP"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(normalment buït)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Mostra només les carpetes subscrites"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mode d'ample de banda eficient (evita recuperar etiquetes remotes)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 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:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Filtra els missatges durant la recepció"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permet filtrar usant connectors durant la recepció"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 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:1722 src/prefs_customheader.c:208
+#: src/prefs_account.c:1725 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Capçalera"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Genera Missatge-ID"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Envia l'adreça de correu dins l'ID del missatge"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Afegeix un capçalera d'agent d'usuari"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Afegeix capçaleres d'usuari"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticació SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1840
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14512,176 +14512,176 @@ msgstr ""
 "Si deixeu aquests camps buits, s'usarà el mateix ID d'usuari i contrasenya "
 "usats per a la recepció."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentica amb POP3 abans d'enviar"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Temps límit per a l'autenticació POP: "
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Signatura"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Insereix la signatura automàticament"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Separador de signatura"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Sortida de l'ordre"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Estableix les adreces següents automàticament"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Diccionaris de correcció ortogràfica"
 
-#: src/prefs_account.c:2076 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Diccionari per omissió"
 
-#: src/prefs_account.c:2089 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Diccionari alternatiu per omissió"
 
-#: src/prefs_account.c:2175 src/prefs_account.c:3328
+#: src/prefs_account.c:2181 src/prefs_account.c:3341
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Escriu"
 
-#: src/prefs_account.c:2190 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Respon"
 
-#: src/prefs_account.c:2205 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Reenvia"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Sistema de privacitat per omissió"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Sempre missatges signats"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Sempre missatges encriptats"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 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:2288
+#: src/prefs_account.c:2294
 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:2291
+#: src/prefs_account.c:2297
 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:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Desa els missatges encriptats enviats com a text clar"
 
-#: src/prefs_account.c:2450 src/prefs_account.c:2465 src/prefs_account.c:2479
+#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
 msgid "Don't use SSL"
 msgstr "No usis SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Usa SSL per a la connexió POP3"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2502
+#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usa l'ordre STARTTLS per obrir la sessió SSL"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usa SSL per a la connexió IMAP4"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Usa SSL per a la connexió NNTP"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Envia (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usis SSL (però usa STARTTLS si és necessari)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Usa SSL per a la connexió SMTP"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Certificats del client"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Certificat per a la recepció"
 
-#: src/prefs_account.c:2520 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2544
+#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
+#: src/prefs_account.c:2550
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificat de client com a fitxer PKCS12 o PEM"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Certificat per enviar"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Accepta automàticament els certificats SSL vàlids"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Usa SSL no-bloquejant"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desactiveu això si teniu problemes de connexió amb SSL"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "Port POP3"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "Port IMAP4"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Nom del domini"
 
-#: src/prefs_account.c:2743
+#: src/prefs_account.c:2756
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14689,112 +14689,112 @@ msgstr ""
 "El nom del domini s'usarà al Message-ID generat i en connectar a servidors "
 "SMTP."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Usa una ordre per comunicar-se amb el servidor"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marca els missatges creuats com a llegits i acoloreix-los:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Posa els missatges enviats a"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Posa els missatges de la cua a"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Posa els esborranys a"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Posa els missatges esborrats a"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "No s'ha especificat el nom del compte."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "No s'ha especificat l'adreça de correu."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "No s'ha especificat el servidor SMTP."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "No s'ha especificat l'usuari."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "No s'ha especificat el servidor POP3."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "La bústia d'entrada per omissió no existeix."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "No s'ha especificat el servidor IMAP4."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "No s'ha especificat el servidor NNTP."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 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:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "no s'ha especificat l'ordre de correu."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Rep"
 
-#: src/prefs_account.c:3346 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantilles"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Privacitat"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Preferències per a un compte nou"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferències del compte"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Ha fallat (adreça incorrecta)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Selecciona un fitxer de signatura"
 
-#: src/prefs_account.c:4019 src/prefs_account.c:4036 src/wizard.c:1066
+#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Selecciona un fitxer de certificat"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (mòdul no carregat)"
@@ -15053,15 +15053,15 @@ msgstr "Accions actuals"
 msgid "Action string is not valid."
 msgstr "La cadena de l'acció no és vàlida."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hola,\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "El %d\\n%f va escriure el següent:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:306 src/prefs_quote.c:85
+#: src/prefs_common.c:307 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15070,7 +15070,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:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
diff --git a/po/cs.po b/po/cs.po
index ababd9e..0bdb324 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-01 21:41+0100\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-08-03 17:49+0200\n"
 "Last-Translator: David Vachulka <david at konstrukce-cad.com>\n"
 "Language-Team: Czech <cs at li.org>\n"
@@ -84,7 +84,7 @@ msgstr ""
 "zaškrtnutím"
 
 #: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1264
+#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -97,7 +97,7 @@ msgstr ""
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4128
+#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -811,8 +811,8 @@ msgstr "Kniha adres"
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:343
-#: src/folderview.c:431 src/prefs_account.c:2786 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
+#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Složka"
 
@@ -953,18 +953,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:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
-#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
+#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5632 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Chyba"
@@ -997,67 +997,67 @@ msgstr "LDAP atribut"
 msgid "Attribute Value"
 msgstr "Hodnota atributu"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Nic"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "prohlížeč"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "MIME parser"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "složky"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "filtr"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "zabezpečení"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "oznamování"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "utilita"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "věci"
 
-#: src/common/plugin.c:332
+#: src/common/plugin.c:334
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 "Tento modul poskytuje možnost %s (%s), která je už obsažena v modulu %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Modul byl již načten"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Nepodařilo se vyhradit paměť pro modul"
 
-#: src/common/plugin.c:480
+#: src/common/plugin.c:482
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Tento modul není licencován dle GPL v3 nebo dle jiné kompatibilní licence."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Tento modul je určen pro Claws Mail GTK1."
 
-#: src/common/plugin.c:771
+#: src/common/plugin.c:769
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1066,7 +1066,7 @@ msgstr ""
 "Vaše verze Claws Mail je novější než ta, se kterou byl zkompilován modul "
 "'%s'."
 
-#: src/common/plugin.c:774
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1074,12 +1074,12 @@ msgstr ""
 "Vaše verze Claws Mail je novější než ta, se kterou byl zkompilován tento "
 "modul."
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:781
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Vaše verze Claws Mail je příliš stará na použití s modulem '%s'."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 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."
 
@@ -1249,212 +1249,212 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Neděle"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondělí"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Středa"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Pátek"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Leden"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Únor"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Březen"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Duben"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Květen"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Červen"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Červenec"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Srpen"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Září"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Říjen"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Listopad"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Prosinec"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "ne"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "po"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "út"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "st"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "čt"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "pá"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "so"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "led"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "úno"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "bře"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "dub"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "kvě"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "čen"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "čvc"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "srp"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "zář"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "říj"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "lis"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "pro"
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP."
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP."
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "dop."
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "odp."
@@ -1468,7 +1468,7 @@ msgstr "_Přidat..."
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
@@ -1907,7 +1907,7 @@ msgstr "Chystáte se vložit soubor %s do těla zprávy. Jste si tím jistý?"
 msgid "Are you sure?"
 msgstr "Jste si jistý?"
 
-#: src/compose.c:3628 src/compose.c:10529 src/compose.c:11390
+#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
 msgid "_Insert"
 msgstr "_Vložit"
 
@@ -1962,7 +1962,7 @@ msgstr ""
 "Před odesláním vyberte prosím nějaký účet."
 
 #: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
-#: src/prefs_account.c:3310 src/toolbar.c:406 src/toolbar.c:424
+#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Odeslat"
 
@@ -1972,8 +1972,8 @@ msgstr ""
 "Jediný adresát je výchozí příjemce kopií (viz nastavení účtu). Opravdu "
 "odeslat?"
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5633
-#: src/folderview.c:2445 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
+#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Odeslat"
@@ -2009,7 +2009,7 @@ msgstr "Opravdu zařadit do fronty?"
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:5169 src/compose.c:9993
+#: src/compose.c:5169 src/compose.c:9999
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2019,7 +2019,7 @@ msgstr ""
 "\n"
 "Konverze znakové sady se nezdařila."
 
-#: src/compose.c:5172 src/compose.c:9996
+#: src/compose.c:5172 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2029,7 +2029,7 @@ msgstr ""
 "\n"
 "Nepodařilo se získat šifrovací klíč příjemce."
 
-#: src/compose.c:5178 src/compose.c:9990
+#: src/compose.c:5178 src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2072,7 +2072,7 @@ msgstr ""
 "%s\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2083,7 +2083,7 @@ msgstr ""
 "na %s.\n"
 "Odeslat v kódování %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2096,72 +2096,72 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Nepodařilo se zašifrovat zprávu: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Varování šifrování"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "_Pokračovat"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Není dostupný žádný účet pro odeslání pošty!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Vybraný účet není NNTP: Odeslání není možné. "
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Příloha %s už neexistuje. Ignorovat?"
 
-#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Zrušit posílání"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ignorovat přílohu"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Část originálu %s"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Přidat do knihy adres"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Smazat obsah pole"
 
-#: src/compose.c:6997 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Použijte <tab> pro automatické dokončení podle knihy adres"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "MIME typ"
 
-#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Uložit zprávu do "
 
-#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2172,23 +2172,23 @@ msgstr "Uložit zprávu do "
 msgid "_Browse"
 msgstr "P_rocházet"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "_Záhlaví"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Přílohy"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "_Ostatní"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "Pře_dmět:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2197,19 +2197,19 @@ msgstr ""
 "Nelze spustit kontrolu pravopisu.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_Od:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Účet použitý pro tuto zprávu"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Adresa odesílatele musí být uvedena"
 
-#: src/compose.c:8373
+#: src/compose.c:8379
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2218,68 +2218,68 @@ msgstr ""
 "Systém zabezpečení '%s' se nepodařilo načíst. Nebudete moci digitálně "
 "podepsat nebo šifrovat zprávu."
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "Žá_dné"
 
-#: src/compose.c:8575 src/prefs_template.c:760
+#: src/compose.c:8581 src/prefs_template.c:760
 #, 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:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Chyba v poli 'Od' šablony."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Chyba v poli 'Komu' šablony."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Chyba v poli 'Kopie' šablony."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Chyba v poli 'Skrytá kopie' šablony."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Chyba v poli 'Komu' šablony."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Chyba v poli 'Předmět' šablony."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2290,15 +2290,15 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:9959 src/messageview.c:1096
+#: src/compose.c:9965 src/messageview.c:1096
 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:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2309,15 +2309,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Nelze uložit koncept."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Nelze uložit koncept"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2325,24 +2325,24 @@ msgstr ""
 "Nemohu uložit koncept.\n"
 "Chcete zrušit ukončení nebo zahodit tuto zprávu?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Zrušit ukončení"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Zahodit zprávu"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Výběr souboru"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Soubor '%s' nelze číst."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2351,54 +2351,54 @@ msgstr ""
 "Soubor '%s' obsahuje neplatné znaky\n"
 "pro nastavené kódování, vložení může obsahovat chyby."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Zpráva byla modifikována. Chcete ji zahodit?"
 
-#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Zahodit"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "Uložit jako _koncept"
 
-#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 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:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Neukládat"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použít šablonu '%s'?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Použít šablonu"
 
-#: src/compose.c:10529 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10535 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Vložit nebo připojit?"
 
-#: src/compose.c:11388
+#: src/compose.c:11400
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2406,16 +2406,16 @@ msgstr ""
 "Chcete obsah souboru(ů) vložit do textu zprávy nebo soubor(y) připojit ke "
 "zprávě jako přílohu?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Přiložit"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba formátu citace na řádku %d."
 
-#: src/compose.c:11902
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2632,7 +2632,7 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1970
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Soubor"
@@ -2779,7 +2779,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3383
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
@@ -2961,7 +2961,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Maximální počet položek, které budou vráceny při prohledávání."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Server"
 
@@ -3679,61 +3679,61 @@ msgstr "Složka '%s' už existuje."
 msgid "Can't create the folder '%s'."
 msgstr "Nemohu vytvořit složku '%s'."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Označit všechny jako _přečtené"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Označit všechny jako přečtené rekurzi_vně"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "S_pustit pravidla zpracování"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Prohledat složku..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "_Zpracování..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Vyprázdnit _koš..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Odeslat _frontu..."
 
-#: src/folderview.c:385 src/folderview.c:432
+#: src/folderview.c:389 src/folderview.c:436
 #: src/plugins/notification/notification_lcdproc.c:141
 #: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
 msgid "New"
 msgstr "Nové"
 
-#: src/folderview.c:386 src/folderview.c:433
+#: src/folderview.c:390 src/folderview.c:437
 #: src/plugins/notification/notification_lcdproc.c:145
 #: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: src/folderview.c:387 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:391 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Celkem"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:435 src/summaryview.c:445
+#: src/folderview.c:439 src/summaryview.c:445
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:765
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:837
+#: src/folderview.c:845
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3741,99 +3741,99 @@ 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:839 src/summaryview.c:4115
+#: src/folderview.c:847 src/summaryview.c:4115
 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:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Označit všechny jako přečtené"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prohledávám složku %s/%s..."
 
-#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1030 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prohledávám složku %s..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 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:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Prohledávám strom složek..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nepodařilo se načíst obsah adresáře %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zavírám složku %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otevírám složku %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Složku nelze otevřít."
 
-#: src/folderview.c:2386 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Odstranit všechny zprávy v koši?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Vyprázdnit koš"
 
-#: src/folderview.c:2431 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Varování offline režimu"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Pracujete v režimu offline. Přepnout?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Odeslat pozdržené zprávy"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Odeslat všechny zprávy ve frontě pozdržených zpráv?"
 
-#: src/folderview.c:2453 src/toolbar.c:2647
+#: src/folderview.c:2466 src/toolbar.c:2647
 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:2456 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2469 src/main.c:2743 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3842,64 +3842,64 @@ msgstr ""
 "Při odesílání pozdržených zpráv nastala chyba:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, 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:2532
+#: src/folderview.c:2545
 #, 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:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Kopírovat složku"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Přesunout složku"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopíruji %s do %s..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Přesouvám %s do %s..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Zdroj i cíl jsou totožné."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 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:2583
+#: src/folderview.c:2596
 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:2586
+#: src/folderview.c:2599
 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:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Kopírování se nezdařilo!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Přesun se nezdařil!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Zpracování složky - pravidla pro složku %s"
 
-#: src/folderview.c:3068 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
 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."
 
@@ -4237,63 +4237,63 @@ msgstr "_Poznámky k verzi"
 msgid "_Statistics"
 msgstr "_Statistiky"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Červená"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Růžová"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Nebeská modř"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Zelená"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Hnědá"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Šedá"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Světle hnědá"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Tmavě červená"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Tmavě růžová"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Ocelově modrá"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Zlatá"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Světle zelená"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -5027,7 +5027,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:734 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:728 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
@@ -5070,9 +5070,9 @@ msgid "_Hide"
 msgstr "_Skrýt"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3273 src/prefs_account.c:3291 src/prefs_account.c:3309
-#: src/prefs_account.c:3327 src/prefs_account.c:3345 src/prefs_account.c:3363
-#: src/prefs_account.c:3382 src/prefs_account.c:3475
+#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
+#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
+#: src/prefs_account.c:3395 src/prefs_account.c:3488
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5776,8 +5776,8 @@ msgstr "Připojení k %s selhalo"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojení s %s bylo rozpojeno. Obnovuji spojení...\n"
 
-#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
-#: src/imap.c:4622 src/imap.c:5433
+#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
+#: src/imap.c:4620 src/imap.c:5431
 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."
@@ -5818,85 +5818,85 @@ msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4112
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr "Nelze spustit TLS relaci.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, 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:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Přidávám zprávy..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopíruji zprávy..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "nelze nastavit příznak odstranění\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Vyhledávám odhlášené složky v %s..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hledám podsložky %s..."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit mailbox: selhal příkaz LIST\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit mailbox\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat mailbox: %s na %s\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "nelze odstranit mailbox\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST selhal\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Označuji zprávy..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Server vyžeduje TLS pro přihlášení.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodařilo se načíst údaje o schopnostech serveru IMAP.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5905,20 +5905,20 @@ msgstr ""
 "Připojení k %s selhalo: server požaduje TLS, ale Claws Mail je zkompilován "
 "bez podpory TLS.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Přihlašování k serveru je mimo provoz.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nelze nastavit příznak odstranění: %d\n"
 
-#: src/imap.c:6091
+#: src/imap.c:6089
 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"
@@ -7855,7 +7855,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:555 src/messageview.c:1852 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Přepsat"
@@ -7905,7 +7905,7 @@ msgstr "Hledání ukončeno"
 msgid "Compose _new message"
 msgstr "_Napsat novou zprávu"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
+#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Náhled zprávy"
 
@@ -7943,64 +7943,64 @@ msgstr ""
 "'Komu:' a 'Kopie:' nejste oficiálním adresátem.\n"
 "Doporučuje se neodesílat potvrzení o doručení."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Přijímaní zprávy (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1008
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Nepodařilo se rozšifrovat: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1493 src/messageview.c:1501
 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:1844 src/messageview.c:1847 src/mimeview.c:1995
+#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Přepsat existující soubor?"
 
-#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Zobrazit všechny %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Je zobrazen jen první megabyte textu."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1950
 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:1950
+#: src/messageview.c:1953
 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:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Tato zpráva vyžaduje potvrzení o duručení."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Odeslat potvrzení"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8008,7 +8008,7 @@ msgstr ""
 "Tato zpráva byla částečně stažena\n"
 "a byla odstraněna ze serveru."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8017,15 +8017,15 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Označit ke stažení"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Označit k odstranění"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8034,12 +8034,12 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude stažena úplně."
 
-#: src/messageview.c:2021 src/messageview.c:2034
+#: src/messageview.c:2024 src/messageview.c:2037
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Odoznačit"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8048,11 +8048,11 @@ msgstr ""
 "Tato zpráva byla částečně stažena;\n"
 "je %s a bude odstraněna."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Oznámení o doručení"
 
-#: src/messageview.c:2101
+#: src/messageview.c:2104
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8062,19 +8062,19 @@ 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:2105 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Odeslat oznámení"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemohu tisknout: zpráva neobsahuje text."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8082,7 +8082,7 @@ msgstr ""
 "\n"
 "  Ve složce nejsou žádné zprávy"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8090,7 +8090,7 @@ msgstr ""
 "\n"
 "  Zpráva smazána"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8098,7 +8098,7 @@ msgstr ""
 "\n"
 "  Zpráva byla smazána nebo přesunuta do jiné složky"
 
-#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
+#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Během učení došlo k chybě.\n"
@@ -8332,34 +8332,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "nemohu vybrat skupinu: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1054 src/news.c:1224
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "nemohu nastavit skupinu: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah příspěvků: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1133 src/news.c:1157 src/news.c:1181
 msgid "couldn't get xhdr\n"
 msgstr "nelze získat xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "získávám xover %d - %d v %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "nelze získat xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "neplatná xover řádka\n"
 
-#: src/news.c:1446
+#: src/news.c:1449
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -9301,7 +9301,7 @@ msgstr "Zprávy větší než tato velikost nebudou kontrolovány"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "KB"
 
@@ -9861,7 +9861,7 @@ msgstr "CSS z tohoto souboru bude aplikováno na všechny HTML části"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1442 src/prefs_account.c:1531 src/prefs_account.c:2002
+#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Procházet"
@@ -10164,7 +10164,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Zásuvný modul GData: Pokus o obnovení autentizace\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Autentizace"
 
@@ -10341,7 +10341,7 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Interval obnovy vyrovnávací paměti"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1487
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1490
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr "hodin"
@@ -10718,7 +10718,7 @@ msgstr "Nastavit autentizaci"
 #: src/plugins/managesieve/sieve_prefs.c:240
 #: src/plugins/vcalendar/vcal_prefs.c:348
 #: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
-#: src/prefs_account.c:1795
+#: src/prefs_account.c:1798
 msgid "User ID"
 msgstr "Uživatelské jméno"
 
@@ -10726,18 +10726,18 @@ msgstr "Uživatelské jméno"
 #: src/plugins/rssyl/rssyl_feed_props.c:395
 #: src/plugins/vcalendar/vcal_prefs.c:356
 #: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
-#: src/prefs_account.c:1815 src/prefs_account.c:2529 src/prefs_account.c:2551
+#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
 #: src/wizard.c:1215 src/wizard.c:1635
 msgid "Password"
 msgstr "Heslo"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1570
-#: src/prefs_account.c:1767
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
+#: src/prefs_account.c:1770
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1580
-#: src/prefs_account.c:1776 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
+#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -11672,7 +11672,7 @@ 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:163 src/plugins/rssyl/rssyl_feed_props.c:476
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
 msgstr "minut(y)"
@@ -12294,8 +12294,8 @@ msgstr "Zobrazit konzoli Pythonu..."
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2518
-#: src/prefs_account.c:2540 src/prefs_account.c:2809 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
+#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Procházet"
@@ -12620,7 +12620,7 @@ msgstr "Stahovat komentáře staré méně než"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1480 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
 msgid "days"
 msgstr "dnech"
 
@@ -13241,7 +13241,7 @@ msgid "Next month"
 msgstr "Další měsíc"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:735
+#: src/plugins/vcalendar/vcal_prefs.c:729
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13670,15 +13670,15 @@ msgstr "Tento týden"
 msgid "Later"
 msgstr "Později"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Přijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Odmítnuté:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Předběžně přijaté:"
 
@@ -14125,12 +14125,12 @@ msgstr "nastala chyba v POP3 relaci\n"
 msgid "TOP command unsupported\n"
 msgstr "Příkaz TOP není podporován\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1451 src/prefs_account.c:2446
+#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
 #: src/wizard.c:1499
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1564 src/prefs_account.c:2461
+#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14219,40 +14219,40 @@ msgstr "příkaz pro odeslání pošty"
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Výchozí inbox"
 
-#: src/prefs_account.c:1438 src/prefs_account.c:1445 src/prefs_account.c:1527
-#: src/prefs_account.c:1534
+#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
+#: src/prefs_account.c:1537
 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:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Použít zabezpečenou autentizaci (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Odstranit zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Odstranit po"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1484
+#: src/prefs_account.c:1477 src/prefs_account.c:1487
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dnů a 0 hodin: odstranit ihned"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Limit velikosti pro příjem"
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1503
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14260,82 +14260,82 @@ 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:1540 src/prefs_account.c:2476
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr "Maximální počet příspěvků pro stažení"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "(pokud je 0, je to neomezený počet)"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "adresář pro IMAP server"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(obvykle prázdné)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 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:1622
+#: src/prefs_account.c:1625
 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:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Při načítání zpracovat zprávy filtrem pro příjem"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Při načítání filtrovat zprávy zásuvnými moduly"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 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:1722 src/prefs_customheader.c:208
+#: src/prefs_account.c:1725 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Generovat číslo zprávy"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Poslat mailovou adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Přidat záhlaví user agent"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1840
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14343,175 +14343,175 @@ 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:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizace POP3 před odesláním"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Časový limit pro POP autentizaci: "
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Automaticky vložit podpis"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Slovníky pro kontrolu pravopisu"
 
-#: src/prefs_account.c:2076 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Výchozí slovník"
 
-#: src/prefs_account.c:2089 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Výchozí alternativní slovník"
 
-#: src/prefs_account.c:2175 src/prefs_account.c:3328
+#: src/prefs_account.c:2181 src/prefs_account.c:3341
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/prefs_account.c:2190 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/prefs_account.c:2205 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Předat"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Výchozí systém zabezpečení"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Zprávy vždy digitálně podepsat"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Zprávy vždy šifrovat"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Odpověď na podepsanou zprávu vždy podepsat"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Odpověď na šifrovanou zprávu vždy šifrovat"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 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:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Odeslané šifrované zprávy uložit jako čistý text"
 
-#: src/prefs_account.c:2450 src/prefs_account.c:2465 src/prefs_account.c:2479
+#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
 msgid "Don't use SSL"
 msgstr "Nepoužívat SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Použít SSL pro POP3 spojení"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2502
+#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použít příkaz STARTTLS pro spuštění SSL relace"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použít SSL pro IMAP4 spojení"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Použít SSL pro NNTP připojení"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nepoužítvat SSL (pokud je to ale nutné, použít STARTTLS)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Použít SSL pro SMTP připojení"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Klientské certifikáty"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Certifikát pro příjem"
 
-#: src/prefs_account.c:2520 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2544
+#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
+#: src/prefs_account.c:2550
 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:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Certifikát pro odeslání"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Automaticky přijímat platné certifikáty SSL"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Použít neblokující SSL"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Vypněte, pokud máte problémy se SSL připojením"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "POP3 port"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Název domény"
 
-#: src/prefs_account.c:2743
+#: src/prefs_account.c:2756
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14519,112 +14519,112 @@ msgstr ""
 "Jméno domény bude použito pro generované Message-ID a při připojení SMTP "
 "serverů."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Příkaz pro komunikaci se serverem"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 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:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Ukládat odložené zprávy do"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Ukládat odstraněné zprávy do"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Nebylo zadáno jméno účtu."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána poštovní adresa."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán SMTP server."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské číslo."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "Nebyl zadán POP3 server."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 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:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "Nebyl zadán IMAP4 server."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán NNTP server."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "Nebyl zadán název lokálního mailbox souboru."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "Nebyl zadán příkaz pro odeslání."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Přijmout"
 
-#: src/prefs_account.c:3346 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Zabezpečení"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Nastavení pro nový účet"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - nastavení účtu"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Selhalo (špatná adresa)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Soubor s podpisem"
 
-#: src/prefs_account.c:4019 src/prefs_account.c:4036 src/wizard.c:1066
+#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Vybrat soubor s certifikátem"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (modul nebyl načten)"
@@ -14879,15 +14879,15 @@ msgstr "Nadefinované akce"
 msgid "Action string is not valid."
 msgstr "Definice akce není platná."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Nazdar,\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "V %d\\n%f napsáno:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:306 src/prefs_quote.c:85
+#: src/prefs_common.c:307 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -14895,7 +14895,7 @@ 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:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
diff --git a/po/da.po b/po/da.po
index 5207e7f..bd20a7f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.14.0git152\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-02 15:02+0200\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-08-01 08:27+0200\n"
 "Last-Translator: Erik P. Olsen <erik at epo.dk>\n"
 "Language-Team: dansk <>\n"
@@ -80,7 +80,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hent Post' henter post fra de afkrydsede konti"
 
 #: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1264
+#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -93,7 +93,7 @@ msgstr "'Hent Post' henter post fra de afkrydsede konti"
 msgid "Name"
 msgstr "Navn"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4128
+#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -804,8 +804,8 @@ msgstr "Adressebøger"
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:343
-#: src/folderview.c:431 src/prefs_account.c:2786 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
+#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Mappe"
 
@@ -945,18 +945,18 @@ msgstr "Adresseopdatering"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Fejl i opdatering. Ændringer blev ikke indskrevet i mappe."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Bemærk"
 
-#: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
-#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
+#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5632 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Fejl"
@@ -989,43 +989,43 @@ msgstr "LDAP navn"
 msgid "Attribute Value"
 msgstr "Attributværdi"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Intet"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "en fremviser"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "en MIME fortolker"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "mapper"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "filtrering"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "en grænseflade til databeskyttelse"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "en informatør"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "en hjælpefunktion"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "ting"
 
-#: src/common/plugin.c:332
+#: src/common/plugin.c:334
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1033,25 +1033,25 @@ msgstr ""
 "Dette udvidelsesmodul muliggør %s (%s), som allerede tilbydes af "
 "udvidelsesmodulet %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Udvidelsesmodulet er allerede indlæst"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Kunne ikke tildele hukommelse til udvidelsesmodulet"
 
-#: src/common/plugin.c:480
+#: src/common/plugin.c:482
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Dette program er ikke licensebelagt under en GPL v3 eller senere anvendelig "
 "license."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Dette program er for Claws Mail GTK1."
 
-#: src/common/plugin.c:771
+#: src/common/plugin.c:769
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1060,7 +1060,7 @@ msgstr ""
 "Versionen af Claws Mail er nyere end den version, som '%s' udvidelsesmodulet "
 "er bygget til."
 
-#: src/common/plugin.c:774
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1068,12 +1068,12 @@ msgstr ""
 "Versionen af Claws Mail er nyere end den version, som udvidelsesmodulet er "
 "bygget med."
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:781
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Versionen af Claws Mail er for gammel til '%s' udvidelsesmodulet."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Versionen af Claws Mail er for gammel til udvidelsesmodulet."
 
@@ -1089,24 +1089,24 @@ msgstr "Der er ingen SMTP AUTH metode tilgængelig\n"
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Den valgte SMTP AUTH metode var ikke tilgængelig\n"
 
-#: src/common/smtp.c:505 src/common/smtp.c:559
+#: src/common/smtp.c:501 src/common/smtp.c:555
 msgid "bad SMTP response\n"
 msgstr "ugyldig SMTP svar\n"
 
-#: src/common/smtp.c:530 src/common/smtp.c:548 src/common/smtp.c:662
+#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
 msgid "error occurred on SMTP session\n"
 msgstr "der opstod fejl under SMTP sessionen\n"
 
-#: src/common/smtp.c:539 src/pop.c:905
+#: src/common/smtp.c:535 src/pop.c:905
 msgid "error occurred on authentication\n"
 msgstr "der opstod fejl under godkendelse\n"
 
-#: src/common/smtp.c:589
+#: src/common/smtp.c:585
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Meddelelsen er for stor (maksimum er %s)\n"
 
-#: src/common/smtp.c:621 src/pop.c:898
+#: src/common/smtp.c:617 src/pop.c:898
 msgid "couldn't start TLS session\n"
 msgstr "kunne ikke starte TLS session\n"
 
@@ -1243,212 +1243,212 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Søndag"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Mandag"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Fredag"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Januar"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Februar"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marts"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "April"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maj"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juni"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juli"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Oktober"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "December"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Søn"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Man"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Tir"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Ons"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Tor"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Fre"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Lør"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Maj"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dec"
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "FM"
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "EM"
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "fm"
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "em"
@@ -1462,7 +1462,7 @@ msgstr "_Tilføj..."
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Egenskaber..."
 
@@ -1901,7 +1901,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: src/compose.c:3628 src/compose.c:10529 src/compose.c:11390
+#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
 msgid "_Insert"
 msgstr "_Indsæt"
 
@@ -1956,7 +1956,7 @@ msgstr ""
 "Vælg en konto før afsendelse."
 
 #: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
-#: src/prefs_account.c:3310 src/toolbar.c:406 src/toolbar.c:424
+#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Send"
 
@@ -1965,8 +1965,8 @@ msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "Den eneste modtager er standard CC adressen. Skal den sendes alligevel?"
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5633
-#: src/folderview.c:2445 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
+#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Send"
@@ -2001,7 +2001,7 @@ msgstr "Skal den alligevel sættes i kø?"
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:5169 src/compose.c:9993
+#: src/compose.c:5169 src/compose.c:9999
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2011,7 +2011,7 @@ msgstr ""
 "\n"
 "Tegnsætkonvertering mislykkedes."
 
-#: src/compose.c:5172 src/compose.c:9996
+#: src/compose.c:5172 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2021,7 +2021,7 @@ msgstr ""
 "\n"
 "Kunne ikke hente modtagerens krypteringsnøgle."
 
-#: src/compose.c:5178 src/compose.c:9990
+#: src/compose.c:5178 src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2064,7 +2064,7 @@ msgstr ""
 "%s\n"
 "Brug \"Send meddelelser fra kø\" i hovedvinduet for at prøve igen."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2075,7 +2075,7 @@ msgstr ""
 "til det anførte %s tegnsæt.\n"
 "Skal det sendes som %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2088,72 +2088,72 @@ msgstr ""
 "\n"
 "Skal den sendes alligevel?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Kunne ikke kryptere posten: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Krypteringsadvarsel"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "F_ortsæt"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Der er ingen konto tilgængelig for afsendelse af post!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Den valgte konto er ikke NNTP: Afsendelse er ikke mulig."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Vedhæftningen %s eksisterer ikke længere. Skal den ignoreres?"
 
-#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Annullér afsendelse"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ignorér vedhæftning"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Original %s del"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Føj til adresse_bog"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Slet postens indhold"
 
-#: src/compose.c:6997 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Brug <tab> for automatisk udfyldning fra adressebogen"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "Mime-type"
 
-#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Gem meddelelse i "
 
-#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2164,23 +2164,23 @@ msgstr "Gem meddelelse i "
 msgid "_Browse"
 msgstr "_Gennemse"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "Ho_ved"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Vedhæftninger"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "An_det"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "E_mne:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2189,19 +2189,19 @@ msgstr ""
 "Stavekontrol kunne ikke startes.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_Fra:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Konto til brug for denne post"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Afsenderadresse"
 
-#: src/compose.c:8373
+#: src/compose.c:8379
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2210,68 +2210,68 @@ msgstr ""
 "Databeskyttelsessystemet '%s' kan ikke indlæses. Denne meddelelse kan "
 "hverken signeres eller krypteres."
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Ingen"
 
-#: src/compose.c:8575 src/prefs_template.c:760
+#: src/compose.c:8581 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Teksten i skabelonen har en fejl i linje %d."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Formatfejl i skabelonens 'Fra' felt."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Formatfejl i skabelonens 'Til' felt."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Formatfejl i skabelonens cc felt."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Formatfejl i skabelonens bcc felt."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Formatfejl i skabelonens 'Svar til' felt."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Formatfejl i skabelonens emne felt."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME-type."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Filen eksisterer ikke eller er tom."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Tegnkodning"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Filnavn"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2282,15 +2282,15 @@ msgstr ""
 "Skal processens afslutning gennemtvinges?\n"
 "Processens gruppe-ID: %d"
 
-#: src/compose.c:9959 src/messageview.c:1096
+#: src/compose.c:9965 src/messageview.c:1096
 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:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Kunne ikke sætte meddelelsen i kø."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2301,15 +2301,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Kunne ikke gemme udkast."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Kunne ikke gemme udkast"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2317,24 +2317,24 @@ msgstr ""
 "Kunne ikke gemme udkast.\n"
 "Skal lukning annulleres eller posten kasseres?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Annullér lukning"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Kassér post"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunne ikke læses."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2343,54 +2343,54 @@ msgstr ""
 "Filen '%s' indeholder ugyldige tegn\n"
 "for den aktuelle tegnkodning, indsættelse kan være forkert."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Kassér meddelelse"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Denne meddelelse er blevet ændret. Skal den kasseres?"
 
-#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Kassér"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "_Gem som Udkast"
 
-#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Gem ændringer"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Denne meddelelse er blevet ændret. Skal de seneste ændringer gemmes?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Kassér"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Skal skabelonen '%s' anvendes?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Anvend skabelon"
 
-#: src/compose.c:10529 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10535 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Erstat"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Indsæt eller vedhæft?"
 
-#: src/compose.c:11388
+#: src/compose.c:11400
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2398,16 +2398,16 @@ msgstr ""
 "Skal indholdet af filerne indsættes i meddelelsesteksten eller vedhæftes "
 "posten?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Vedhæft"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Formatfejl i citation i linje %d."
 
-#: src/compose.c:11902
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2624,7 +2624,7 @@ msgid " Check File "
 msgstr " Tjek Fil "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1970
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Fil"
@@ -2772,7 +2772,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3383
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
@@ -2949,7 +2949,7 @@ 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:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Grundlæggende"
 
@@ -3664,159 +3664,159 @@ msgstr "Mappen '%s' eksisterer allerede."
 msgid "Can't create the folder '%s'."
 msgstr "Kan ikke oprette mappen '%s'."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Markér alt som l_æst"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Markér alt som læst rekursi_vt"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "K_ør behandlingsregler"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Søg mappe..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "Behan_dler..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Tøm _papirkurven..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Send _kø..."
 
-#: src/folderview.c:385 src/folderview.c:432
+#: src/folderview.c:389 src/folderview.c:436
 #: src/plugins/notification/notification_lcdproc.c:141
 #: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
 msgid "New"
 msgstr "Nye"
 
-#: src/folderview.c:386 src/folderview.c:433
+#: src/folderview.c:390 src/folderview.c:437
 #: src/plugins/notification/notification_lcdproc.c:145
 #: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
 msgid "Unread"
 msgstr "Ulæste"
 
-#: src/folderview.c:387 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:391 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Totalt"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:435 src/summaryview.c:445
+#: src/folderview.c:439 src/summaryview.c:445
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:765
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr "Angiver mappeinfo..."
 
-#: src/folderview.c:837
+#: src/folderview.c:845
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
 msgstr ""
 "Skal al post i denne mappe og dens undermapper virkelig markeres som læst?"
 
-#: src/folderview.c:839 src/summaryview.c:4115
+#: src/folderview.c:847 src/summaryview.c:4115
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Skal al post i denne mappe virkelig markeres som læst?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Markér alt som læst"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Skanner mappe %s/%s..."
 
-#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1030 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Skanner mappen %s..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Gendanner mappetræ"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 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?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappetræet..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Skanner mappetræet..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kunne ikke skanne mappe %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Leder efter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Lukker mappe %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Åbner mappe %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Mappen kunne ikke åbnes."
 
-#: src/folderview.c:2386 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Empty trash"
 msgstr "Tøm papirkurv"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Skal alle meddelelser i papirkurven slettes?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Tøm papirkurv"
 
-#: src/folderview.c:2431 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Offline advarsel"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Du arbejder offline. Fortsæt alligevel?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Send meddelelser fra kø"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Send alle meddelelser i køen"
 
-#: src/folderview.c:2453 src/toolbar.c:2647
+#: src/folderview.c:2466 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Der opstod nogle fejl under afsendelse af meddelelser fra køen."
 
-#: src/folderview.c:2456 src/main.c:2742 src/toolbar.c:2650
+#: src/folderview.c:2469 src/main.c:2743 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3825,64 +3825,64 @@ msgstr ""
 "Der opstod nogle fejl under afsendelse af meddelelser fra køen:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Skal mappen virkelig kopieres, '%s' til '%s'?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Skal mappen '%s' virkelig gøres til undermappe af '%s'?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Kopiér mappe"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Flyt mappe"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopierer %s til %s..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Flyt %s til %s..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Fra og til er identiske."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan ikke kopiere en mappe til en af dens undermapper."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Kan ikke flytte en mappe til en af dens undermapper."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "En mappe kan ikke flyttes mellem forskellige postkasser."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Kopiering mislykkedes"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Flytning mislykkedes"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Behandler konfigurationen for mappe %s"
 
-#: src/folderview.c:3068 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Modtagemappen kan kun bruges til at gemme undermapper."
 
@@ -4143,44 +4143,44 @@ msgstr ""
 "En kopi af \"GNU General Public License\" burde være modtaget sammen med "
 "dette program. Hvis ikke, se "
 
-#: src/gtk/about.c:698 src/main.c:2566
+#: src/gtk/about.c:698 src/main.c:2567
 msgid "Session statistics\n"
 msgstr "Session-statistikker\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2576 src/main.c:2579
+#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2577 src/main.c:2580
 #, c-format
 msgid "Started: %s\n"
 msgstr "Startet: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2585
+#: src/gtk/about.c:718 src/main.c:2586
 msgid "Incoming traffic\n"
 msgstr "Indkommende trafik\n"
 
-#: src/gtk/about.c:721 src/main.c:2588
+#: src/gtk/about.c:721 src/main.c:2589
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Modtaget meddelelser: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2594
+#: src/gtk/about.c:728 src/main.c:2595
 msgid "Outgoing traffic\n"
 msgstr "Udgående trafik\n"
 
-#: src/gtk/about.c:731 src/main.c:2597
+#: src/gtk/about.c:731 src/main.c:2598
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nye/omdirigerede meddelelser: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2601
+#: src/gtk/about.c:736 src/main.c:2602
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Besvarede meddelelser: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2605
+#: src/gtk/about.c:741 src/main.c:2606
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Videresendte meddelelser: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2609
+#: src/gtk/about.c:746 src/main.c:2610
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "I alt udgående meddelelser: %d\n"
@@ -4223,63 +4223,63 @@ msgstr "_Versionsnoter"
 msgid "_Statistics"
 msgstr "_Statistik"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Orange"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rød"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Pink"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Himmelblå"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Blå"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Grøn"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Brun"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Grå"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Lysebrun"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Mørkerød"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Mørk-pink"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Stålblå"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Gylden"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Lysegrøn"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5011,7 +5011,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:734 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:728 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Udvidelsesmoduler"
 
@@ -5054,9 +5054,9 @@ msgid "_Hide"
 msgstr "_Skjul"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3273 src/prefs_account.c:3291 src/prefs_account.c:3309
-#: src/prefs_account.c:3327 src/prefs_account.c:3345 src/prefs_account.c:3363
-#: src/prefs_account.c:3382 src/prefs_account.c:3475
+#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
+#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
+#: src/prefs_account.c:3395 src/prefs_account.c:3488
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5763,8 +5763,8 @@ msgstr "Fejl ved forbindelsen til %s"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 forbindelsen til %s er blevet afbrudt. Forbinder igen...\n"
 
-#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
-#: src/imap.c:4622 src/imap.c:5433
+#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
+#: src/imap.c:4620 src/imap.c:5431
 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."
 
@@ -5805,85 +5805,85 @@ msgstr "Kan ikke forbinde til IMAP4 server: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan ikke forbinde til IMAP4 server: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4112
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr "Kan ikke starte TLS session.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunne ikke logge ind til IMAP server %s.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunne ikke logge ind til IMAP server %s."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Tilføjer meddelelse..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopieret meddelelser..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "kan ikke sætte sletteflag\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "kan ikke tømme\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Søger efter opsagte mapper i %s..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Søger efter undermapper til %s..."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke oprette postkasse: Fejl i LIST\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "kan ikke oprette postkasse\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke omdøbe postkasse: %s til %s\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette postkasse\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "Der opstod fejl i LIST\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Sætter meddelelsesflag..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke vælge mappe: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Server kræver TLS for logind.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "kan ikke genopfriske mulighederne.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5892,20 +5892,20 @@ msgstr ""
 "der opstod fejl i forbindelsen til %s: serveren kræver TLS, men Claws Mail "
 "er oversat uden TLS støtte.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Server logind er deaktiveret.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Henter meddelelse..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan ikke sætte sletteflag: %d\n"
 
-#: src/imap.c:6091
+#: src/imap.c:6089
 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"
@@ -6321,7 +6321,7 @@ msgstr "Færdig (Ingen ny meddelelse)"
 msgid "Connection failed"
 msgstr "Der opstod fejl i forbindelsen"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:891
+#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
@@ -6365,7 +6365,7 @@ msgstr "Kan ikke forbinde til POP3 server: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan ikke forbinde til POP3 server: %s:%d\n"
 
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:428
+#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
 #: src/send_message.c:496
 msgid "Authenticating..."
 msgstr "Godkender..."
@@ -6604,7 +6604,7 @@ msgstr[1] ""
 "konfigurationer for mere information:\n"
 "%s"
 
-#: src/main.c:1498
+#: src/main.c:1499
 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 "
@@ -6614,7 +6614,7 @@ msgstr ""
 "muligvis pga en fejlende IMAP konto. Brug \"Genopret mappetræ\" fra "
 "kontekstmenuen i postkassens forældermappe for at prøve at rette det."
 
-#: src/main.c:1504
+#: src/main.c:1505
 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 "
@@ -6624,36 +6624,36 @@ msgstr ""
 "Det skyldes sandsynligvis et forældet eksternt udvidelsesmodul. Geninstallér "
 "modulet og prøv igen."
 
-#: src/main.c:1749
+#: src/main.c:1750
 msgid "Missing filename\n"
 msgstr "Manglende filnavn\n"
 
-#: src/main.c:1756
+#: src/main.c:1757
 msgid "Cannot open filename for reading\n"
 msgstr "Kan ikke åbne filnavn for læsning\n"
 
-#: src/main.c:1767
+#: src/main.c:1768
 msgid "Malformed header\n"
 msgstr "Misdannet posthoved\n"
 
-#: src/main.c:1774
+#: src/main.c:1775
 msgid "Duplicated 'To:' header\n"
 msgstr "Dubleret 'Til:' posthoved\n"
 
-#: src/main.c:1785
+#: src/main.c:1786
 msgid "Missing required 'To:' header\n"
 msgstr "'Til:' posthoved mangler\n"
 
-#: src/main.c:1928
+#: src/main.c:1929
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Brug: %s [OPTION]...\n"
 
-#: src/main.c:1930
+#: src/main.c:1931
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    åbn redigeringsvinduet"
 
-#: src/main.c:1931
+#: src/main.c:1932
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6673,11 +6673,11 @@ msgstr ""
 "                         tom linje, derpå meddelelsesteksten indtil "
 "filafslutning."
 
-#: src/main.c:1936
+#: src/main.c:1937
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      abonnér på den givne URI hvis muligt"
 
-#: src/main.c:1937
+#: src/main.c:1938
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6687,23 +6687,23 @@ msgstr ""
 "                          åbn redigeringsvinduet med de angivne filer\n"
 "                          vedhæftet"
 
-#: src/main.c:1940
+#: src/main.c:1941
 msgid "  --receive              receive new messages"
 msgstr "  --receive              hent nye meddelelser"
 
-#: src/main.c:1941
+#: src/main.c:1942
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          hent nye meddelelser for alle konti"
 
-#: src/main.c:1942
+#: src/main.c:1943
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     annullér hentning af meddelelser"
 
-#: src/main.c:1943
+#: src/main.c:1944
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       annullér afsendelse af meddelelser"
 
-#: src/main.c:1944
+#: src/main.c:1945
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6723,15 +6723,15 @@ msgstr ""
 "                         recursivt: falsk, hvis argument begynder med 0, n, "
 "N, f eller F"
 
-#: src/main.c:1951
+#: src/main.c:1952
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 send alle meddelelser i køen"
 
-#: src/main.c:1952
+#: src/main.c:1953
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappe]...   vis det totale antal af meddelelser"
 
-#: src/main.c:1953
+#: src/main.c:1954
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6739,15 +6739,15 @@ msgstr ""
 "  --status-full [mappe]...\n"
 "                         vis status for hver mappe"
 
-#: src/main.c:1955
+#: src/main.c:1956
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           vis sessionsstatistikker"
 
-#: src/main.c:1956
+#: src/main.c:1957
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     nulstil sessionsstatistikker"
 
-#: src/main.c:1957
+#: src/main.c:1958
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6756,35 +6756,35 @@ msgstr ""
 "                          går til den anførte mappe/meddelelse\n"
 "                          mappe er en mappe-ID som f.eks. 'mappe/under_mappe'"
 
-#: src/main.c:1959
+#: src/main.c:1960
 msgid "  --online               switch to online mode"
 msgstr "  --online              skifter til online tilstand"
 
-#: src/main.c:1960
+#: src/main.c:1961
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline             skifter til offline tilstand"
 
-#: src/main.c:1961
+#: src/main.c:1962
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q      afslut Claus Mail"
 
-#: src/main.c:1962
+#: src/main.c:1963
 msgid "  --debug                debug mode"
 msgstr "  --debug               fejlsøgningstilstand"
 
-#: src/main.c:1963
+#: src/main.c:1964
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug        slå fejlsøgningstilstand til/fra"
 
-#: src/main.c:1964
+#: src/main.c:1965
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h             vis hjælp og afslut"
 
-#: src/main.c:1965
+#: src/main.c:1966
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v          vis versionsinformation og afslut"
 
-#: src/main.c:1966
+#: src/main.c:1967
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6792,11 +6792,11 @@ msgstr ""
 "  --version-full -V      vis information om version og indbyggede funktioner "
 "og afslut"
 
-#: src/main.c:1967
+#: src/main.c:1968
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir          vis konfigurationsmappen"
 
-#: src/main.c:1968
+#: src/main.c:1969
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6804,7 +6804,7 @@ msgstr ""
 "  --alternate-config-dir [mappe]\n"
 "                         brug anførte konfigurationsmappe"
 
-#: src/main.c:1970
+#: src/main.c:1971
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6812,32 +6812,32 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         sæt geometrien for hovedvinduet"
 
-#: src/main.c:2023
+#: src/main.c:2024
 msgid "Unknown option\n"
 msgstr "Ukendt valgmulighed\n"
 
-#: src/main.c:2041
+#: src/main.c:2042
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Behandler (%s)..."
 
-#: src/main.c:2044
+#: src/main.c:2045
 msgid "top level folder"
 msgstr "topniveaumappe"
 
-#: src/main.c:2127
+#: src/main.c:2128
 msgid "Queued messages"
 msgstr "Meddelelser i kø"
 
-#: src/main.c:2128
+#: src/main.c:2129
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nogle usendte meddelelser er sat i kø. Vil du afslutte nu?"
 
-#: src/main.c:2870
+#: src/main.c:2871
 msgid "NetworkManager: network is online.\n"
 msgstr "Netværkshåndtering: netværk online.\n"
 
-#: src/main.c:2876
+#: src/main.c:2877
 msgid "NetworkManager: network is offline.\n"
 msgstr "Netværkshåndtering: netværk offline.\n"
 
@@ -7833,7 +7833,7 @@ msgstr "Overskriv mbox-fil"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Denne fil eksisterer allerede. Skal den overskrives?"
 
-#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Overskriv"
@@ -7883,7 +7883,7 @@ msgstr "Søgning afsluttet"
 msgid "Compose _new message"
 msgstr "Skriv _ny meddelelse"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
+#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Meddelelsesoversigt"
 
@@ -7922,67 +7922,67 @@ msgstr ""
 "officielt adresseret til dig.\n"
 "Det anbefales ikke at sende returkvittering."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Henter meddelelse (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1008
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Kunne ikke dekryptere: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1493 src/messageview.c:1501
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Meddelelse stemmer ikke overens med MIME standard. Den gengives måske "
 "forkert."
 
-#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
+#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Gem som"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Skal eksisterende fil overskrives?"
 
-#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kunne ikke gemme filen '%s'."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Vis alle %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Kun den første megabyte tekst vises"
 
-#: src/messageview.c:1947
+#: src/messageview.c:1950
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr ""
 "Der kom en returkvittering for denne meddelelse: Den blev set af modtageren."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Du anmodede om returkvittering i denne meddelelse."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Denne meddelelse anmoder om returnkvittering."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Send kvittering"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7990,7 +7990,7 @@ msgstr ""
 "Denne meddelelse blev kun delvist hentet,\n"
 "og blev slettet på serveren."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7999,15 +7999,15 @@ msgstr ""
 "Denne meddelelse blev kun delvist hentet;\n"
 "det drejer sig om %s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Markér for hentning"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Markér for sletning"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8016,12 +8016,12 @@ msgstr ""
 "Denne meddelelse blev kun delvist hentet;\n"
 "det drejer sig om %s og vil blive helt hentet."
 
-#: src/messageview.c:2021 src/messageview.c:2034
+#: src/messageview.c:2024 src/messageview.c:2037
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Fjern markering"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8030,11 +8030,11 @@ msgstr ""
 "Denne meddelelse blev kun delvist hentet;\n"
 "det drejer sig om %s og vil blive slettet."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Besked om returkvittering"
 
-#: src/messageview.c:2101
+#: src/messageview.c:2104
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8045,19 +8045,19 @@ msgstr ""
 "sendt til.\n"
 "Vælg konto for hvilken der skal sendes besked om modtagelse:"
 
-#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Annullér"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Send besked"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan ikke udskrive: meddelelsen indeholder ikke tekst."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8065,7 +8065,7 @@ msgstr ""
 "\n"
 "  Der er ingen meddelelser i denne mappe"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8073,7 +8073,7 @@ msgstr ""
 "\n"
 "  Meddelelse blev slettet"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8081,7 +8081,7 @@ msgstr ""
 "\n"
 "  Meddelelsen blev slettet eller flyttet til en anden mappe"
 
-#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
+#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Der opstod en fejl under læring.\n"
@@ -8312,34 +8312,34 @@ msgstr "Claws Mail behøver netadgang for at få adgang til nyhedsserver."
 msgid "couldn't select group: %s\n"
 msgstr " kunne ikke vælge gruppe: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1054 src/news.c:1224
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "kunne ikke sætte gruppe: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Ugyldig artikelinterval: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1133 src/news.c:1157 src/news.c:1181
 msgid "couldn't get xhdr\n"
 msgstr "kunne ikke hente xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "henter xover %d - %d i %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "kunne ikke hente xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "ugyldig xover-linje\n"
 
-#: src/news.c:1446
+#: src/news.c:1449
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8372,6 +8372,46 @@ msgstr "Aflys nyhedsgruppe"
 msgid "Rename newsgroup folder"
 msgstr "Omdøb nyhedsgruppemappe"
 
+#: src/password.c:128 src/password.c:129
+msgid "Input master passphrase"
+msgstr "Indtast masterløsen"
+
+#: src/password.c:141
+msgid "Incorrect master passphrase."
+msgstr "Ukorrekt masterløsen."
+
+#: src/password_gtk.c:67
+msgid "New passphrases do not match, try again."
+msgstr "Ingen match for nye løsener, prøv igen."
+
+#: src/password_gtk.c:80
+msgid "Incorrect old master passphrase entered, try again."
+msgstr "Ukorrekt gammelt masterløsen indtastet, prøv igen."
+
+#: src/password_gtk.c:144
+msgid "Changing master passphrase"
+msgstr "Skifter masterløsen"
+
+#: src/password_gtk.c:165
+msgid ""
+"If a master passphrase is currently active, it\n"
+"needs to be entered."
+msgstr ""
+"Hvis et masterløsen i øjeblikket er aktivt,\n"
+"skal det indtastet."
+
+#: src/password_gtk.c:175
+msgid "Old passphrase:"
+msgstr "Gammelt løsen:"
+
+#: src/password_gtk.c:191
+msgid "New passphrase:"
+msgstr "Nyt løsen:"
+
+#: src/password_gtk.c:202
+msgid "Confirm passphrase:"
+msgstr "Bekræft løsenet:"
+
 #: src/plugins/acpi_notifier/acpi_notifier.c:51
 msgid "Acpi Notifier"
 msgstr "Acpi informatør"
@@ -9246,7 +9286,7 @@ msgstr "Meddelelser, 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:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "KB"
 
@@ -9808,7 +9848,7 @@ msgstr "CSS i denne fil bliver anvendt af alle dele af HTML"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1442 src/prefs_account.c:1531 src/prefs_account.c:2002
+#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Gen_nemse"
@@ -10113,7 +10153,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:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Godkendelse"
 
@@ -10292,7 +10332,7 @@ msgstr "Genbrug ikoner på disk i stedet for at udstede en ny netværksanmodning
 msgid "Cache refresh interval"
 msgstr "Genopfriskningsinterval for mellemlager"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1487
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1490
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr "timer"
@@ -10437,56 +10477,56 @@ msgstr ""
 "Alle mapper og meddelelser under '%s' slettes.\n"
 "Skal de virkelig slettes?"
 
-#: src/plugins/managesieve/managesieve.c:440
+#: src/plugins/managesieve/managesieve.c:435
 msgid "No Sieve auth method available\n"
 msgstr "Sieve metode til godkendelse er ikke tilgængelig\n"
 
-#: src/plugins/managesieve/managesieve.c:444
+#: src/plugins/managesieve/managesieve.c:439
 msgid "Selected Sieve auth method not available\n"
 msgstr "Den valgte Sieve metode til godkendelse er ikke tilgængelig\n"
 
-#: src/plugins/managesieve/managesieve.c:677
+#: src/plugins/managesieve/managesieve.c:672
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: src/plugins/managesieve/managesieve.c:681
+#: src/plugins/managesieve/managesieve.c:676
 #, c-format
 msgid "Disconnected: %s"
 msgstr "Frakoblet: %s"
 
-#: src/plugins/managesieve/managesieve.c:729
-#: src/plugins/managesieve/managesieve.c:874
+#: src/plugins/managesieve/managesieve.c:724
+#: src/plugins/managesieve/managesieve.c:869
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "Uhåndteret meddelelse i Sieve session: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:736
+#: src/plugins/managesieve/managesieve.c:731
 msgid "TLS failed"
 msgstr "TLS mislykkedes"
 
-#: src/plugins/managesieve/managesieve.c:801
-#: src/plugins/managesieve/managesieve.c:817
-#: src/plugins/managesieve/managesieve.c:844
-#: src/plugins/managesieve/managesieve.c:926
-#: src/plugins/managesieve/managesieve.c:944
+#: src/plugins/managesieve/managesieve.c:796
+#: src/plugins/managesieve/managesieve.c:812
+#: src/plugins/managesieve/managesieve.c:839
+#: src/plugins/managesieve/managesieve.c:921
+#: src/plugins/managesieve/managesieve.c:939
 msgid "error occurred on SIEVE session\n"
 msgstr "Der opstod en fejl i SIEVE sessionen\n"
 
-#: src/plugins/managesieve/managesieve.c:870
+#: src/plugins/managesieve/managesieve.c:865
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "Der opstod en fejl i SIEVE sessionen. data: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:879
+#: src/plugins/managesieve/managesieve.c:874
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "Uhåndteret meddelelse i Sieve session: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1136
+#: src/plugins/managesieve/managesieve.c:1131
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: prøver godkendelse igen\n"
 
-#: src/plugins/managesieve/managesieve.c:1138
+#: src/plugins/managesieve/managesieve.c:1133
 msgid "Auth method not available"
 msgstr "Godkendelsesmetode er ikke tilgængelig"
 
@@ -10674,7 +10714,7 @@ msgstr "Angiv godkendelse"
 #: src/plugins/managesieve/sieve_prefs.c:240
 #: src/plugins/vcalendar/vcal_prefs.c:348
 #: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
-#: src/prefs_account.c:1795
+#: src/prefs_account.c:1798
 msgid "User ID"
 msgstr "Bruger-ID"
 
@@ -10682,18 +10722,18 @@ msgstr "Bruger-ID"
 #: src/plugins/rssyl/rssyl_feed_props.c:395
 #: src/plugins/vcalendar/vcal_prefs.c:356
 #: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
-#: src/prefs_account.c:1815 src/prefs_account.c:2529 src/prefs_account.c:2551
+#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
 #: src/wizard.c:1215 src/wizard.c:1635
 msgid "Password"
 msgstr "Adgangskode"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1570
-#: src/prefs_account.c:1767
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
+#: src/prefs_account.c:1770
 msgid "Authentication method"
 msgstr "Godkendelsesmetode"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1580
-#: src/prefs_account.c:1776 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
+#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -11622,7 +11662,7 @@ 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:163 src/plugins/rssyl/rssyl_feed_props.c:476
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
 msgstr "minutter"
@@ -12244,8 +12284,8 @@ msgstr "Vis Python konsol..."
 msgid "Refresh"
 msgstr "Genopfrisk"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2518
-#: src/prefs_account.c:2540 src/prefs_account.c:2809 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
+#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Gennemse"
@@ -12573,7 +12613,7 @@ msgstr "Hent kommentarer om post yngre end"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1480 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
 msgid "days"
 msgstr "dage"
 
@@ -13193,7 +13233,7 @@ msgid "Next month"
 msgstr "Næste måned"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:735
+#: src/plugins/vcalendar/vcal_prefs.c:729
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13623,15 +13663,15 @@ msgstr "Denne uge"
 msgid "Later"
 msgstr "Senere"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Accepteret: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Afslået: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Foreløbig afslået: "
 
@@ -14079,12 +14119,12 @@ msgstr "Der opstod fejl i en POP3 session\n"
 msgid "TOP command unsupported\n"
 msgstr "Kommandoen TOP er ikke støttet\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1451 src/prefs_account.c:2446
+#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
 #: src/wizard.c:1499
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1564 src/prefs_account.c:2461
+#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14173,40 +14213,40 @@ msgstr "kommando for afsendelse af post"
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Lokal"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Standardindbakke"
 
-#: src/prefs_account.c:1438 src/prefs_account.c:1445 src/prefs_account.c:1527
-#: src/prefs_account.c:1534
+#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
+#: src/prefs_account.c:1537
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ufiltrerede meddelelser bliver gemt i denne mnappe"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Brug sikker godkendelse (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Fjern meddelelser på serveren ved modtagelse"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Fjern efter"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1484
+#: src/prefs_account.c:1477 src/prefs_account.c:1487
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dage og 0 timer : fjern med det samme"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Størrelsesbegrænsning ved modtagelse"
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1503
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14214,82 +14254,82 @@ msgstr ""
 "Meddelelser 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:1540 src/prefs_account.c:2476
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr "Det maksimale antal artikler, der kan hentes"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "Ubegrænset, hvis 0 er angivet"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Flad tekst"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "IMAP server-mappe"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(normalt tomt)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Vis kun abonnerede mapper"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Båndbredde-effektiv tilstand (forhindrer, at fjerne mærker hentes))"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 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 "
 "servere."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Filtrér meddelelser ved modtagelse"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Tillad filtrering ved modtagelse ved brug af udvidelsesmoduler"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Hent Post' tjekker for nye meddelelser til denne konto"
 
-#: src/prefs_account.c:1722 src/prefs_customheader.c:208
+#: src/prefs_account.c:1725 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Posthoved"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Generér Meddelelses-ID"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Send kontoens postadresse i Meddelelses-ID"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Tilføj posthoved med brugeragent"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Tilføj brugerdefineret posthoved"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP godkendelse (SMTP AUTH)"
 
-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1840
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14297,175 +14337,175 @@ msgstr ""
 "Hvis man lader disse felter være tomme, bruges den samme bruger-ID og "
 "adgangskode som ved modtagelse."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Godkend med POP3 før afsendelse"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Tidsudløb for POP godkendelse: "
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Indsæt signatur automatisk"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Signaturskilletegn"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Kommando-output"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Indsæt automatisk følgende adresser"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Ordbøger for stavekontrol"
 
-#: src/prefs_account.c:2076 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Standardordbog"
 
-#: src/prefs_account.c:2089 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Alternativ standardordbog"
 
-#: src/prefs_account.c:2175 src/prefs_account.c:3328
+#: src/prefs_account.c:2181 src/prefs_account.c:3341
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Skriv e-mail"
 
-#: src/prefs_account.c:2190 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/prefs_account.c:2205 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Standard databeskyttelsessystem"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Signér altid meddelelser"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Kryptér altid meddelelser"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Signér altid meddelelser som svar på en signeret meddelelse"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Kryptér altid meddelelser som svar på en krypteret meddelelse"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Kryptér afsendte meddelelser med egen nøgle i tillæg til modtagerens"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Gem afsendte krypterede meddelelser i klar tekst"
 
-#: src/prefs_account.c:2450 src/prefs_account.c:2465 src/prefs_account.c:2479
+#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
 msgid "Don't use SSL"
 msgstr "Brug ikke SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Brug SSL ved POP3 forbindelser"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2502
+#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Brug STARTTLS kommando for at starte en SSL session"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Brug SSL ved IMAP4 forbindelser"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Brug SSL ved NNTP forbindelser"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Send (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Brug ikke SSL (men brug STARTTLS om nødvendigt)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Brug SSL ved SMTP forbindelser"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Klientcertifikater"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Certifikat for modtagelse"
 
-#: src/prefs_account.c:2520 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2544
+#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
+#: src/prefs_account.c:2550
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Klientcertifikatfil som en PKCS12 eller PEM fil"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Certifikat for afsendelse"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Acceptér automatisk gyldige SSL-certifikater"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Brug ikke-blokerende SSL"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Slå denne funktion fra, hvis der er problemer med SSL forbindelsen"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "POP3 port"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Domænenavn"
 
-#: src/prefs_account.c:2743
+#: src/prefs_account.c:2756
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14473,112 +14513,112 @@ msgstr ""
 "Domænenavnet bruges i den genererede meddelelses-ID, og når man forbinder "
 "til SMTP-servere."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Brug kommando til at kommunikere med serveren"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markér krydssendte meddelelser som læst og med farve:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Læg sendte meddelelser i"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Læg kømeddelelser i"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Læg udkastmeddelelser i"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Læg slettede meddelelser i"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Kontonavn er ikke angivet."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Postadresse er ikke angivet."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "SMTP-server er ikke angivet."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Bruger-ID er ikke angivet."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "POP3 server er ikke angivet."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Standard-indbakkemappe findes ikke."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server er ikke angivet."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "NNTP server er ikke angivet."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "Filnavn for lokal postkasse er ikke angivet."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "Postkommando er ikke angivet."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Modtag"
 
-#: src/prefs_account.c:3346 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Skabeloner"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Databeskyttelse"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Indstillinger for ny konto"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoindstillinger"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Mislykket (forkert adresse)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Vælg signaturfil"
 
-#: src/prefs_account.c:4019 src/prefs_account.c:4036 src/wizard.c:1066
+#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Vælg certifikatfil"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (udvidelsesmodul ikke indlæst)"
@@ -14838,15 +14878,15 @@ msgstr "Aktuelle handlinger"
 msgid "Action string is not valid."
 msgstr "Handlingsstrengen er ugyldig."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Mojn,\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "På %d\\n%f skrev:\\n%q\\n%X"
 
-#: src/prefs_common.c:306 src/prefs_quote.c:85
+#: src/prefs_common.c:307 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -14854,7 +14894,7 @@ msgstr ""
 "\\n\\nBegynd videresendt meddelelse:\\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:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -16203,6 +16243,31 @@ msgstr "Opfat disse tegn som anførselstegn:"
 msgid "Text Options"
 msgstr "Tekstvalg"
 
+#: src/prefs_migration.c:95
+#, c-format
+msgid ""
+"Your Claws Mail configuration is from a newer version than the version which "
+"you are currently using.\n"
+"\n"
+"This is not recommended.\n"
+"\n"
+"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 "
+"bruger i øjeblikket.\n"
+"\n"
+"Dette kan ikke anbefales.\n"
+"\n"
+"For yderligere oplysninger se %snetsiderne for Claws Mail%s.\n"
+"\n"
+"Vil du afslutte nu?"
+
+#: src/prefs_migration.c:104
+msgid "Configuration warning"
+msgstr "Konfigurationsadvarsel"
+
 #: src/prefs_msg_colors.c:147
 msgid "Message view"
 msgstr "Meddelelsesvisning"
@@ -19101,59 +19166,6 @@ msgstr ""
 "Claws Mail er nu klart til brug.\n"
 "Klik Gem for at begynde."
 
-#~ msgid "Input master passphrase"
-#~ msgstr "Indtast masterløsen"
-
-#~ msgid "Incorrect master passphrase."
-#~ msgstr "Ukorrekt masterløsen."
-
-#~ msgid "New passphrases do not match, try again."
-#~ msgstr "Ingen match for nye løsener, prøv igen."
-
-#~ msgid "Incorrect old master passphrase entered, try again."
-#~ msgstr "Ukorrekt gammelt masterløsen indtastet, prøv igen."
-
-#~ msgid "Changing master passphrase"
-#~ 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"
-#~ "skal det indtastet."
-
-#~ msgid "Old passphrase:"
-#~ msgstr "Gammelt løsen:"
-
-#~ msgid "New passphrase:"
-#~ msgstr "Nyt løsen:"
-
-#~ msgid "Confirm passphrase:"
-#~ msgstr "Bekræft løsenet:"
-
-#~ msgid ""
-#~ "Your Claws Mail configuration is from a newer version than the version "
-#~ "which you are currently using.\n"
-#~ "\n"
-#~ "This is not recommended.\n"
-#~ "\n"
-#~ "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 bruger i øjeblikket.\n"
-#~ "\n"
-#~ "Dette kan ikke anbefales.\n"
-#~ "\n"
-#~ "For yderligere oplysninger se %snetsiderne for Claws Mail%s.\n"
-#~ "\n"
-#~ "Vil du afslutte nu?"
-
-#~ msgid "Configuration warning"
-#~ msgstr "Konfigurationsadvarsel"
-
 #~ msgid "_Other folder..."
 #~ msgstr "_Anden mappe..."
 
diff --git a/po/de.po b/po/de.po
index 8e1dfd2..13b1fcb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-07 08:48+0100\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-07-13 06:45+0200\n"
 "Last-Translator: Thomas Bellmann <ThomasBellmann at gmx.net>\n"
 "Language-Team: Deutsch <>\n"
@@ -95,7 +95,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Abrufen' holt Nachrichten von den gewählten Konten ab"
 
 #: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1264
+#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -108,7 +108,7 @@ msgstr "'Abrufen' holt Nachrichten von den gewählten Konten ab"
 msgid "Name"
 msgstr "Name"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4128
+#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -825,8 +825,8 @@ msgstr "Adressbuch"
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:343
-#: src/folderview.c:431 src/prefs_account.c:2786 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
+#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Ordner"
 
@@ -967,18 +967,18 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Fehler bei Aktualisierung. Änderungen nicht ins Verzeichnis geschrieben."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Anmerkung"
 
-#: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
-#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
+#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5632 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Fehler"
@@ -1011,43 +1011,43 @@ msgstr "LDAP Name"
 msgid "Attribute Value"
 msgstr "Zusatzangabe"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Nichts"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "ein Betrachter"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "ein MIME-Parser"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "Ordner"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "Filter"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "ein Datenschutzinterface"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "ein Melder"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "ein Werkzeug"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "Dinge"
 
-#: src/common/plugin.c:332
+#: src/common/plugin.c:334
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1055,25 +1055,25 @@ msgstr ""
 "Dieses Plugin stellt %s (%s) zur Verfügung, was schon vom Plugin %s "
 "bereitgestellt wird."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Plugin ist bereits geladen"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Fehler bei Speicherzuweisung für das Plugin"
 
-#: src/common/plugin.c:480
+#: src/common/plugin.c:482
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Diese Modul ist nicht unter GPL v3 oder einer kompatiblen Folgelizenz "
 "zugelassen."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Dies ist ein Plugin für Claws Mail GTK1."
 
-#: src/common/plugin.c:771
+#: src/common/plugin.c:769
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1082,7 +1082,7 @@ msgstr ""
 "Ihr Claws Mail ist neuer als die Version, mit der das Plugin '%s' kompiliert "
 "wurde."
 
-#: src/common/plugin.c:774
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1090,12 +1090,12 @@ msgstr ""
 "Ihr Claws Mail ist neuer als die Version, mit der das Plugin kompiliert "
 "wurde."
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:781
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin '%s'."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Ihre Claws Mail-Version ist zu alt für das Plugin."
 
@@ -1265,212 +1265,212 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Montag"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Freitag"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Januar"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Februar"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "März"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "April"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juni"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juli"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Oktober"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Dezember"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "So"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Mo"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Di"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mi"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Do"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Fr"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sa"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mrz"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dez"
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
@@ -1484,7 +1484,7 @@ msgstr "_Hinzufügen..."
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Eigenschaften..."
 
@@ -1927,7 +1927,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: src/compose.c:3628 src/compose.c:10529 src/compose.c:11390
+#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
 msgid "_Insert"
 msgstr "Einfügen"
 
@@ -1982,7 +1982,7 @@ msgstr ""
 "Bitte wählen Sie einen E-Mail-Konto vor dem Senden."
 
 #: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
-#: src/prefs_account.c:3310 src/toolbar.c:406 src/toolbar.c:424
+#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Senden"
 
@@ -1990,8 +1990,8 @@ msgstr "Senden"
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard-Cc-Adresse. Trotzdem senden?"
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5633
-#: src/folderview.c:2445 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
+#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Senden"
@@ -2025,7 +2025,7 @@ msgstr "Trotzdem vorspeichern?"
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:5169 src/compose.c:9993
+#: src/compose.c:5169 src/compose.c:9999
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2035,7 +2035,7 @@ msgstr ""
 "\n"
 "Zeichensatz-Konvertierung schlug fehl."
 
-#: src/compose.c:5172 src/compose.c:9996
+#: src/compose.c:5172 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2045,7 +2045,7 @@ msgstr ""
 "\n"
 "Schlüssel des Empfängers nicht erhältlich."
 
-#: src/compose.c:5178 src/compose.c:9990
+#: src/compose.c:5178 src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2090,7 +2090,7 @@ msgstr ""
 "Benutzen Sie \"Vorgespeicherte Nachrichten senden\" vom Hauptfenster zum "
 "Wiederholen."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2101,7 +2101,7 @@ msgstr ""
 "spezifizierten Zeichensatz %s konvertiert werden.\n"
 "Als %s senden?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2114,73 +2114,73 @@ msgstr ""
 "\n"
 "Trotzdem senden?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "E-Mail konnte nicht verschlüsselt werden: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Verschlüsselungshinweis"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "F_ortfahren"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Kein Konto zum Versenden von E-Mails vorhanden!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Gewähltes Konto ist nicht NNTP: Absenden schlug fehl."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Der Anhang %s existiert nicht mehr. Ignorieren?"
 
-#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Senden abbrechen"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Anhang ignorieren"
 
 # Maybe not completely correct translated but I could not get the context...
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Originaler %s-Teil"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Zum Adress_buch hinzufügen"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Inhalt des Eintrags löschen"
 
-#: src/compose.c:6997 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Mit <tab> automatisch aus dem Adressbuch vervollständigen"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 
-#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2191,23 +2191,23 @@ msgstr "Nachricht speichern unter "
 msgid "_Browse"
 msgstr "_Durchsuchen"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "_Kopfzeile"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Anhänge"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "_Weiteres"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "B_etreff:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2216,19 +2216,19 @@ msgstr ""
 "Rechtschreibprüfung konnte nicht gestartet werden.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "V_on:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Für diese E-Mail zu verwendendes Konto"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Zu benutzende Absenderadresse"
 
-#: src/compose.c:8373
+#: src/compose.c:8379
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2237,68 +2237,68 @@ msgstr ""
 "Das Datenschutzsystem '%s' kann nicht geladen werden. Es wird nicht möglich "
 "sein, diese Nachricht zu signieren oder zu verschlüsseln."
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Keines"
 
-#: src/compose.c:8575 src/prefs_template.c:760
+#: src/compose.c:8581 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Der Text der Vorlage hat einen Fehler in Zeile %d."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Formatierungsfehler in Von-Vorlage."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Formatierungsfehler in An-Vorlage."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Formatierungsfehler in Cc-Vorlage."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Formatierungsfehler in Bcc-Vorlage."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Formatierungsfehler in Reply-to-Vorlage."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Formatierungsfehler in Betreff-Vorlage."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME-Typ."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2309,15 +2309,15 @@ msgstr ""
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 
-#: src/compose.c:9959 src/messageview.c:1096
+#: src/compose.c:9965 src/messageview.c:1096
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail benötigt Zugang zum Netz, um diese E-Mail zu senden."
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht vorgespeichert werden."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2327,15 +2327,15 @@ msgstr ""
 "Nachricht konnte nicht vorgespeichert werden\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Entwurf konnte nicht gespeichert werden"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2343,24 +2343,24 @@ msgstr ""
 "Entwurf konnte nicht gespeichert werden.\n"
 "Möchten Sie das Beenden zurücknehmen oder die Nachricht verwerfen?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "Beenden _zurücknehmen"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Nachricht verwerfen"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Datei auswählen"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2369,54 +2369,54 @@ msgstr ""
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
-#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 
-#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Diese Nachricht wurde geändert. Die letzten Änderungen speichern?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Nicht Speichern"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Möchten Sie die Vorlage '%s' anwenden?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
-#: src/compose.c:10529 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10535 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "Ersetzen"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Einfügen oder Anhängen?"
 
-#: src/compose.c:11388
+#: src/compose.c:11400
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2424,16 +2424,16 @@ msgstr ""
 "Wollen Sie den Inhalt der Datei in den Nachrichtenkörper einfügen oder an "
 "die Nachricht anhängen?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Anhang"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Zitat-Formatierungsfehler in Zeile %d."
 
-#: src/compose.c:11902
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2653,7 +2653,7 @@ msgid " Check File "
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1970
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Datei"
@@ -2802,7 +2802,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3383
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
@@ -2987,7 +2987,7 @@ msgstr ""
 "Die maximale Zahl von Einträgen, die im Suchresultat ausgegeben werden "
 "sollen."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Allgemein"
 
@@ -3712,61 +3712,61 @@ msgstr "Der Ordner '%s' existiert bereits."
 msgid "Can't create the folder '%s'."
 msgstr "Ordner '%s' konnte nicht erstellt werden."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Alle _gelesen markieren"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Rekursiv alle als gelesen marki_eren"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "Verarbeit_ungsregel anwenden"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Ordner durchsuchen..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "_Verarbeitungsregeln..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "_Papierkorb leeren"
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "_Postausgang senden..."
 
-#: src/folderview.c:385 src/folderview.c:432
+#: src/folderview.c:389 src/folderview.c:436
 #: src/plugins/notification/notification_lcdproc.c:141
 #: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
 msgid "New"
 msgstr "Neu"
 
-#: src/folderview.c:386 src/folderview.c:433
+#: src/folderview.c:390 src/folderview.c:437
 #: src/plugins/notification/notification_lcdproc.c:145
 #: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:387 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:391 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Gesamt"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:435 src/summaryview.c:445
+#: src/folderview.c:439 src/summaryview.c:445
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:765
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr "Ordnerdaten werden erstellt..."
 
-#: src/folderview.c:837
+#: src/folderview.c:845
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3774,100 +3774,100 @@ msgstr ""
 "Möchten Sie wirklich alle Mails in diesem Ordner und seinen Unterordnern als "
 "gelesen markieren?"
 
-#: src/folderview.c:839 src/summaryview.c:4115
+#: src/folderview.c:847 src/summaryview.c:4115
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Möchten Sie wirklich alle Mails in diesem Ordner als gelesen markieren?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Ordner %s%s wird durchsucht..."
 
-#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1030 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Ordner %s wird durchsucht..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Ordnerbaum erneuern"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Erneuern des Ordnerbaumes löscht den lokalen Pufferspeicher. Möchten Sie "
 "fortfahren?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Ordnerbaum wird erneuert..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Ordnerbaum wird durchsucht..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Ordner %s konnte nicht durchsucht werden\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ordner werden auf neue Nachrichten geprüft..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Schließe Ordner %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öffne Ordner %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht geöffnet werden."
 
-#: src/folderview.c:2386 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Alle Nachrichten im Papierkorb löschen?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "Papierkorb _leeren"
 
-#: src/folderview.c:2431 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Offline-Warnung"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem fortfahren?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Vorgespeicherte Nachrichten senden"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Alle vorgespeicherten Nachrichten senden?"
 
-#: src/folderview.c:2453 src/toolbar.c:2647
+#: src/folderview.c:2466 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler beim Senden vorgespeicherter Nachrichten."
 
-#: src/folderview.c:2456 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2469 src/main.c:2743 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3876,66 +3876,66 @@ msgstr ""
 "Fehler beim Senden vorgespeicherter Nachrichten:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Soll der Ordner '%s' in '%s' kopiert werden?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Soll der Ordner '%s' wirklich ein Unterordner von '%s' werden?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Kopiere Ordner"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiere %s nach %s..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s wird nach %s verschoben..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Quelle und Ziel sind identisch."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Ein Ordner ist nicht in untergeordnete Ordner kopierbar."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben "
 "werden."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Ordner können nicht zwischen verschiedenen Mailboxen verschoben werden"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Kopieren schlug fehl!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Verschieben schlug fehl!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Konfiguration Verarbeitung für Ordner %s"
 
-#: src/folderview.c:3068 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Der Zielordner kann nur Unterordner aufnehmen."
 
@@ -4279,63 +4279,63 @@ msgstr "_Versionsbeschreibung"
 msgid "_Statistics"
 msgstr "_Statistik"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Orange"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rot"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Himmelblau"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Blau"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Grün"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Braun"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Grau"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Hellbraun"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Dunkelrot"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Dunkelrosa"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Stahlblau"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Gold"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Hellgrün"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5076,7 +5076,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:734 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:728 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -5119,9 +5119,9 @@ msgid "_Hide"
 msgstr "_Ausblenden"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3273 src/prefs_account.c:3291 src/prefs_account.c:3309
-#: src/prefs_account.c:3327 src/prefs_account.c:3345 src/prefs_account.c:3363
-#: src/prefs_account.c:3382 src/prefs_account.c:3475
+#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
+#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
+#: src/prefs_account.c:3395 src/prefs_account.c:3488
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5830,8 +5830,8 @@ msgstr "Verbindung zu %s schlug fehl"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 
-#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
-#: src/imap.c:4622 src/imap.c:5433
+#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
+#: src/imap.c:4620 src/imap.c:5431
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail benötigt eine Netzwerkverbindung, um auf den IMAP-Server "
@@ -5874,85 +5874,85 @@ msgstr "Keine Verbindung zum IMAP4-Server: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung zum IMAP4-Server: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4112
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr "TLS-Sitzung konnte nicht gestartet werden.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Einloggen am IMAP-Server %s schlug fehl.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Einloggen am IMAP-Server %s schlug fehl."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Merker nicht setzbar\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "Löschen schlug fehl\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Suche nach nicht abonnierten Ordnern in %s..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Suche nach Unterordnern von %s..."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Mailbox kann nicht erstellt werden: LIST schlug fehl\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "Mailbox kann nicht erstellt werden\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s kann nicht in %s umbenannt werden\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "Mailbox kann nicht gelöscht werden\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST schlug fehl\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Nachrichten-Merker setzen..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s kann nicht ausgewählt werden\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Server erfordert TLS zum Einloggen.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Ressourcen können nicht aktualisiert werden.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5961,20 +5961,20 @@ msgstr ""
 "Verbindung zu %s schlug fehl: Server erfordert TLS, aber Claws Mail wurde "
 "ohne TLS-Unterstützung kompiliert.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Serverlogins sind deaktiviert.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Gelöscht-Merker nicht setzbar: %d\n"
 
-#: src/imap.c:6091
+#: src/imap.c:6089
 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"
@@ -7916,7 +7916,7 @@ msgstr "Mbox-Datei überschreiben "
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Die Datei existiert bereits. Soll sie überschrieben werden?"
 
-#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Überschreiben"
@@ -7966,7 +7966,7 @@ msgstr "Suche beendet"
 msgid "Compose _new message"
 msgstr "_Neue Nachricht verfassen"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
+#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Nachrichtenansicht"
 
@@ -8005,48 +8005,48 @@ msgstr ""
 "offiziell an Sie adressiert.\n"
 "Es wird empfohlen, keine  Empfangsbestätigung zu senden."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Nachricht (%s) wird abgeholt..."
 
-#: src/messageview.c:1409 src/procmime.c:1008
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsseln schlug fehl: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1493 src/messageview.c:1501
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Nachricht entspricht nicht dem MIME-Standard und könnte falsch dargestellt "
 "werden."
 
-#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
+#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Speichern als"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Existierende Datei überschreiben?"
 
-#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Alle %s anzeigen."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Nur das erste Megabyte an Text wird angezeigt."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1950
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8054,19 +8054,19 @@ msgstr ""
 "Sie haben eine Empfangsbestätigung für diese Nachricht: Der Empfänger hat "
 "sie geöffnet."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Sie haben eine Empfangsbestätigung für diese Nachricht erbeten."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Diese Nachricht erwartet eine Empfangsbestätigung."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Bestätigung senden"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8074,7 +8074,7 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen\n"
 "und auf dem Server gelöscht."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8083,15 +8083,15 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Zum Herunterladen markieren"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Zum Löschen markieren"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8100,12 +8100,12 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s groß und wird heruntergeladen."
 
-#: src/messageview.c:2021 src/messageview.c:2034
+#: src/messageview.c:2024 src/messageview.c:2037
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Demarkieren"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8114,11 +8114,11 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s und wird gelöscht werden."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 
-#: src/messageview.c:2101
+#: src/messageview.c:2104
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8130,19 +8130,19 @@ msgstr ""
 "Bitte wählen Sie, welches Konto Sie zum Senden der Empfangsbestätigung "
 "verwenden möchten:"
 
-#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "Benachrichtigung _senden"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Drucken schlug fehl: Die Nachricht enthält keinen Text."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8150,7 +8150,7 @@ msgstr ""
 "\n"
 "  Keine Nachrichten in diesem Ordner"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8158,7 +8158,7 @@ msgstr ""
 "\n"
 "  Nachricht wurde gelöscht"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8166,7 +8166,7 @@ msgstr ""
 "\n"
 "  Nachricht wurde in den Papierkorb oder einen anderen Ordner verschoben"
 
-#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
+#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Beim Lernen ist ein Fehler aufgetreten.\n"
@@ -8402,34 +8402,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "Gruppe %s konnte nicht gewählt werden\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1054 src/news.c:1224
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "Gruppe %s konnte nicht gesetzt werden\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ungültiger Artikelbereich: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1133 src/news.c:1157 src/news.c:1181
 msgid "couldn't get xhdr\n"
 msgstr "XHDR nicht abrufbar\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Newsübersicht wird geholt: %d - %d in %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "Newsübersicht nicht abrufbar\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "ungültige XOVER Zeile\n"
 
-#: src/news.c:1446
+#: src/news.c:1449
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -9399,7 +9399,7 @@ msgstr "Größere Nachrichten als diese werden nicht überprüft"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "KB"
 
@@ -9971,7 +9971,7 @@ msgstr "Das CSS in dieser Datei wird auf alle HTML-Elemente angewendet"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1442 src/prefs_account.c:1531 src/prefs_account.c:2002
+#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Durchsuchen"
@@ -10276,7 +10276,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-Plugin: Versuche, Autorisierung zu erneuern\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Authentifizierung"
 
@@ -10463,7 +10463,7 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Zeitintervall zum Aktualisieren des Caches"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1487
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1490
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr "Stunden"
@@ -10851,7 +10851,7 @@ msgstr "Authentifizierung spezifizieren"
 #: src/plugins/managesieve/sieve_prefs.c:240
 #: src/plugins/vcalendar/vcal_prefs.c:348
 #: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
-#: src/prefs_account.c:1795
+#: src/prefs_account.c:1798
 msgid "User ID"
 msgstr "Benutzer-ID"
 
@@ -10859,18 +10859,18 @@ msgstr "Benutzer-ID"
 #: src/plugins/rssyl/rssyl_feed_props.c:395
 #: src/plugins/vcalendar/vcal_prefs.c:356
 #: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
-#: src/prefs_account.c:1815 src/prefs_account.c:2529 src/prefs_account.c:2551
+#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
 #: src/wizard.c:1215 src/wizard.c:1635
 msgid "Password"
 msgstr "Kennwort"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1570
-#: src/prefs_account.c:1767
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
+#: src/prefs_account.c:1770
 msgid "Authentication method"
 msgstr "Authentifizierungsverfahren"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1580
-#: src/prefs_account.c:1776 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
+#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -11809,7 +11809,7 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Der Eintrag '0' speichert die Passphrase für die ganze Sitzung"
 
 #: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:476
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
 msgstr "Minuten"
@@ -12437,8 +12437,8 @@ msgstr "Python-Konsole öffnen..."
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2518
-#: src/prefs_account.c:2540 src/prefs_account.c:2809 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
+#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Durchsuchen"
@@ -12768,7 +12768,7 @@ msgstr "Kommentare holen von Nachrichten, die jünger sind als"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/prefs_account.c:1480 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
 msgid "days"
 msgstr "Tag(en)"
 
@@ -13400,7 +13400,7 @@ msgid "Next month"
 msgstr "Nächster Monat"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:735
+#: src/plugins/vcalendar/vcal_prefs.c:729
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13835,15 +13835,15 @@ msgstr "Diese Woche"
 msgid "Later"
 msgstr "Später"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Akzeptiert: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Abgelehnt: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Vorläufig akzeptierte: "
 
@@ -14298,12 +14298,12 @@ msgstr "Fehler bei der POP3-Sitzung\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-Befehl nicht unterstützt\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1451 src/prefs_account.c:2446
+#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
 #: src/wizard.c:1499
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1564 src/prefs_account.c:2461
+#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14392,40 +14392,40 @@ msgstr "Befehl für Mail-Versand"
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Lokal"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Standard-Eingangsordner"
 
-#: src/prefs_account.c:1438 src/prefs_account.c:1445 src/prefs_account.c:1527
-#: src/prefs_account.c:1534
+#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
+#: src/prefs_account.c:1537
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ungefilterte Nachrichten werden in diesem Ordner gespeichert"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Sichere Authentifizierung verwenden (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Nachrichten nach Empfang vom Server löschen"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Löschen nach"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1484
+#: src/prefs_account.c:1477 src/prefs_account.c:1487
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 Tage und 0 Stunden: Sofort löschen"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Größenbeschränkung beim Empfangen"
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1503
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14433,82 +14433,82 @@ msgstr ""
 "Nachrichten über diesem Limit werden teilweise abgerufen. Wenn Sie sie "
 "auswählen, können sie vollständig heruntergeladen oder gelöscht werden."
 
-#: src/prefs_account.c:1540 src/prefs_account.c:2476
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr "Höchstzahl herunterzuladender Artikel"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "unbegrenzt, wenn 0 angegeben"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Klartext"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "IMAP Serververzeichnis"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(gewöhnlich leer)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Nur abonnierte Ordner anzeigen"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreiteneffizienter Modus (lädt keine ferngelegenen Marken)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Dieser Modus nutzt weniger Bandbreite, kann aber bei manchen Servern "
 "langsamer sein."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Nachrichten bei Empfang filtern"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtern über Plugins bei Empfang möglich"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Abrufen' überprüft dieses Konto auf neue Nachrichten"
 
-#: src/prefs_account.c:1722 src/prefs_customheader.c:208
+#: src/prefs_account.c:1725 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Message-ID erzeugen"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Mailadresse des Kontos in Message-ID senden"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Kopfzeile für \"User Agent\" einfügen"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Benutzerdefinierte Kopfzeile einfügen"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Authentifizierung (SMTP AUTH)"
 
-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1840
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14516,178 +14516,178 @@ msgstr ""
 "Wenn diese Felder leer bleiben, werden die selbe User-ID und das selbe "
 "Kennwort wie beim Empfang verwendet."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Vor dem Senden mit POP3 authentifizieren"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Zeitlimit für POP-Authentifizierung:"
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Signatur automatisch einfügen"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Signatur-Trenner"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Befehlsausgabe"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Automatisch folgende Adressen eintragen"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Wörterbücher für Rechtschreibung"
 
-#: src/prefs_account.c:2076 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Standard-Wörterbuch"
 
-#: src/prefs_account.c:2089 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Alternatives Standard-Wörterbuch"
 
-#: src/prefs_account.c:2175 src/prefs_account.c:3328
+#: src/prefs_account.c:2181 src/prefs_account.c:3341
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/prefs_account.c:2190 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/prefs_account.c:2205 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Standard-Datenschutzssystem"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Nachrichten immer signieren"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Nachrichten immer verschlüsseln"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 "Nachrichten stets signieren, wenn eine signierte Nachricht beantwortet wird"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Nachrichten stets verschlüsseln, wenn eine verschlüsselte Nachricht "
 "beantwortet wird"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Nachrichten zusätzlich zum fremden mit eigenem Schlüssel verschlüsseln"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Verschlüsselt versandte Nachrichten im Klartext speichern"
 
-#: src/prefs_account.c:2450 src/prefs_account.c:2465 src/prefs_account.c:2479
+#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
 msgid "Don't use SSL"
 msgstr "Kein SSL verwenden"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung verwenden"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2502
+#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Mittels STARTTLS-Befehl eine SSL-Sitzung einleiten"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP-Verbindung verwenden"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung verwenden"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Kein SSL verwenden (aber nötigenfalls STARTTLS)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung verwenden"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Benutzerzertifikate"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Zertifikat zum Empfangen"
 
-#: src/prefs_account.c:2520 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2544
+#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
+#: src/prefs_account.c:2550
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Benutzerzertifikat als PKCS12 oder PEM-Datei"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Zertifikat zum Senden"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Gültige SSL-Zertifikate automatisch akzeptieren"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Nicht-blockierendes SSL verwenden"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Diese Option bei SSL-Verbindungsproblemen deaktivieren."
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP-Port"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "POP3-Port"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "IMAP-Port"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "NNTP-Port"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Domain-Name"
 
-#: src/prefs_account.c:2743
+#: src/prefs_account.c:2756
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14695,112 +14695,112 @@ msgstr ""
 "Der Domain-Name wird in der erzeugten Message-ID und beim Verbinden mit SMTP-"
 "Servern verwendet"
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Befehl zur Kommunikation mit dem Server verwenden"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Crosspostings als gelesen und farblich markieren:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten ablegen in"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Nachrichten vorspeichern in"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Entwürfe ablegen in"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten ablegen in"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Kein Kontoname eingetragen."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse eingetragen."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "Kein SMTP-Server angegeben."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID eingetragen."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "Kein POP3-Server eingetragen."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Der Standard-Eingangsordner existiert nicht."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "Kein IMAP4-Server angegeben."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "Kein NNTP-Server eingetragen."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "Name der lokalen Mailbox-Datei fehlt."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "Kein Mail-Befehl eingetragen."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account.c:3346 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Datenschutz"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Einstellungen für neues Konto"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoeinstellungen"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Fehlgeschlagen (falsche Adresse)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Signatur-Datei auswählen"
 
-#: src/prefs_account.c:4019 src/prefs_account.c:4036 src/wizard.c:1066
+#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Zertifikat auswählen"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (Plugin nicht geladen)"
@@ -15060,15 +15060,15 @@ msgstr "Aktuelle Aktionen"
 msgid "Action string is not valid."
 msgstr "Zeichenfolge der Aktion ist ungültig."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hallo,\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Am %d\\nschrieb %f:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:306 src/prefs_quote.c:85
+#: src/prefs_common.c:307 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15077,7 +15077,7 @@ msgstr ""
 "\\n}?t{An: %t\\n}?c{Cc: %c\\n}?n{Newsgruppen: %n\\n}?s{Betreff: %s\\n}\\n\\n"
 "%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index c7ce4af..fdd3b45 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.13.1\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-12-20 11:11+0000\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2008-09-28 08:00+0000\n"
 "Last-Translator: Paul Mangan <paul at claws-mail.org>\n"
 "Language-Team: Paul Mangan <paul at claws-mail.org>\n"
@@ -19,117 +19,117 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:392 src/account.c:459
+#: src/account.c:396 src/account.c:463
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
 msgstr ""
 
-#: src/account.c:437
+#: src/account.c:441
 msgid "Can't create folder."
 msgstr ""
 
-#: src/account.c:724
+#: src/account.c:728
 msgid "Edit accounts"
 msgstr ""
 
-#: src/account.c:741
+#: src/account.c:745
 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 ""
 
-#: src/account.c:812
+#: src/account.c:816
 msgid " _Set as default account "
 msgstr ""
 
-#: src/account.c:904
+#: src/account.c:908
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 
-#: src/account.c:911
+#: src/account.c:915
 #, c-format
 msgid "Copy of %s"
 msgstr ""
 
-#: src/account.c:1071
+#: src/account.c:1075
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr ""
 
-#: src/account.c:1073
+#: src/account.c:1077
 msgid "(Untitled)"
 msgstr ""
 
-#: src/account.c:1074
+#: src/account.c:1078
 msgid "Delete account"
 msgstr ""
 
-#: src/account.c:1554
+#: src/account.c:1562
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr ""
 
-#: src/account.c:1560
+#: src/account.c:1568
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 
-#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1265
-#: src/editaddress.c:1322 src/editaddress.c:1342
+#: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
+#: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:427
+#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
 #: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1807
-#: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
+#: src/plugins/pdf_viewer/poppler_viewer.c:1803
+#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
 msgstr ""
 
-#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
+#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr ""
 
-#: src/account.c:1583 src/ssl_manager.c:102
+#: src/account.c:1591 src/ssl_manager.c:100
 msgid "Server"
 msgstr ""
 
-#: src/action.c:383
+#: src/action.c:382
 #, c-format
 msgid "Could not get message file %d"
 msgstr ""
 
-#: src/action.c:420
+#: src/action.c:419
 msgid "Could not get message part."
 msgstr ""
 
-#: src/action.c:437
+#: src/action.c:436
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr ""
 
-#: src/action.c:609
+#: src/action.c:608
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 "because it contains %%f, %%F, %%as or %%p."
 msgstr ""
 
-#: src/action.c:721
+#: src/action.c:720
 msgid "There is no filtering action set"
 msgstr ""
 
-#: src/action.c:723
+#: src/action.c:722
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
 "%s"
 msgstr ""
 
-#: src/action.c:988
+#: src/action.c:987
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -137,34 +137,34 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
+#: src/action.c:989 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
-#: src/plugins/vcalendar/vcal_folder.c:1806
-#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1836
+#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
 msgid "Unknown error"
 msgstr ""
 
-#: src/action.c:1208 src/action.c:1373
+#: src/action.c:1207 src/action.c:1372
 msgid "Completed"
 msgstr ""
 
-#: src/action.c:1244
+#: src/action.c:1243
 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 
-#: src/action.c:1248
+#: src/action.c:1247
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 
-#: src/action.c:1281
+#: src/action.c:1280
 msgid "Action's input/output"
 msgstr ""
 
-#: src/action.c:1609
+#: src/action.c:1608
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -172,11 +172,11 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1614
+#: src/action.c:1613
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1618
+#: src/action.c:1617
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -184,7 +184,7 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1623
+#: src/action.c:1622
 msgid "Action's user argument"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr ""
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 
-#: src/addr_compl.c:689 src/addressbook.c:4947
+#: src/addr_compl.c:689 src/addressbook.c:4946
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr ""
@@ -332,7 +332,7 @@ msgid "Duplicate email addresses"
 msgstr ""
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:397 src/toolbar.c:434
+#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:434
 msgid "Address"
 msgstr ""
 
@@ -364,8 +364,8 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1057
-#: src/editaddress.c:1132 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1056
+#: src/editaddress.c:1131 src/editgroup.c:290
 msgid "Remarks"
 msgstr ""
 
@@ -373,16 +373,16 @@ msgstr ""
 msgid "Select Address Book Folder"
 msgstr ""
 
-#: src/addressadd.c:535 src/addressbook.c:3217 src/addressbook.c:3268
+#: src/addressadd.c:534 src/addressbook.c:3216 src/addressbook.c:3267
 msgid "Add address(es)"
 msgstr ""
 
-#: src/addressadd.c:536
+#: src/addressadd.c:535
 msgid "Can't add the specified address"
 msgstr ""
 
-#: src/addressbook.c:126 src/addressbook.c:4935 src/editaddress.c:1054
-#: src/editaddress.c:1115 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/addressbook.c:126 src/addressbook.c:4934 src/editaddress.c:1053
+#: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
 #: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
 msgid "Email Address"
 msgstr ""
@@ -392,18 +392,18 @@ msgid "_Book"
 msgstr ""
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
-#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:586 src/mainwindow.c:512
+#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr ""
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
-#: src/messageview.c:213
+#: src/addressbook.c:407 src/compose.c:591 src/mainwindow.c:515
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr ""
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
-#: src/messageview.c:214
+#: src/addressbook.c:408 src/compose.c:592 src/mainwindow.c:517
+#: src/messageview.c:213
 msgid "_Help"
 msgstr ""
 
@@ -435,20 +435,20 @@ msgstr ""
 msgid "_Delete book"
 msgstr ""
 
-#: src/addressbook.c:427 src/compose.c:604
+#: src/addressbook.c:427 src/compose.c:603
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:433
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Save"
 msgstr ""
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
+#: src/addressbook.c:428 src/compose.c:607 src/messageview.c:222
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr ""
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
 msgid "_Select all"
 msgstr ""
 
@@ -457,13 +457,13 @@ msgid "C_ut"
 msgstr ""
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
+#: src/compose.c:615 src/mainwindow.c:546 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr ""
 
 #: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:617 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:616 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr ""
 
@@ -507,8 +507,8 @@ msgstr ""
 msgid "Edit custom attributes..."
 msgstr ""
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
-#: src/messageview.c:339
+#: src/addressbook.c:458 src/compose.c:695 src/mainwindow.c:813
+#: src/messageview.c:338
 msgid "_About"
 msgstr ""
 
@@ -517,10 +517,10 @@ msgid "_Browse Entry"
 msgstr ""
 
 #: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:139
-#: src/plugins/pgpcore/sgpgme.c:167 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:683
-#: src/prefs_themes.c:715 src/prefs_themes.c:716
+#: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:143
+#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
+#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:682
+#: src/prefs_themes.c:714 src/prefs_themes.c:715
 msgid "Unknown"
 msgstr ""
 
@@ -624,12 +624,12 @@ msgstr ""
 msgid "Sources"
 msgstr ""
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr ""
 
-#: src/addressbook.c:1112 src/editldap.c:779
+#: src/addressbook.c:1112 src/editldap.c:780
 msgid "Search"
 msgstr ""
 
@@ -651,148 +651,152 @@ msgstr ""
 msgid "Cannot paste into an address group."
 msgstr ""
 
-#: src/addressbook.c:2914
+#: src/addressbook.c:2913
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr ""
 
-#: src/addressbook.c:2917 src/addressbook.c:2943 src/addressbook.c:2950
+#: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
 #: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
 #: src/toolbar.c:415
 msgid "Delete"
 msgstr ""
 
-#: src/addressbook.c:2926
+#: src/addressbook.c:2925
 #, c-format
 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 ""
 
-#: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
+#: src/addressbook.c:2928 src/imap_gtk.c:360 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1969
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Delete folder"
 msgstr ""
 
-#: src/addressbook.c:2930
+#: src/addressbook.c:2929
 msgid "Delete _folder only"
 msgstr ""
 
-#: src/addressbook.c:2930
+#: src/addressbook.c:2929
 msgid "Delete folder and _addresses"
 msgstr ""
 
-#: src/addressbook.c:2941
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2948
+#: src/addressbook.c:2947
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 
-#: src/addressbook.c:3062
+#: src/addressbook.c:3061
 #, c-format
 msgid "Search '%s'"
 msgstr ""
 
-#: src/addressbook.c:3200 src/addressbook.c:3249
+#: src/addressbook.c:3199 src/addressbook.c:3248
 msgid "New Contacts"
 msgstr ""
 
-#: src/addressbook.c:4088
+#: src/addressbook.c:4087
 msgid "New user, could not save index file."
 msgstr ""
 
-#: src/addressbook.c:4092
+#: src/addressbook.c:4091
 msgid "New user, could not save address book files."
 msgstr ""
 
-#: src/addressbook.c:4102
+#: src/addressbook.c:4101
 msgid "Old address book converted successfully."
 msgstr ""
 
-#: src/addressbook.c:4107
+#: src/addressbook.c:4106
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4120
+#: src/addressbook.c:4119
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:4126
+#: src/addressbook.c:4125
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4130
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:4138 src/addressbook.c:4144
+#: src/addressbook.c:4137 src/addressbook.c:4143
 msgid "Addressbook conversion error"
 msgstr ""
 
-#: src/addressbook.c:4258
+#: src/addressbook.c:4257
 msgid "Addressbook Error"
 msgstr ""
 
-#: src/addressbook.c:4259
+#: src/addressbook.c:4258
 msgid "Could not read address index"
 msgstr ""
 
-#: src/addressbook.c:4590
+#: src/addressbook.c:4589
 msgid "Busy searching..."
 msgstr ""
 
-#: src/addressbook.c:4899
+#: src/addressbook.c:4898 src/prefs_send.c:188
 msgid "Interface"
 msgstr ""
 
-#: src/addressbook.c:4911 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
-#: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
-msgid "Address Book"
+#: src/addressbook.c:4910
+msgid "Address Books"
 msgstr ""
 
-#: src/addressbook.c:4923
+#: src/addressbook.c:4922
 msgid "Person"
 msgstr ""
 
-#: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
+#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr ""
 
-#: src/addressbook.c:4971
+#: src/addressbook.c:4970
 msgid "vCard"
 msgstr ""
 
-#: src/addressbook.c:4983 src/addressbook.c:4995
+#: src/addressbook.c:4982 src/addressbook.c:4994
 msgid "JPilot"
 msgstr ""
 
-#: src/addressbook.c:5007
+#: src/addressbook.c:5006
 msgid "LDAP servers"
 msgstr ""
 
-#: src/addressbook.c:5019
+#: src/addressbook.c:5018
 msgid "LDAP Query"
 msgstr ""
 
-#: src/addressbook_foldersel.c:388 src/plugins/bogofilter/bogofilter.c:107
+#: src/addressbook_foldersel.c:182 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/exporthtml.c:984 src/importldif.c:657
+msgid "Address Book"
+msgstr ""
+
+#: src/addressbook_foldersel.c:387 src/plugins/bogofilter/bogofilter.c:107
 #: src/plugins/bogofilter/bogofilter_gtk.c:274
 #: src/plugins/bogofilter/bogofilter_gtk.c:347
 #: src/plugins/bogofilter/bogofilter_gtk.c:424
@@ -883,43 +887,43 @@ msgstr ""
 msgid "Collect email addresses from folder"
 msgstr ""
 
-#: src/addrindex.c:123
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr ""
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr ""
 
-#: src/addrindex.c:130
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr ""
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr ""
 
-#: src/addrindex.c:1827
+#: src/addrindex.c:1830
 msgid "Address(es) update"
 msgstr ""
 
-#: src/addrindex.c:1828
+#: src/addrindex.c:1831
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr ""
 
-#: src/alertpanel.c:159 src/compose.c:5680 src/compose.c:6203
-#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:746
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
+#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
 msgid "Warning"
 msgstr ""
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5621 src/inc.c:669
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:276
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
+#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr ""
 
@@ -936,11 +940,11 @@ msgid "Browse Directory Entry"
 msgstr ""
 
 #: src/browseldap.c:237
-msgid "Server Name :"
+msgid "Server Name:"
 msgstr ""
 
 #: src/browseldap.c:247
-msgid "Distinguished Name (dn) :"
+msgid "Distinguished Name (dn):"
 msgstr ""
 
 #: src/browseldap.c:270
@@ -951,87 +955,87 @@ msgstr ""
 msgid "Attribute Value"
 msgstr ""
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr ""
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr ""
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr ""
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr ""
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr ""
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr ""
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr ""
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr ""
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr ""
 
-#: src/common/plugin.c:332
+#: src/common/plugin.c:334
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 
-#: src/common/plugin.c:434
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr ""
 
-#: src/common/plugin.c:445
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr ""
 
-#: src/common/plugin.c:479
+#: src/common/plugin.c:482
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 
-#: src/common/plugin.c:488
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr ""
 
-#: src/common/plugin.c:770
+#: src/common/plugin.c:769
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr ""
 
-#: src/common/plugin.c:773
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
 
-#: src/common/plugin.c:782
+#: src/common/plugin.c:781
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 
-#: src/common/plugin.c:784
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 
-#: src/common/session.c:183 src/imap.c:1189
+#: src/common/session.c:183 src/imap.c:1213
 msgid "SSL handshake failed\n"
 msgstr ""
 
@@ -1043,24 +1047,24 @@ msgstr ""
 msgid "Selected SMTP AUTH method not available\n"
 msgstr ""
 
-#: src/common/smtp.c:505 src/common/smtp.c:559
+#: src/common/smtp.c:501 src/common/smtp.c:555
 msgid "bad SMTP response\n"
 msgstr ""
 
-#: src/common/smtp.c:530 src/common/smtp.c:548 src/common/smtp.c:662
+#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
 msgid "error occurred on SMTP session\n"
 msgstr ""
 
-#: src/common/smtp.c:539 src/pop.c:905
+#: src/common/smtp.c:535 src/pop.c:905
 msgid "error occurred on authentication\n"
 msgstr ""
 
-#: src/common/smtp.c:589
+#: src/common/smtp.c:585
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr ""
 
-#: src/common/smtp.c:621 src/pop.c:898
+#: src/common/smtp.c:617 src/pop.c:898
 msgid "couldn't start TLS session\n"
 msgstr ""
 
@@ -1092,81 +1096,81 @@ msgstr ""
 msgid "write on fd%d: %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:328
+#: src/common/ssl_certificate.c:326
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:336
+#: src/common/ssl_certificate.c:334
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:345
+#: src/common/ssl_certificate.c:343
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:630
+#: src/common/ssl_certificate.c:628
 msgid "Internal error"
 msgstr ""
 
-#: src/common/ssl_certificate.c:635
+#: src/common/ssl_certificate.c:633
 msgid "Uncheckable"
 msgstr ""
 
-#: src/common/ssl_certificate.c:639
+#: src/common/ssl_certificate.c:637
 msgid "Self-signed certificate"
 msgstr ""
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:640
 msgid "Revoked certificate"
 msgstr ""
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:642
 msgid "No certificate issuer found"
 msgstr ""
 
-#: src/common/ssl_certificate.c:646
+#: src/common/ssl_certificate.c:644
 msgid "Certificate issuer is not a CA"
 msgstr ""
 
-#: src/common/ssl_certificate.c:871
+#: src/common/ssl_certificate.c:869
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:875
+#: src/common/ssl_certificate.c:873
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:894
+#: src/common/ssl_certificate.c:892
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:898
+#: src/common/ssl_certificate.c:896
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1046
+#: src/common/ssl_certificate.c:1044
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1049
+#: src/common/ssl_certificate.c:1047
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1053
+#: src/common/ssl_certificate.c:1051
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1078 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1076 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
 #: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
@@ -1177,646 +1181,646 @@ msgstr ""
 msgid "(Subject cleared by RegExp)"
 msgstr ""
 
-#: src/common/utils.c:257
+#: src/common/utils.c:259
 #, c-format
 msgid "%dB"
 msgstr ""
 
-#: src/common/utils.c:258
+#: src/common/utils.c:260
 #, c-format
 msgid "%d.%02dKB"
 msgstr ""
 
-#: src/common/utils.c:259
+#: src/common/utils.c:261
 #, c-format
 msgid "%d.%02dMB"
 msgstr ""
 
-#: src/common/utils.c:260
+#: src/common/utils.c:262
 #, c-format
 msgid "%.2fGB"
 msgstr ""
 
-#: src/common/utils.c:4806
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr ""
 
-#: src/common/utils.c:4807
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr ""
 
-#: src/common/utils.c:4808
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr ""
 
-#: src/common/utils.c:4809
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr ""
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr ""
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr ""
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr ""
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr ""
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr ""
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr ""
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr ""
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr ""
 
-#: src/common/utils.c:4820
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr ""
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr ""
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr ""
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr ""
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr ""
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr ""
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr ""
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr ""
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr ""
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr ""
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr ""
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr ""
 
-#: src/common/utils.c:4833
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr ""
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr ""
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr ""
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr ""
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr ""
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr ""
 
-#: src/common/utils.c:4841
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr ""
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr ""
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr ""
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr ""
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr ""
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr ""
 
-#: src/common/utils.c:4857
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr ""
 
-#: src/common/utils.c:4858
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr ""
 
-#: src/common/utils.c:4859
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr ""
 
-#: src/common/utils.c:4860
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr ""
 
-#: src/compose.c:576
+#: src/compose.c:575
 msgid "_Add..."
 msgstr ""
 
-#: src/compose.c:577 src/mh_gtk.c:368 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:318
+#: src/compose.c:576 src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:316
 msgid "_Remove"
 msgstr ""
 
-#: src/compose.c:579 src/folderview.c:241
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr ""
 
-#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
+#: src/compose.c:585 src/mainwindow.c:514 src/messageview.c:211
 msgid "_Message"
 msgstr ""
 
-#: src/compose.c:589
+#: src/compose.c:588
 msgid "_Spelling"
 msgstr ""
 
-#: src/compose.c:591 src/compose.c:658
+#: src/compose.c:590 src/compose.c:657
 msgid "_Options"
 msgstr ""
 
-#: src/compose.c:595
+#: src/compose.c:594
 msgid "S_end"
 msgstr ""
 
-#: src/compose.c:596
+#: src/compose.c:595
 msgid "Send _later"
 msgstr ""
 
-#: src/compose.c:599
+#: src/compose.c:598
 msgid "_Attach file"
 msgstr ""
 
-#: src/compose.c:600
+#: src/compose.c:599
 msgid "_Insert file"
 msgstr ""
 
-#: src/compose.c:601
+#: src/compose.c:600
 msgid "Insert si_gnature"
 msgstr ""
 
-#: src/compose.c:602
+#: src/compose.c:601
 msgid "_Replace signature"
 msgstr ""
 
-#: src/compose.c:606
+#: src/compose.c:605
 msgid "_Print"
 msgstr ""
 
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:610 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr ""
 
-#: src/compose.c:612 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr ""
 
-#: src/compose.c:615 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:614 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr ""
 
-#: src/compose.c:619
+#: src/compose.c:618
 msgid "_Special paste"
 msgstr ""
 
-#: src/compose.c:620
+#: src/compose.c:619
 msgid "As _quotation"
 msgstr ""
 
-#: src/compose.c:621
+#: src/compose.c:620
 msgid "_Wrapped"
 msgstr ""
 
-#: src/compose.c:622
+#: src/compose.c:621
 msgid "_Unwrapped"
 msgstr ""
 
-#: src/compose.c:624 src/mainwindow.c:543
+#: src/compose.c:623 src/mainwindow.c:547
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr ""
 
-#: src/compose.c:626
+#: src/compose.c:625
 msgid "A_dvanced"
 msgstr ""
 
-#: src/compose.c:627
+#: src/compose.c:626
 msgid "Move a character backward"
 msgstr ""
 
-#: src/compose.c:628
+#: src/compose.c:627
 msgid "Move a character forward"
 msgstr ""
 
-#: src/compose.c:629
+#: src/compose.c:628
 msgid "Move a word backward"
 msgstr ""
 
-#: src/compose.c:630
+#: src/compose.c:629
 msgid "Move a word forward"
 msgstr ""
 
-#: src/compose.c:631
+#: src/compose.c:630
 msgid "Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:632
+#: src/compose.c:631
 msgid "Move to end of line"
 msgstr ""
 
-#: src/compose.c:633
+#: src/compose.c:632
 msgid "Move to previous line"
 msgstr ""
 
-#: src/compose.c:634
+#: src/compose.c:633
 msgid "Move to next line"
 msgstr ""
 
-#: src/compose.c:635
+#: src/compose.c:634
 msgid "Delete a character backward"
 msgstr ""
 
-#: src/compose.c:636
+#: src/compose.c:635
 msgid "Delete a character forward"
 msgstr ""
 
-#: src/compose.c:637
+#: src/compose.c:636
 msgid "Delete a word backward"
 msgstr ""
 
-#: src/compose.c:638
+#: src/compose.c:637
 msgid "Delete a word forward"
 msgstr ""
 
-#: src/compose.c:639
+#: src/compose.c:638
 msgid "Delete line"
 msgstr ""
 
-#: src/compose.c:640
+#: src/compose.c:639
 msgid "Delete to end of line"
 msgstr ""
 
-#: src/compose.c:643 src/messageview.c:229
+#: src/compose.c:642 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr ""
 
-#: src/compose.c:646
+#: src/compose.c:645
 msgid "_Wrap current paragraph"
 msgstr ""
 
-#: src/compose.c:647
+#: src/compose.c:646
 msgid "Wrap all long _lines"
 msgstr ""
 
-#: src/compose.c:649
+#: src/compose.c:648
 msgid "Edit with e_xternal editor"
 msgstr ""
 
-#: src/compose.c:652
+#: src/compose.c:651
 msgid "_Check all or check selection"
 msgstr ""
 
-#: src/compose.c:653
+#: src/compose.c:652
 msgid "_Highlight all misspelled words"
 msgstr ""
 
-#: src/compose.c:654
+#: src/compose.c:653
 msgid "Check _backwards misspelled word"
 msgstr ""
 
-#: src/compose.c:655
+#: src/compose.c:654
 msgid "_Forward to next misspelled word"
 msgstr ""
 
-#: src/compose.c:663
+#: src/compose.c:662
 msgid "Reply _mode"
 msgstr ""
 
-#: src/compose.c:665
+#: src/compose.c:664
 msgid "Privacy _System"
 msgstr ""
 
-#: src/compose.c:670
+#: src/compose.c:669
 msgid "_Priority"
 msgstr ""
 
-#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
+#: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:264
 msgid "Character _encoding"
 msgstr ""
 
-#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
+#: src/compose.c:676 src/mainwindow.c:615 src/messageview.c:269
 msgid "Western European"
 msgstr ""
 
-#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
+#: src/compose.c:677 src/mainwindow.c:616 src/messageview.c:270
 msgid "Baltic"
 msgstr ""
 
-#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
+#: src/compose.c:678 src/mainwindow.c:617 src/messageview.c:271
 msgid "Hebrew"
 msgstr ""
 
-#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
+#: src/compose.c:679 src/mainwindow.c:618 src/messageview.c:272
 msgid "Arabic"
 msgstr ""
 
-#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
+#: src/compose.c:680 src/mainwindow.c:619 src/messageview.c:273
 msgid "Cyrillic"
 msgstr ""
 
-#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
+#: src/compose.c:681 src/mainwindow.c:620 src/messageview.c:274
 msgid "Japanese"
 msgstr ""
 
-#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
+#: src/compose.c:682 src/mainwindow.c:621 src/messageview.c:275
 msgid "Chinese"
 msgstr ""
 
-#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
+#: src/compose.c:683 src/mainwindow.c:622 src/messageview.c:276
 msgid "Korean"
 msgstr ""
 
-#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
+#: src/compose.c:684 src/mainwindow.c:623 src/messageview.c:277
 msgid "Thai"
 msgstr ""
 
-#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
+#: src/compose.c:687 src/mainwindow.c:732 src/messageview.c:313
 msgid "_Address book"
 msgstr ""
 
-#: src/compose.c:690
+#: src/compose.c:689
 msgid "_Template"
 msgstr ""
 
-#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
+#: src/compose.c:691 src/mainwindow.c:760 src/messageview.c:334
 msgid "Actio_ns"
 msgstr ""
 
-#: src/compose.c:701
+#: src/compose.c:700
 msgid "Aut_o wrapping"
 msgstr ""
 
-#: src/compose.c:702
+#: src/compose.c:701
 msgid "Auto _indent"
 msgstr ""
 
-#: src/compose.c:703
+#: src/compose.c:702
 msgid "Si_gn"
 msgstr ""
 
-#: src/compose.c:704
+#: src/compose.c:703
 msgid "_Encrypt"
 msgstr ""
 
-#: src/compose.c:705
+#: src/compose.c:704
 msgid "_Request Return Receipt"
 msgstr ""
 
-#: src/compose.c:706
+#: src/compose.c:705
 msgid "Remo_ve references"
 msgstr ""
 
-#: src/compose.c:707
+#: src/compose.c:706
 msgid "Show _ruler"
 msgstr ""
 
-#: src/compose.c:712 src/compose.c:722
+#: src/compose.c:711 src/compose.c:721
 msgid "_Normal"
 msgstr ""
 
-#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
+#: src/compose.c:712 src/mainwindow.c:664 src/messageview.c:302
 msgid "_All"
 msgstr ""
 
-#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
+#: src/compose.c:713 src/mainwindow.c:665 src/messageview.c:303
 msgid "_Sender"
 msgstr ""
 
-#: src/compose.c:715
+#: src/compose.c:714
 msgid "_Mailing-list"
 msgstr ""
 
-#: src/compose.c:720
+#: src/compose.c:719
 msgid "_Highest"
 msgstr ""
 
-#: src/compose.c:721
+#: src/compose.c:720
 msgid "Hi_gh"
 msgstr ""
 
-#: src/compose.c:723
+#: src/compose.c:722
 msgid "Lo_w"
 msgstr ""
 
-#: src/compose.c:724
+#: src/compose.c:723
 msgid "_Lowest"
 msgstr ""
 
-#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
+#: src/compose.c:728 src/mainwindow.c:878 src/messageview.c:351
 msgid "_Automatic"
 msgstr ""
 
-#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
+#: src/compose.c:729 src/mainwindow.c:879 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr ""
 
-#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
+#: src/compose.c:730 src/mainwindow.c:880 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr ""
 
-#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
+#: src/compose.c:734 src/mainwindow.c:884 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr ""
 
-#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
+#: src/compose.c:737 src/mainwindow.c:887 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr ""
 
-#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
+#: src/compose.c:742 src/mainwindow.c:892 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr ""
 
-#: src/compose.c:1072
+#: src/compose.c:1071
 msgid "New message From format error."
 msgstr ""
 
-#: src/compose.c:1164
+#: src/compose.c:1163
 msgid "New message subject format error."
 msgstr ""
 
-#: src/compose.c:1195 src/quote_fmt.c:569
+#: src/compose.c:1194 src/quote_fmt.c:569
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:1456
+#: src/compose.c:1455
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 
-#: src/compose.c:1639 src/quote_fmt.c:586
+#: src/compose.c:1638 src/quote_fmt.c:586
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1687 src/quote_fmt.c:589
+#: src/compose.c:1686 src/quote_fmt.c:589
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:1823 src/compose.c:2015 src/quote_fmt.c:606
+#: src/compose.c:1822 src/compose.c:2014 src/quote_fmt.c:606
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1883 src/quote_fmt.c:609
+#: src/compose.c:1882 src/quote_fmt.c:609
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2057
+#: src/compose.c:2056
 msgid "Fw: multiple emails"
 msgstr ""
 
-#: src/compose.c:2537
+#: src/compose.c:2539
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2604 src/gtk/headers.h:14
+#: src/compose.c:2606 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr ""
 
-#: src/compose.c:2607 src/gtk/headers.h:15
+#: src/compose.c:2609 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr ""
 
-#: src/compose.c:2610 src/gtk/headers.h:12
+#: src/compose.c:2612 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr ""
 
-#: src/compose.c:2613 src/compose.c:4935 src/compose.c:4937
+#: src/compose.c:2615 src/compose.c:4946 src/compose.c:4948
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr ""
 
-#: src/compose.c:2616 src/gtk/headers.h:34
+#: src/compose.c:2618 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr ""
 
-#: src/compose.c:2619 src/gtk/headers.h:17
+#: src/compose.c:2621 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr ""
 
-#: src/compose.c:2623 src/compose.c:4932 src/compose.c:4940
+#: src/compose.c:2625 src/compose.c:4943 src/compose.c:4951
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr ""
 
-#: src/compose.c:2832
+#: src/compose.c:2834
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 
-#: src/compose.c:2838
+#: src/compose.c:2840
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1827,137 +1831,137 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:3111
+#: src/compose.c:3113
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr ""
 
-#: src/compose.c:3602
+#: src/compose.c:3613
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr ""
 
-#: src/compose.c:3613
+#: src/compose.c:3624
 #, 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 ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 msgid "Are you sure?"
 msgstr ""
 
-#: src/compose.c:3617 src/compose.c:10529 src/compose.c:11390
+#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
 msgid "_Insert"
 msgstr ""
 
-#: src/compose.c:3741
+#: src/compose.c:3752
 #, c-format
 msgid "File %s is empty."
 msgstr ""
 
-#: src/compose.c:3742
+#: src/compose.c:3753
 msgid "Empty file"
 msgstr ""
 
-#: src/compose.c:3743
+#: src/compose.c:3754
 msgid "_Attach anyway"
 msgstr ""
 
-#: src/compose.c:3752
+#: src/compose.c:3763
 #, c-format
 msgid "Can't read %s."
 msgstr ""
 
-#: src/compose.c:3779
+#: src/compose.c:3790
 #, c-format
 msgid "Message: %s"
 msgstr ""
 
-#: src/compose.c:4772 src/plugins/managesieve/sieve_editor.c:694
-#: src/plugins/python/composewindowtype.c:421
+#: src/compose.c:4783 src/plugins/managesieve/sieve_editor.c:694
+#: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr ""
 
-#: src/compose.c:4779 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4790 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4782 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4784 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4795 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr ""
 
-#: src/compose.c:4811 src/messageview.c:890
+#: src/compose.c:4822 src/messageview.c:889
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 
-#: src/compose.c:5031 src/compose.c:5063 src/compose.c:5105
-#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
+#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr ""
 
-#: src/compose.c:5032
+#: src/compose.c:5043
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 
-#: src/compose.c:5033 src/compose.c:5065 src/compose.c:5098 src/compose.c:5622
-#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
+#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
+#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr ""
 
-#: src/compose.c:5064
+#: src/compose.c:5075
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 
-#: src/compose.c:5081
+#: src/compose.c:5092
 msgid "Recipient is not specified."
 msgstr ""
 
-#: src/compose.c:5100 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr ""
 
-#: src/compose.c:5101
+#: src/compose.c:5112
 #, c-format
 msgid "Subject is empty. %s"
 msgstr ""
 
-#: src/compose.c:5102 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5103 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5114 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr ""
 
-#: src/compose.c:5105 src/toolbar.c:425
+#: src/compose.c:5116 src/toolbar.c:425
 msgid "Send later"
 msgstr ""
 
-#: src/compose.c:5158 src/compose.c:9993
+#: src/compose.c:5169 src/compose.c:9999
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 
-#: src/compose.c:5161 src/compose.c:9996
+#: src/compose.c:5172 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
 
-#: src/compose.c:5167 src/compose.c:9990
+#: src/compose.c:5178 src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1965,7 +1969,7 @@ msgid ""
 "Signature failed: %s"
 msgstr ""
 
-#: src/compose.c:5170
+#: src/compose.c:5181
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1973,24 +1977,24 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/compose.c:5172
+#: src/compose.c:5183
 msgid "Could not queue message for sending."
 msgstr ""
 
-#: src/compose.c:5187 src/compose.c:5247
+#: src/compose.c:5198 src/compose.c:5258
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5243
+#: src/compose.c:5254
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5618
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -1998,7 +2002,7 @@ msgid ""
 "Send it as %s?"
 msgstr ""
 
-#: src/compose.c:5676
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2007,72 +2011,72 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5787
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr ""
 
-#: src/compose.c:5908
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr ""
 
-#: src/compose.c:5909
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr ""
 
-#: src/compose.c:5958
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr ""
 
-#: src/compose.c:5967
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 
-#: src/compose.c:6202
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 
-#: src/compose.c:6203 src/mainwindow.c:651 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr ""
 
-#: src/compose.c:6203
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr ""
 
-#: src/compose.c:6243
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr ""
 
-#: src/compose.c:6825
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr ""
 
-#: src/compose.c:6986
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr ""
 
-#: src/compose.c:6990 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr ""
 
-#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr ""
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr ""
 
-#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2083,110 +2087,110 @@ msgstr ""
 msgid "_Browse"
 msgstr ""
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr ""
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr ""
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr ""
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr ""
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr ""
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr ""
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr ""
 
-#: src/compose.c:8373
+#: src/compose.c:8379
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr ""
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr ""
 
-#: src/compose.c:8575 src/prefs_template.c:760
+#: src/compose.c:8581 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr ""
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr ""
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr ""
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr ""
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr ""
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr ""
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr ""
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr ""
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr ""
 
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr ""
 
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr ""
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr ""
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr ""
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2194,15 +2198,15 @@ msgid ""
 "process group id: %d"
 msgstr ""
 
-#: src/compose.c:9959 src/messageview.c:1097
+#: src/compose.c:9965 src/messageview.c:1096
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr ""
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2210,107 +2214,107 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr ""
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr ""
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr ""
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr ""
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr ""
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr ""
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr ""
 
-#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr ""
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr ""
 
-#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr ""
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr ""
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr ""
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr ""
 
-#: src/compose.c:10529 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/compose.c:10535 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
 #: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr ""
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr ""
 
-#: src/compose.c:11388
+#: src/compose.c:11400
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr ""
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr ""
 
-#: src/compose.c:11902
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2353,11 +2357,11 @@ msgstr ""
 msgid "Save crash information"
 msgstr ""
 
-#: src/editaddress.c:156 src/editaddress.c:232
+#: src/editaddress.c:155 src/editaddress.c:231
 msgid "Add New Person"
 msgstr ""
 
-#: src/editaddress.c:158
+#: src/editaddress.c:157
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2372,7 +2376,7 @@ msgid ""
 "Click Cancel to close without saving."
 msgstr ""
 
-#: src/editaddress.c:169
+#: src/editaddress.c:168
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2385,93 +2389,93 @@ msgid ""
 "Click Cancel to close without saving."
 msgstr ""
 
-#: src/editaddress.c:233
+#: src/editaddress.c:232
 msgid "Edit Person Details"
 msgstr ""
 
-#: src/editaddress.c:411
+#: src/editaddress.c:410
 msgid "An Email address must be supplied."
 msgstr ""
 
-#: src/editaddress.c:587 src/editaddress_other_attributes_ldap.c:198
+#: src/editaddress.c:586 src/editaddress_other_attributes_ldap.c:198
 msgid "A Name and Value must be supplied."
 msgstr ""
 
-#: src/editaddress.c:676 src/prefs_folder_item.c:1675
+#: src/editaddress.c:675 src/prefs_folder_item.c:1675
 msgid "Discard"
 msgstr ""
 
-#: src/editaddress.c:677
+#: src/editaddress.c:676
 msgid "Apply"
 msgstr ""
 
-#: src/editaddress.c:707 src/editaddress.c:756
+#: src/editaddress.c:706 src/editaddress.c:755
 msgid "Edit Person Data"
 msgstr ""
 
-#: src/editaddress.c:785
+#: src/editaddress.c:784
 msgid "Choose a picture"
 msgstr ""
 
-#: src/editaddress.c:804
+#: src/editaddress.c:803
 #, c-format
 msgid ""
 "Failed to import image: \n"
 "%s"
 msgstr ""
 
-#: src/editaddress.c:846
+#: src/editaddress.c:845
 msgid "_Set picture"
 msgstr ""
 
-#: src/editaddress.c:847
+#: src/editaddress.c:846
 msgid "_Unset picture"
 msgstr ""
 
-#: src/editaddress.c:905
+#: src/editaddress.c:904
 msgid "Photo"
 msgstr ""
 
-#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:516
+#: src/editaddress.c:951 src/editaddress.c:953 src/expldifdlg.c:516
 #: src/exporthtml.c:761 src/ldif.c:746
 msgid "Display Name"
 msgstr ""
 
-#: src/editaddress.c:963 src/editaddress.c:967 src/ldif.c:754
+#: src/editaddress.c:962 src/editaddress.c:966 src/ldif.c:754
 msgid "Last Name"
 msgstr ""
 
-#: src/editaddress.c:964 src/editaddress.c:966 src/ldif.c:750
+#: src/editaddress.c:963 src/editaddress.c:965 src/ldif.c:750
 msgid "First Name"
 msgstr ""
 
-#: src/editaddress.c:970 src/editaddress.c:972
+#: src/editaddress.c:969 src/editaddress.c:971
 msgid "Nickname"
 msgstr ""
 
-#: src/editaddress.c:1056 src/editaddress.c:1124
+#: src/editaddress.c:1055 src/editaddress.c:1123
 msgid "Alias"
 msgstr ""
 
-#: src/editaddress.c:1266 src/editaddress.c:1335 src/editaddress.c:1355
+#: src/editaddress.c:1265 src/editaddress.c:1334 src/editaddress.c:1354
 #: src/editaddress_other_attributes_ldap.c:303
 #: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:222
 msgid "Value"
 msgstr ""
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1425
 msgid "_User Data"
 msgstr ""
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1426
 msgid "_Email Addresses"
 msgstr ""
 
-#: src/editaddress.c:1430 src/editaddress.c:1433
+#: src/editaddress.c:1429 src/editaddress.c:1432
 msgid "O_ther Attributes"
 msgstr ""
 
-#: src/editaddress.c:1584
+#: src/editaddress.c:1583
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2499,8 +2503,8 @@ msgid " Check File "
 msgstr ""
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1959
-#: src/wizard.c:1190 src/wizard.c:1610
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
+#: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr ""
 
@@ -2548,12 +2552,12 @@ msgstr ""
 msgid "Input the new name of folder:"
 msgstr ""
 
-#: src/editgroup.c:556 src/foldersel.c:585 src/imap_gtk.c:194 src/mh_gtk.c:144
+#: src/editgroup.c:556 src/foldersel.c:582 src/imap_gtk.c:193 src/mh_gtk.c:144
 #: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "New folder"
 msgstr ""
 
-#: src/editgroup.c:557 src/foldersel.c:586 src/mh_gtk.c:145
+#: src/editgroup.c:557 src/foldersel.c:583 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "Input the name of new folder:"
 msgstr ""
@@ -2582,16 +2586,16 @@ msgstr ""
 msgid "Edit LDAP - Select Search Base"
 msgstr ""
 
-#: src/editldap_basedn.c:156 src/editldap.c:440
+#: src/editldap_basedn.c:156 src/editldap.c:441
 msgid "Hostname"
 msgstr ""
 
-#: src/editldap_basedn.c:166 src/editldap.c:457
-#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:110
+#: src/editldap_basedn.c:166 src/editldap.c:458
+#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:108
 msgid "Port"
 msgstr ""
 
-#: src/editldap_basedn.c:176 src/editldap.c:501
+#: src/editldap_basedn.c:176 src/editldap.c:502
 msgid "Search Base"
 msgstr ""
 
@@ -2603,35 +2607,35 @@ msgstr ""
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 
-#: src/editldap_basedn.c:291 src/editldap.c:280
+#: src/editldap_basedn.c:291 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr ""
 
-#: src/editldap.c:151
+#: src/editldap.c:152
 msgid "A Name must be supplied."
 msgstr ""
 
-#: src/editldap.c:163
+#: src/editldap.c:164
 msgid "A Hostname must be supplied for the server."
 msgstr ""
 
-#: src/editldap.c:176
+#: src/editldap.c:177
 msgid "At least one LDAP search attribute should be supplied."
 msgstr ""
 
-#: src/editldap.c:277
+#: src/editldap.c:278
 msgid "Connected successfully to server"
 msgstr ""
 
-#: src/editldap.c:335 src/editldap.c:973
+#: src/editldap.c:336 src/editldap.c:970
 msgid "Edit LDAP Server"
 msgstr ""
 
-#: src/editldap.c:436
+#: src/editldap.c:437
 msgid "A name that you wish to call the server."
 msgstr ""
 
-#: src/editldap.c:449
+#: src/editldap.c:450
 msgid ""
 "This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
 "be appropriate for the \"mydomain.com\" organization. An IP address may also "
@@ -2643,41 +2647,41 @@ msgstr ""
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 
-#: src/editldap.c:469
+#: src/editldap.c:470
 msgid "TLS"
 msgstr ""
 
-#: src/editldap.c:470 src/prefs_account.c:3343
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr ""
 
-#: src/editldap.c:474
+#: src/editldap.c:475
 msgid ""
 "Enable secure connection to the LDAP server via TLS. If connection fails, be "
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
 "TLS_REQCERT fields)."
 msgstr ""
 
-#: src/editldap.c:478
+#: src/editldap.c:479
 msgid ""
 "Enable secure connection to the LDAP server via SSL. If connection fails, be "
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
 "TLS_REQCERT fields)."
 msgstr ""
 
-#: src/editldap.c:490
+#: src/editldap.c:491
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr ""
 
-#: src/editldap.c:493
+#: src/editldap.c:494
 msgid " Check Server "
 msgstr ""
 
-#: src/editldap.c:497
+#: src/editldap.c:498
 msgid "Press this button to test the connection to the server."
 msgstr ""
 
-#: 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"
@@ -2691,37 +2695,37 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organisation Name,c=Country\n"
 
-#: src/editldap.c:521
+#: src/editldap.c:522
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr ""
 
-#: src/editldap.c:577
+#: src/editldap.c:578
 msgid "Search Attributes"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: src/editldap.c:589
+#: src/editldap.c:590
 msgid " Defaults "
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: src/editldap.c:599
+#: src/editldap.c:600
 msgid "Max Query Age (secs)"
 msgstr ""
 
-#: src/editldap.c:614
+#: src/editldap.c:615
 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 "
@@ -2735,21 +2739,21 @@ msgid ""
 "more memory to cache results."
 msgstr ""
 
-#: src/editldap.c:631
+#: src/editldap.c:632
 msgid "Include server in dynamic search"
 msgstr ""
 
-#: src/editldap.c:636
+#: src/editldap.c:637
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
 msgstr ""
 
-#: src/editldap.c:642
+#: src/editldap.c:643
 msgid "Match names 'containing' search term"
 msgstr ""
 
-#: src/editldap.c:647
+#: src/editldap.c:648
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2758,11 +2762,11 @@ msgid ""
 "searches against other address interfaces."
 msgstr ""
 
-#: src/editldap.c:700
+#: src/editldap.c:701
 msgid "Bind DN"
 msgstr ""
 
-#: src/editldap.c:709
+#: src/editldap.c:710
 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 "
@@ -2770,40 +2774,40 @@ msgid ""
 "performing a search."
 msgstr ""
 
-#: src/editldap.c:716
+#: src/editldap.c:717
 msgid "Bind Password"
 msgstr ""
 
-#: src/editldap.c:726
+#: src/editldap.c:727
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 
-#: src/editldap.c:731
+#: src/editldap.c:732
 msgid "Timeout (secs)"
 msgstr ""
 
-#: src/editldap.c:745
+#: src/editldap.c:746
 msgid "The timeout period in seconds."
 msgstr ""
 
-#: src/editldap.c:749
+#: src/editldap.c:750
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:763
+#: src/editldap.c:764
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
-#: src/editldap.c:778 src/prefs_account.c:3234
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr ""
 
-#: src/editldap.c:780 src/gtk/quicksearch.c:680
+#: src/editldap.c:781 src/gtk/quicksearch.c:680
 msgid "Extended"
 msgstr ""
 
-#: src/editldap.c:978
+#: src/editldap.c:975
 msgid "Add New LDAP Server"
 msgstr ""
 
@@ -2925,20 +2929,20 @@ msgid "Stylesheet"
 msgstr ""
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1181
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
 #: src/plugins/archive/archiver_prefs.c:235
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:947
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6042
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5992
 msgid "None"
 msgstr ""
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:115
-#: src/prefs_other.c:407
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
+#: src/prefs_other.c:418
 msgid "Default"
 msgstr ""
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
-#: src/plugins/pgpcore/sgpgme.c:147 src/plugins/pgpcore/sgpgme.c:163
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:243
+#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
 msgid "Full"
 msgstr ""
 
@@ -2983,11 +2987,11 @@ msgid "Format User Attributes"
 msgstr ""
 
 #: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
-msgid "Address Book :"
+msgid "Address Book:"
 msgstr ""
 
 #: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
-msgid "File Name :"
+msgid "File Name:"
 msgstr ""
 
 #: src/exphtmldlg.c:559
@@ -3146,7 +3150,7 @@ msgstr ""
 msgid "Distinguished Name"
 msgstr ""
 
-#: src/export.c:113 src/summaryview.c:8190
+#: src/export.c:113 src/summaryview.c:8139
 msgid "Export to mbox file"
 msgstr ""
 
@@ -3373,307 +3377,311 @@ msgid ""
 "%smessage file: %s\n"
 msgstr ""
 
-#: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:300
+#: src/folder.c:1565 src/foldersel.c:400 src/prefs_folder_item.c:300
 msgid "Inbox"
 msgstr ""
 
-#: src/folder.c:1569 src/foldersel.c:407
+#: src/folder.c:1569 src/foldersel.c:404
 msgid "Sent"
 msgstr ""
 
-#: src/folder.c:1573 src/foldersel.c:411 src/prefs_folder_item.c:303
+#: src/folder.c:1573 src/foldersel.c:408 src/prefs_folder_item.c:303
 msgid "Queue"
 msgstr ""
 
-#: src/folder.c:1577 src/foldersel.c:415 src/prefs_folder_item.c:304
+#: src/folder.c:1577 src/foldersel.c:412 src/prefs_folder_item.c:304
 msgid "Trash"
 msgstr "Wastebin"
 
-#: src/folder.c:1581 src/foldersel.c:419 src/prefs_folder_item.c:302
+#: src/folder.c:1581 src/foldersel.c:416 src/prefs_folder_item.c:302
 msgid "Drafts"
 msgstr ""
 
-#: src/folder.c:2011
+#: src/folder.c:2012
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr ""
 
-#: src/folder.c:3256
+#: src/folder.c:3257
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3256
+#: src/folder.c:3257
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3564
+#: src/folder.c:3563
 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 
-#: src/folder.c:4427
+#: src/folder.c:4424
 msgid "Processing messages..."
 msgstr ""
 
-#: src/folder.c:4563
+#: src/folder.c:4559
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr ""
 
-#: src/folder.c:4820
+#: src/folder.c:4816
 msgid "A folder name cannot begin or end with a dot."
 msgstr ""
 
+#: src/folder.c:4820
+msgid "A folder name can not end with a space."
+msgstr ""
+
 #: src/foldersel.c:247
 msgid "Select folder"
 msgstr ""
 
-#: src/foldersel.c:587 src/imap_gtk.c:198 src/mh_gtk.c:146
+#: src/foldersel.c:584 src/imap_gtk.c:197 src/mh_gtk.c:146
 #: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "NewFolder"
 msgstr ""
 
-#: src/foldersel.c:595 src/imap_gtk.c:209 src/imap_gtk.c:215 src/imap_gtk.c:271
-#: src/imap_gtk.c:276 src/mh_gtk.c:154 src/mh_gtk.c:263 src/news_gtk.c:314
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:206
-#: src/plugins/vcalendar/vcal_folder.c:2043
+#: src/foldersel.c:592 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:422
+#: src/plugins/rssyl/rssyl_cb_menu.c:204
+#: src/plugins/vcalendar/vcal_folder.c:2056
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr ""
 
-#: src/foldersel.c:610 src/imap_gtk.c:225 src/imap_gtk.c:283 src/mh_gtk.c:167
-#: src/mh_gtk.c:273 src/news_gtk.c:321 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:436 src/plugins/rssyl/rssyl_cb_menu.c:219
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/foldersel.c:607 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:434 src/plugins/rssyl/rssyl_cb_menu.c:217
+#: src/plugins/vcalendar/vcal_folder.c:2063
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
 
-#: src/foldersel.c:617 src/imap_gtk.c:231 src/mh_gtk.c:173
+#: src/foldersel.c:614 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:124
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr ""
 
-#: src/folderview.c:236
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr ""
 
-#: src/folderview.c:237
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr ""
 
-#: src/folderview.c:239
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr ""
 
-#: src/folderview.c:240 src/mainwindow.c:547
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr ""
 
-#: src/folderview.c:242
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr ""
 
-#: src/folderview.c:243
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Empty was_tebin..."
 
-#: src/folderview.c:244
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr ""
 
-#: src/folderview.c:387 src/folderview.c:434
+#: src/folderview.c:389 src/folderview.c:436
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6316
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
 msgid "New"
 msgstr ""
 
-#: src/folderview.c:388 src/folderview.c:435
+#: src/folderview.c:390 src/folderview.c:437
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6318
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
 msgid "Unread"
 msgstr ""
 
-#: src/folderview.c:389 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:391 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr ""
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:437 src/summaryview.c:445
+#: src/folderview.c:439 src/summaryview.c:445
 msgid "#"
 msgstr "No."
 
-#: src/folderview.c:767
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr ""
 
-#: src/folderview.c:839
+#: src/folderview.c:845
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
 msgstr ""
 
-#: src/folderview.c:841 src/summaryview.c:4134
+#: src/folderview.c:847 src/summaryview.c:4115
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 
-#: src/folderview.c:845 src/summaryview.c:4133
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr ""
 
-#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
-msgid "Scanning folder %s%c%s..."
+msgid "Scanning folder %s/%s..."
 msgstr ""
 
-#: src/folderview.c:1019 src/imap.c:4610 src/mainwindow.c:5179 src/setup.c:96
+#: src/folderview.c:1030 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr ""
 
-#: src/folderview.c:1050
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr ""
 
-#: src/folderview.c:1051
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 
-#: src/folderview.c:1061
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr ""
 
-#: src/folderview.c:1063
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr ""
 
-#: src/folderview.c:1154
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr ""
 
-#: src/folderview.c:1208
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr ""
 
-#: src/folderview.c:2124
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr ""
 
-#: src/folderview.c:2219
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr ""
 
-#: src/folderview.c:2237
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr ""
 
-#: src/folderview.c:2379 src/mainwindow.c:2893 src/mainwindow.c:2897
+#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Empty trash"
 msgstr "Empty wastebin"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Delete all messages in wastebin?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Empty wastebin"
 
-#: src/folderview.c:2424 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr ""
 
-#: src/folderview.c:2425 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr ""
 
-#: src/folderview.c:2436 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr ""
 
-#: src/folderview.c:2437 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr ""
 
-#: src/folderview.c:2446 src/toolbar.c:2647
+#: src/folderview.c:2466 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 
-#: src/folderview.c:2449 src/main.c:2717 src/toolbar.c:2650
+#: src/folderview.c:2469 src/main.c:2743 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
 
-#: src/folderview.c:2524
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr ""
 
-#: src/folderview.c:2525
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr ""
 
-#: src/folderview.c:2527
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr ""
 
-#: src/folderview.c:2527
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr ""
 
-#: src/folderview.c:2538
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2538
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2572
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr ""
 
-#: src/folderview.c:2575
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2576
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2579
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 
-#: src/folderview.c:2582
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr ""
 
-#: src/folderview.c:2582
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr ""
 
-#: src/folderview.c:2632
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr ""
 
-#: src/folderview.c:3060 src/summaryview.c:4579 src/summaryview.c:4684
+#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 
@@ -3697,7 +3705,7 @@ msgstr ""
 msgid "Newsgroup name"
 msgstr ""
 
-#: src/grouplistdialog.c:205
+#: src/grouplistdialog.c:205 src/prefs_send.c:171
 msgid "Messages"
 msgstr ""
 
@@ -3723,7 +3731,7 @@ msgstr ""
 msgid "Can't retrieve newsgroup list."
 msgstr ""
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1584
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1565
 msgid "Done."
 msgstr ""
 
@@ -3758,7 +3766,7 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"Copyright (C) 1999-2015\n"
+"Copyright (C) 1999-2016\n"
 "The Claws Mail Team\n"
 " and Hiroyuki Yamamoto"
 msgstr ""
@@ -3791,7 +3799,7 @@ msgid ""
 "Operating System: unknown"
 msgstr ""
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:526
+#: src/gtk/about.c:242 src/prefs_themes.c:705 src/wizard.c:527
 msgid "The Claws Mail Team"
 msgstr ""
 
@@ -3897,44 +3905,44 @@ msgid ""
 "this program. If not, see "
 msgstr ""
 
-#: src/gtk/about.c:698 src/main.c:2541
+#: src/gtk/about.c:698 src/main.c:2567
 msgid "Session statistics\n"
 msgstr ""
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2551 src/main.c:2554
+#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2577 src/main.c:2580
 #, c-format
 msgid "Started: %s\n"
 msgstr ""
 
-#: src/gtk/about.c:718 src/main.c:2560
+#: src/gtk/about.c:718 src/main.c:2586
 msgid "Incoming traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:721 src/main.c:2563
+#: src/gtk/about.c:721 src/main.c:2589
 #, c-format
 msgid "Received messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:728 src/main.c:2569
+#: src/gtk/about.c:728 src/main.c:2595
 msgid "Outgoing traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:731 src/main.c:2572
+#: src/gtk/about.c:731 src/main.c:2598
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:736 src/main.c:2576
+#: src/gtk/about.c:736 src/main.c:2602
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:741 src/main.c:2580
+#: src/gtk/about.c:741 src/main.c:2606
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:746 src/main.c:2584
+#: src/gtk/about.c:746 src/main.c:2610
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr ""
@@ -3945,7 +3953,7 @@ msgstr ""
 
 #: src/gtk/about.c:831
 msgid ""
-"Copyright (C) 1999-2015\n"
+"Copyright (C) 1999-2016\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
@@ -3974,63 +3982,63 @@ msgstr ""
 msgid "_Statistics"
 msgstr ""
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr ""
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr ""
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr ""
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr ""
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr ""
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr ""
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr ""
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr ""
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr ""
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr ""
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr ""
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr ""
 
@@ -4248,7 +4256,7 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:432
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:433
 msgid "Comments"
 msgstr ""
 
@@ -4363,11 +4371,11 @@ msgstr ""
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
 #: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:79 src/summaryview.c:2805
+#: src/prefs_summary_column.c:79 src/summaryview.c:2786
 msgid "Status"
 msgstr ""
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:881
+#: src/gtk/headers.h:37 src/prefs_themes.c:880
 msgid "Status:"
 msgstr ""
 
@@ -4435,7 +4443,7 @@ msgstr ""
 msgid "Precedence:"
 msgstr ""
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1071
+#: src/gtk/headers.h:46 src/prefs_account.c:1066
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4721,7 +4729,7 @@ msgstr ""
 #: src/gtk/pluginwindow.c:215
 #, c-format
 msgid ""
-"The following error occurred while loading %s :\n"
+"The following error occurred while loading %s:\n"
 "\n"
 "%s\n"
 msgstr ""
@@ -4735,9 +4743,9 @@ msgstr ""
 #: src/plugins/clamd/clamav_plugin_gtk.c:552
 #: src/plugins/fancy/fancy_prefs.c:114
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:136
+#: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:412
+#: src/plugins/managesieve/sieve_prefs.c:424
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -4746,10 +4754,10 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:487
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
-#: src/plugins/pgpcore/prefs_gpg.c:614 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:79
+#: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:709 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:728 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr ""
 
@@ -4786,14 +4794,14 @@ msgstr ""
 msgid "Page Index"
 msgstr ""
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
 msgid "_Hide"
 msgstr ""
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
-#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
-#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
+#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
+#: src/prefs_account.c:3395 src/prefs_account.c:3488
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5066,7 +5074,7 @@ msgid "Signer"
 msgstr ""
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:837
+#: src/prefs_themes.c:836
 msgid "Name: "
 msgstr ""
 
@@ -5183,21 +5191,21 @@ msgstr ""
 msgid "SSL certificate changed"
 msgstr ""
 
-#: src/headerview.c:95
+#: src/headerview.c:94
 msgid "Tags:"
 msgstr ""
 
-#: src/headerview.c:193 src/plugins/notification/notification_popup.c:316
+#: src/headerview.c:192 src/plugins/notification/notification_popup.c:316
 #: src/plugins/notification/notification_popup.c:623
-#: src/plugins/notification/notification_trayicon.c:845 src/summaryview.c:3363
-#: src/summaryview.c:3381 src/summaryview.c:3402
+#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3344
+#: src/summaryview.c:3362 src/summaryview.c:3383
 msgid "(No From)"
 msgstr ""
 
-#: src/headerview.c:208 src/plugins/notification/notification_popup.c:318
+#: src/headerview.c:207 src/plugins/notification/notification_popup.c:318
 #: src/plugins/notification/notification_popup.c:627
-#: src/plugins/notification/notification_trayicon.c:848 src/summaryview.c:3414
-#: src/summaryview.c:3417
+#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3395
+#: src/summaryview.c:3398
 msgid "(No Subject)"
 msgstr ""
 
@@ -5237,175 +5245,175 @@ msgid "IMAP error on %s:"
 msgstr ""
 
 #: src/imap.c:621
-msgid " authenticated\n"
+msgid "authenticated"
 msgstr ""
 
 #: src/imap.c:624
-msgid " not authenticated\n"
+msgid "not authenticated"
 msgstr ""
 
 #: src/imap.c:627
-msgid " bad state\n"
+msgid "bad state"
 msgstr ""
 
 #: src/imap.c:630
-msgid " stream error\n"
+msgid "stream error"
 msgstr ""
 
 #: src/imap.c:633
-msgid " parse error (very probably non-RFC compliance from the server)\n"
+msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 
 #: src/imap.c:637
-msgid " connection refused\n"
+msgid "connection refused"
 msgstr ""
 
 #: src/imap.c:640
-msgid " memory error\n"
+msgid "memory error"
 msgstr ""
 
 #: src/imap.c:643
-msgid " fatal error\n"
+msgid "fatal error"
 msgstr ""
 
 #: src/imap.c:646
-msgid " protocol error (very probably non-RFC compliance from the server)\n"
+msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 
 #: src/imap.c:650
-msgid " connection not accepted\n"
+msgid "connection not accepted"
 msgstr ""
 
 #: src/imap.c:653
-msgid " APPEND error\n"
+msgid "APPEND error"
 msgstr ""
 
 #: src/imap.c:656
-msgid " NOOP error\n"
+msgid "NOOP error"
 msgstr ""
 
 #: src/imap.c:659
-msgid " LOGOUT error\n"
+msgid "LOGOUT error"
 msgstr ""
 
 #: src/imap.c:662
-msgid " CAPABILITY error\n"
+msgid "CAPABILITY error"
 msgstr ""
 
 #: src/imap.c:665
-msgid " CHECK error\n"
+msgid "CHECK error"
 msgstr ""
 
 #: src/imap.c:668
-msgid " CLOSE error\n"
+msgid "CLOSE error"
 msgstr ""
 
 #: src/imap.c:671
-msgid " EXPUNGE error\n"
+msgid "EXPUNGE error"
 msgstr ""
 
 #: src/imap.c:674
-msgid " COPY error\n"
+msgid "COPY error"
 msgstr ""
 
 #: src/imap.c:677
-msgid " UID COPY error\n"
+msgid "UID COPY error"
 msgstr ""
 
 #: src/imap.c:680
-msgid " CREATE error\n"
+msgid "CREATE error"
 msgstr ""
 
 #: src/imap.c:683
-msgid " DELETE error\n"
+msgid "DELETE error"
 msgstr ""
 
 #: src/imap.c:686
-msgid " EXAMINE error\n"
+msgid "EXAMINE error"
 msgstr ""
 
 #: src/imap.c:689
-msgid " FETCH error\n"
+msgid "FETCH error"
 msgstr ""
 
 #: src/imap.c:692
-msgid " UID FETCH error\n"
+msgid "UID FETCH error"
 msgstr ""
 
 #: src/imap.c:695
-msgid " LIST error\n"
+msgid "LIST error"
 msgstr ""
 
 #: src/imap.c:698
-msgid " LOGIN error\n"
+msgid "LOGIN error"
 msgstr ""
 
 #: src/imap.c:701
-msgid " LSUB error\n"
+msgid "LSUB error"
 msgstr ""
 
 #: src/imap.c:704
-msgid " RENAME error\n"
+msgid "RENAME error"
 msgstr ""
 
 #: src/imap.c:707
-msgid " SEARCH error\n"
+msgid "SEARCH error"
 msgstr ""
 
 #: src/imap.c:710
-msgid " UID SEARCH error\n"
+msgid "UID SEARCH error"
 msgstr ""
 
 #: src/imap.c:713
-msgid " SELECT error\n"
+msgid "SELECT error"
 msgstr ""
 
 #: src/imap.c:716
-msgid " STATUS error\n"
+msgid "STATUS error"
 msgstr ""
 
 #: src/imap.c:719
-msgid " STORE error\n"
+msgid "STORE error"
 msgstr ""
 
 #: src/imap.c:722
-msgid " UID STORE error\n"
+msgid "UID STORE error"
 msgstr ""
 
 #: src/imap.c:725
-msgid " SUBSCRIBE error\n"
+msgid "SUBSCRIBE error"
 msgstr ""
 
 #: src/imap.c:728
-msgid " UNSUBSCRIBE error\n"
+msgid "UNSUBSCRIBE error"
 msgstr ""
 
 #: src/imap.c:731
-msgid " STARTTLS error\n"
+msgid "STARTTLS error"
 msgstr ""
 
 #: src/imap.c:734
-msgid " INVAL error\n"
+msgid "INVAL error"
 msgstr ""
 
 #: src/imap.c:737
-msgid " EXTENSION error\n"
+msgid "EXTENSION error"
 msgstr ""
 
 #: src/imap.c:740
-msgid " SASL error\n"
+msgid "SASL error"
 msgstr ""
 
 #: src/imap.c:744
-msgid " SSL error\n"
+msgid "SSL error"
 msgstr ""
 
 #: src/imap.c:748
 #, c-format
-msgid " Unknown error [%d]\n"
+msgid "Unknown error [%d]"
 msgstr ""
 
-#: src/imap.c:940
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5413,7 +5421,7 @@ msgid ""
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:946
+#: src/imap.c:958
 msgid ""
 "\n"
 "\n"
@@ -5421,7 +5429,7 @@ msgid ""
 "and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:952
+#: src/imap.c:964
 msgid ""
 "\n"
 "\n"
@@ -5429,36 +5437,52 @@ msgid ""
 "and the SCRAM SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:959
+#: src/imap.c:970
+msgid ""
+"\n"
+"\n"
+"PLAIN logins only work if libetpan has been compiled with SASL support and "
+"the PLAIN SASL plugin is installed."
+msgstr ""
+
+#: src/imap.c:976
+msgid ""
+"\n"
+"\n"
+"LOGIN logins only work if libetpan has been compiled with SASL support and "
+"the LOGIN SASL plugin is installed."
+msgstr ""
+
+#: src/imap.c:983
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 
-#: src/imap.c:963
+#: src/imap.c:987
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 
-#: src/imap.c:981
+#: src/imap.c:1005
 #, c-format
 msgid "Connecting to %s failed"
 msgstr ""
 
-#: src/imap.c:988 src/imap.c:991
+#: src/imap.c:1012 src/imap.c:1015
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 
-#: src/imap.c:1021 src/imap.c:3652 src/imap.c:4311 src/imap.c:4408
-#: src/imap.c:4586 src/imap.c:5398
+#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
+#: src/imap.c:4620 src/imap.c:5431
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 
-#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:281
+#: src/imap.c:1154 src/inc.c:811 src/news.c:388 src/send_message.c:282
 msgid "Insecure connection"
 msgstr ""
 
-#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1155 src/inc.c:812 src/news.c:389 src/send_message.c:283
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
@@ -5467,128 +5491,127 @@ msgid ""
 "not be secure."
 msgstr ""
 
-#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:288
+#: src/imap.c:1161 src/inc.c:818 src/news.c:395 src/send_message.c:289
 msgid "Con_tinue connecting"
 msgstr ""
 
-#: src/imap.c:1147
+#: src/imap.c:1171
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr ""
 
-#: src/imap.c:1195
+#: src/imap.c:1219
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr ""
 
-#: src/imap.c:1198
+#: src/imap.c:1222
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr ""
 
-#: src/imap.c:1231 src/imap.c:4073
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: src/imap.c:1294
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr ""
 
-#: src/imap.c:1297
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 
-#: src/imap.c:1715
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr ""
 
-#: src/imap.c:1920 src/mh.c:532
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr ""
 
-#: src/imap.c:2513
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr ""
 
-#: src/imap.c:2520 src/imap.c:5028
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr ""
 
-#: src/imap.c:2871
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr ""
 
-#: src/imap.c:2874
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr ""
 
-#: src/imap.c:3192
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3207
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr ""
 
-#: src/imap.c:3338
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 
-#: src/imap.c:3451
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr ""
 
-#: src/imap.c:3730
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3815
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr ""
 
-#: src/imap.c:3918
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 
-#: src/imap.c:4070
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr ""
 
-#: src/imap.c:4080
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
-#: src/imap.c:4085
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
 
-#: src/imap.c:4093
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr ""
 
-#: src/imap.c:4316
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr ""
 
-#: src/imap.c:5021
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
-#: src/imap.c:6056
+#: src/imap.c:6089
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
-"Mail has been built without IMAP support; your IMAP account(s) are "
-"disabled.\n"
+"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 ""
@@ -5631,7 +5654,7 @@ msgstr ""
 msgid "_Subscribe..."
 msgstr ""
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Unsubscribe..."
 msgstr ""
 
@@ -5652,39 +5675,39 @@ msgstr ""
 msgid "Show only subscribed _folders"
 msgstr ""
 
-#: src/imap_gtk.c:195
+#: src/imap_gtk.c:194
 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 ""
 
-#: src/imap_gtk.c:199 src/mh_gtk.c:147
+#: src/imap_gtk.c:198 src/mh_gtk.c:147
 msgid "Inherit properties from parent folder"
 msgstr ""
 
-#: src/imap_gtk.c:260 src/mh_gtk.c:253 src/news_gtk.c:305
-#: src/plugins/mailmbox/plugin_gtk.c:413 src/plugins/rssyl/rssyl_cb_menu.c:199
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
+#: src/plugins/mailmbox/plugin_gtk.c:411 src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2048
 #, c-format
 msgid "Input new name for '%s':"
 msgstr ""
 
-#: src/imap_gtk.c:262 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:414
-#: src/plugins/rssyl/rssyl_cb_menu.c:200
-#: src/plugins/vcalendar/vcal_folder.c:2036
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:412
+#: src/plugins/rssyl/rssyl_cb_menu.c:198
+#: src/plugins/vcalendar/vcal_folder.c:2049
 msgid "Rename folder"
 msgstr ""
 
-#: src/imap_gtk.c:291 src/mh_gtk.c:281 src/news_gtk.c:327
-#: src/plugins/mailmbox/plugin_gtk.c:444 src/plugins/rssyl/rssyl_cb_menu.c:226
-#: src/plugins/vcalendar/vcal_folder.c:2056
+#: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
+#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:224
+#: src/plugins/vcalendar/vcal_folder.c:2069
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgstr ""
 
-#: src/imap_gtk.c:359 src/mh_gtk.c:202 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:357 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -5693,44 +5716,44 @@ msgid ""
 "Do you really want to delete?"
 msgstr ""
 
-#: src/imap_gtk.c:380 src/news_gtk.c:280 src/plugins/mailmbox/plugin_gtk.c:349
-#: src/plugins/rssyl/rssyl_cb_menu.c:173
-#: src/plugins/vcalendar/vcal_folder.c:1989
+#: src/imap_gtk.c:376 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/plugins/rssyl/rssyl_cb_menu.c:171
+#: src/plugins/vcalendar/vcal_folder.c:2002
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr ""
 
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:498
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr ""
 
-#: src/imap_gtk.c:509
+#: src/imap_gtk.c:501
 msgid "Search recursively"
 msgstr ""
 
-#: src/imap_gtk.c:514 src/imap_gtk.c:573
+#: src/imap_gtk.c:506 src/imap_gtk.c:565
 msgid "Subscriptions"
 msgstr ""
 
-#: src/imap_gtk.c:515
+#: src/imap_gtk.c:507
 msgid "_Search"
 msgstr ""
 
-#: src/imap_gtk.c:525
+#: src/imap_gtk.c:517
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr ""
 
-#: src/imap_gtk.c:536 src/mainwindow.c:675
+#: src/imap_gtk.c:528 src/mainwindow.c:679
 msgid "Subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:538 src/imap_gtk.c:540
+#: src/imap_gtk.c:530 src/imap_gtk.c:532
 msgid "All of them"
 msgstr ""
 
-#: src/imap_gtk.c:556
+#: src/imap_gtk.c:548
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -5738,29 +5761,29 @@ msgid ""
 "\"Check for new folders\" at the mailbox's root folder."
 msgstr ""
 
-#: src/imap_gtk.c:565
+#: src/imap_gtk.c:557
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr ""
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:558
 msgid "subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:558
 msgid "unsubscribe"
 msgstr ""
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
+#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
 #: src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr ""
 
-#: src/imap_gtk.c:574
+#: src/imap_gtk.c:566
 msgid "_Subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:575 src/news_gtk.c:267
+#: src/imap_gtk.c:567 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr ""
 
@@ -5896,7 +5919,7 @@ msgid "This button will update the list above with the data supplied."
 msgstr ""
 
 #: src/importldif.c:911
-msgid "Records Imported :"
+msgid "Records Imported:"
 msgstr ""
 
 #: src/importldif.c:943
@@ -5935,222 +5958,222 @@ msgstr ""
 msgid "Import Pine file into Address Book"
 msgstr ""
 
-#: src/inc.c:186 src/inc.c:295 src/inc.c:322
+#: src/inc.c:186 src/inc.c:294 src/inc.c:321
 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 
-#: src/inc.c:344
+#: src/inc.c:343
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: src/inc.c:417
+#: src/inc.c:416
 msgid "Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:478
+#: src/inc.c:474
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:621 src/inc.c:675
+#: src/inc.c:615 src/inc.c:669
 msgid "Cancelled"
 msgstr ""
 
-#: src/inc.c:632
+#: src/inc.c:626
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:641
+#: src/inc.c:635
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:647
+#: src/inc.c:641
 msgid "Done (no new messages)"
 msgstr ""
 
-#: src/inc.c:652
+#: src/inc.c:646
 msgid "Connection failed"
 msgstr ""
 
-#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
 msgid "Auth failed"
 msgstr ""
 
-#: src/inc.c:662 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2801 src/summaryview.c:6342
+#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:446
+#: src/prefs_summary_column.c:88 src/summaryview.c:2782 src/summaryview.c:6292
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:759
+#: src/inc.c:752
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:763
+#: src/inc.c:756
 msgid "Finished (no new messages)"
 msgstr ""
 
-#: src/inc.c:802
+#: src/inc.c:795
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:832
+#: src/inc.c:825
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr ""
 
-#: src/inc.c:850
+#: src/inc.c:843
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr ""
 
-#: src/inc.c:854
+#: src/inc.c:847
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr ""
 
-#: src/inc.c:934 src/plugins/managesieve/managesieve.c:427
-#: src/send_message.c:497
+#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
+#: src/send_message.c:496
 msgid "Authenticating..."
 msgstr ""
 
-#: src/inc.c:936
+#: src/inc.c:929
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr ""
 
-#: src/inc.c:942
+#: src/inc.c:935
 msgid "Getting the number of new messages (STAT)..."
 msgstr ""
 
-#: src/inc.c:946
+#: src/inc.c:939
 msgid "Getting the number of new messages (LAST)..."
 msgstr ""
 
-#: src/inc.c:950
+#: src/inc.c:943
 msgid "Getting the number of new messages (UIDL)..."
 msgstr ""
 
-#: src/inc.c:954
+#: src/inc.c:947
 msgid "Getting the size of messages (LIST)..."
 msgstr ""
 
-#: src/inc.c:961 src/send_message.c:515
+#: src/inc.c:954 src/send_message.c:514
 msgid "Quitting"
 msgstr ""
 
-#: src/inc.c:986
+#: src/inc.c:979
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr ""
 
-#: src/inc.c:999
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1158
+#: src/inc.c:1151
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr ""
 
-#: src/inc.c:1163
+#: src/inc.c:1156
 msgid "Error occurred while processing mail."
 msgstr ""
 
-#: src/inc.c:1169
+#: src/inc.c:1162
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1175
+#: src/inc.c:1168
 msgid "No disk space left."
 msgstr ""
 
-#: src/inc.c:1180
+#: src/inc.c:1173
 msgid "Can't write file."
 msgstr ""
 
-#: src/inc.c:1185
+#: src/inc.c:1178
 msgid "Socket error."
 msgstr ""
 
-#: src/inc.c:1188
+#: src/inc.c:1181
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 
-#: src/inc.c:1193 src/send_message.c:426 src/send_message.c:689
+#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1196
+#: src/inc.c:1189
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1201
+#: src/inc.c:1194
 msgid "Mailbox is locked."
 msgstr ""
 
-#: src/inc.c:1205
+#: src/inc.c:1198
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1211 src/send_message.c:674
+#: src/inc.c:1204 src/send_message.c:673
 msgid "Authentication failed."
 msgstr ""
 
-#: src/inc.c:1217 src/send_message.c:677
+#: src/inc.c:1210 src/send_message.c:676
 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1222 src/send_message.c:693
+#: src/inc.c:1215 src/send_message.c:692
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
 
-#: src/inc.c:1227
+#: src/inc.c:1220
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr ""
 
-#: src/inc.c:1265
+#: src/inc.c:1258
 msgid "Incorporation cancelled\n"
 msgstr ""
 
-#: src/inc.c:1530
+#: src/inc.c:1523
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr ""
 
-#: src/inc.c:1536
+#: src/inc.c:1529
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
 
-#: src/inc.c:1543
+#: src/inc.c:1536
 msgid "On_ly once"
 msgstr ""
 
@@ -6162,21 +6185,21 @@ msgstr ""
 msgid "Nick Name"
 msgstr ""
 
-#: src/main.c:242
+#: src/main.c:244
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
 msgstr ""
 
-#: src/main.c:363
+#: src/main.c:365
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
 msgstr ""
 
-#: src/main.c:365
+#: src/main.c:367
 #, c-format
 msgid ""
 "\n"
@@ -6185,42 +6208,42 @@ msgid ""
 "script available at %s."
 msgstr ""
 
-#: src/main.c:377
+#: src/main.c:379
 msgid "Keep old configuration"
 msgstr ""
 
-#: src/main.c:380
+#: src/main.c:382
 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 ""
 
-#: src/main.c:388
+#: src/main.c:390
 msgid "Migration of configuration"
 msgstr ""
 
-#: src/main.c:399
+#: src/main.c:401
 msgid "Copying configuration... This may take a while..."
 msgstr ""
 
-#: src/main.c:408
+#: src/main.c:410
 msgid "Migration failed!"
 msgstr ""
 
-#: src/main.c:417
+#: src/main.c:419
 msgid "Migrating configuration..."
 msgstr ""
 
-#: src/main.c:1117
+#: src/main.c:1119
 msgid "g_thread is not supported by glib.\n"
 msgstr ""
 
-#: src/main.c:1137 src/main.c:1141 src/main.c:1145
+#: src/main.c:1139 src/main.c:1143 src/main.c:1147
 msgid "(or older)"
 msgstr ""
 
-#: src/main.c:1445
+#: src/main.c:1448
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6233,50 +6256,50 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.c:1473
+#: src/main.c:1499
 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 ""
 
-#: src/main.c:1479
+#: src/main.c:1505
 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 ""
 
-#: src/main.c:1729
+#: src/main.c:1750
 msgid "Missing filename\n"
 msgstr ""
 
-#: src/main.c:1736
+#: src/main.c:1757
 msgid "Cannot open filename for reading\n"
 msgstr ""
 
-#: src/main.c:1747
+#: src/main.c:1768
 msgid "Malformed header\n"
 msgstr ""
 
-#: src/main.c:1754
+#: src/main.c:1775
 msgid "Duplicated 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1765
+#: src/main.c:1786
 msgid "Missing required 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1908
+#: src/main.c:1929
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:1910
+#: src/main.c:1931
 msgid "  --compose [address]    open composition window"
 msgstr ""
 
-#: src/main.c:1911
+#: src/main.c:1932
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6287,34 +6310,34 @@ msgid ""
 "                         empty line, then mail body until end of file."
 msgstr ""
 
-#: src/main.c:1916
+#: src/main.c:1937
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 
-#: src/main.c:1917
+#: src/main.c:1938
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:1920
+#: src/main.c:1941
 msgid "  --receive              receive new messages"
 msgstr ""
 
-#: src/main.c:1921
+#: src/main.c:1942
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 
-#: src/main.c:1922
+#: src/main.c:1943
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr ""
 
-#: src/main.c:1923
+#: src/main.c:1944
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr ""
 
-#: src/main.c:1924
+#: src/main.c:1945
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6325,1003 +6348,1018 @@ msgid ""
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 
-#: src/main.c:1931
+#: src/main.c:1952
 msgid "  --send                 send all queued messages"
 msgstr ""
 
-#: src/main.c:1932
+#: src/main.c:1953
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 
-#: src/main.c:1933
+#: src/main.c:1954
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:1956
 msgid "  --statistics           show session statistics"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:1957
 msgid "  --reset-statistics     reset session statistics"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:1958
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgstr ""
 
-#: src/main.c:1939
+#: src/main.c:1960
 msgid "  --online               switch to online mode"
 msgstr ""
 
-#: src/main.c:1940
+#: src/main.c:1961
 msgid "  --offline              switch to offline mode"
 msgstr ""
 
-#: src/main.c:1941
+#: src/main.c:1962
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:1963
 msgid "  --debug                debug mode"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:1964
 msgid "  --toggle-debug         toggle debug mode"
 msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:1965
 msgid "  --help -h              display this help and exit"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:1966
 msgid "  --version -v           output version information and exit"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:1967
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:1968
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 
-#: src/main.c:1948
+#: src/main.c:1969
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
 msgstr ""
 
-#: src/main.c:1998
+#: src/main.c:1971
+msgid ""
+"  --geometry -geometry WxH+X+Y\n"
+"                         set geometry for main window"
+msgstr ""
+
+#: src/main.c:2024
 msgid "Unknown option\n"
 msgstr ""
 
-#: src/main.c:2016
+#: src/main.c:2042
 #, c-format
 msgid "Processing (%s)..."
 msgstr ""
 
-#: src/main.c:2019
+#: src/main.c:2045
 msgid "top level folder"
 msgstr ""
 
-#: src/main.c:2102
+#: src/main.c:2128
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:2103
+#: src/main.c:2129
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 
-#: src/main.c:2845
+#: src/main.c:2871
 msgid "NetworkManager: network is online.\n"
 msgstr ""
 
-#: src/main.c:2851
+#: src/main.c:2877
 msgid "NetworkManager: network is offline.\n"
 msgstr ""
 
-#: src/mainwindow.c:507 src/messageview.c:209
+#: src/mainwindow.c:511 src/messageview.c:208
 msgid "_File"
 msgstr ""
 
-#: src/mainwindow.c:509 src/messageview.c:211 src/summaryview.c:433
+#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
 msgid "_View"
 msgstr ""
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:516
 msgid "_Configuration"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:520
 msgid "_Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "MH..."
 msgstr ""
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:524
 msgid "Change mailbox order..."
 msgstr ""
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "_Import mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:528
 msgid "_Export to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:529
 msgid "_Export selected to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "Empty all _Trash folders"
 msgstr "Empty all Was_tebin folders"
 
-#: src/mainwindow.c:530 src/messageview.c:218
+#: src/mainwindow.c:534 src/messageview.c:217
 msgid "_Save email as..."
 msgstr ""
 
-#: src/mainwindow.c:531 src/messageview.c:219
+#: src/mainwindow.c:535 src/messageview.c:218
 msgid "_Save part as..."
 msgstr ""
 
-#: src/mainwindow.c:534 src/messageview.c:220
+#: src/mainwindow.c:538 src/messageview.c:219
 msgid "Page setup..."
 msgstr ""
 
-#: src/mainwindow.c:535 src/messageview.c:221
+#: src/mainwindow.c:539 src/messageview.c:220
 msgid "_Print..."
 msgstr ""
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:541
 msgid "Synchronise folders"
 msgstr ""
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "E_xit"
 msgstr ""
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "Select _thread"
 msgstr ""
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:550
 msgid "_Find in current message..."
 msgstr ""
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:552
 msgid "_Quick search"
 msgstr ""
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "Show or hi_de"
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "_Toolbar"
 msgstr ""
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:558
 msgid "Set displayed _columns"
 msgstr ""
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "In _folder list..."
 msgstr ""
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "In _message list..."
 msgstr ""
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "La_yout"
 msgstr ""
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "_Sort"
 msgstr ""
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:570
 msgid "_Attract by subject"
 msgstr ""
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:572
 msgid "E_xpand all threads"
 msgstr ""
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "Co_llapse all threads"
 msgstr ""
 
-#: src/mainwindow.c:571 src/messageview.c:232
+#: src/mainwindow.c:575 src/messageview.c:231
 msgid "_Go to"
 msgstr ""
 
-#: src/mainwindow.c:572 src/messageview.c:233
+#: src/mainwindow.c:576 src/messageview.c:232
 msgid "_Previous message"
 msgstr ""
 
-#: src/mainwindow.c:573 src/messageview.c:234
+#: src/mainwindow.c:577 src/messageview.c:233
 msgid "_Next message"
 msgstr ""
 
-#: src/mainwindow.c:575 src/messageview.c:236
+#: src/mainwindow.c:579 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr ""
 
-#: src/mainwindow.c:576 src/messageview.c:237
+#: src/mainwindow.c:580 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr ""
 
-#: src/mainwindow.c:578 src/messageview.c:239
+#: src/mainwindow.c:582 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr ""
 
-#: src/mainwindow.c:579 src/messageview.c:240
+#: src/mainwindow.c:583 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr ""
 
-#: src/mainwindow.c:581 src/messageview.c:242
+#: src/mainwindow.c:585 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr ""
 
-#: src/mainwindow.c:582 src/messageview.c:243
+#: src/mainwindow.c:586 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr ""
 
-#: src/mainwindow.c:584 src/messageview.c:245
+#: src/mainwindow.c:588 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "Previous _labelled message"
 
-#: src/mainwindow.c:585 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Next la_belled message"
 
-#: src/mainwindow.c:587 src/messageview.c:248
+#: src/mainwindow.c:591 src/messageview.c:247
 msgid "Previous opened message"
 msgstr ""
 
-#: src/mainwindow.c:588 src/messageview.c:249
+#: src/mainwindow.c:592 src/messageview.c:248
 msgid "Next opened message"
 msgstr ""
 
-#: src/mainwindow.c:590 src/messageview.c:251
+#: src/mainwindow.c:594 src/messageview.c:250
 msgid "Parent message"
 msgstr ""
 
-#: src/mainwindow.c:592 src/messageview.c:253
+#: src/mainwindow.c:596 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr ""
 
-#: src/mainwindow.c:593 src/messageview.c:254
-msgid "_Other folder..."
+#: src/mainwindow.c:597 src/messageview.c:253
+msgid "F_older..."
 msgstr ""
 
-#: src/mainwindow.c:595 src/messageview.c:256 src/mimeview.c:200
+#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
 msgid "Next part"
 msgstr ""
 
-#: src/mainwindow.c:596 src/messageview.c:257 src/mimeview.c:201
+#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
 msgid "Previous part"
 msgstr ""
 
-#: src/mainwindow.c:599 src/messageview.c:258
+#: src/mainwindow.c:603 src/messageview.c:257
 msgid "Message scroll"
 msgstr ""
 
-#: src/mainwindow.c:600 src/messageview.c:259
+#: src/mainwindow.c:604 src/messageview.c:258
 msgid "Previous line"
 msgstr ""
 
-#: src/mainwindow.c:601 src/messageview.c:260
+#: src/mainwindow.c:605 src/messageview.c:259
 msgid "Next line"
 msgstr ""
 
-#: src/mainwindow.c:602 src/messageview.c:261 src/printing.c:481
+#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
 msgid "Previous page"
 msgstr ""
 
-#: src/mainwindow.c:603 src/messageview.c:262 src/printing.c:488
+#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
 msgid "Next page"
 msgstr ""
 
-#: src/mainwindow.c:621 src/messageview.c:280
+#: src/mainwindow.c:625 src/messageview.c:279
 msgid "Decode"
 msgstr ""
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:632
 msgid "Open in new _window"
 msgstr ""
 
-#: src/mainwindow.c:629 src/messageview.c:287
+#: src/mainwindow.c:633 src/messageview.c:286
 msgid "Mess_age source"
 msgstr ""
 
-#: src/mainwindow.c:631 src/messageview.c:288
+#: src/mainwindow.c:635 src/messageview.c:287
 msgid "Message part"
 msgstr ""
 
-#: src/mainwindow.c:632 src/messageview.c:289
+#: src/mainwindow.c:636 src/messageview.c:288
 msgid "View as text"
 msgstr ""
 
-#: src/mainwindow.c:633 src/messageview.c:290 src/toolbar.c:403
+#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
 msgid "Open"
 msgstr ""
 
-#: src/mainwindow.c:635 src/messageview.c:292
+#: src/mainwindow.c:639 src/messageview.c:291
 msgid "Open with..."
 msgstr ""
 
-#: src/mainwindow.c:639 src/messageview.c:295
+#: src/mainwindow.c:643 src/messageview.c:294
 msgid "Quotes"
 msgstr ""
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:645
 msgid "_Update summary"
 msgstr ""
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:648
 msgid "Recei_ve"
 msgstr ""
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:649
 msgid "Get from _current account"
 msgstr ""
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:650
 msgid "Get from _all accounts"
 msgstr ""
 
-#: src/mainwindow.c:647
+#: src/mainwindow.c:651
 msgid "Cancel receivin_g"
 msgstr ""
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:654
 msgid "_Send queued messages"
 msgstr ""
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:659
 msgid "Compose a_n email message"
 msgstr ""
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:660
 msgid "Compose a news message"
 msgstr ""
 
-#: src/mainwindow.c:658 src/messageview.c:301
+#: src/mainwindow.c:662 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr ""
 
-#: src/mainwindow.c:659 src/messageview.c:302 src/summaryview.c:425
+#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr ""
 
-#: src/mainwindow.c:662 src/messageview.c:305
+#: src/mainwindow.c:666 src/messageview.c:304
 msgid "Mailing _list"
 msgstr ""
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:667
 msgid "Follow-up and reply to"
 msgstr ""
 
-#: src/mainwindow.c:666 src/messageview.c:308 src/toolbar.c:2069
+#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
 msgid "_Forward"
 msgstr ""
 
-#: src/mainwindow.c:667 src/messageview.c:309 src/toolbar.c:2070
+#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr ""
 
-#: src/mainwindow.c:668 src/messageview.c:310 src/toolbar.c:2071
+#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr ""
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:674
 msgid "Mailing-_List"
 msgstr ""
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:675
 msgid "Post"
 msgstr ""
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:677
 msgid "Help"
 msgstr ""
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:681
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "View archive"
 msgstr ""
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:685
 msgid "Contact owner"
 msgstr ""
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:689
 msgid "M_ove..."
 msgstr ""
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "_Copy..."
 msgstr ""
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "Move to _trash"
 msgstr "Move to was_tebin"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:692
 msgid "_Delete..."
 msgstr ""
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:693
 msgid "Move thread to tr_ash"
 msgstr "Move thread to was_tebin"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:694
 msgid "Delete t_hread"
 msgstr ""
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:695
 msgid "Cancel a news message"
 msgstr ""
 
-#: src/mainwindow.c:694 src/mainwindow.c:695 src/summaryview.c:426
+#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
 msgid "_Mark"
 msgstr ""
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:700
 msgid "_Unmark"
 msgstr ""
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:703
 msgid "Mark as unr_ead"
 msgstr ""
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:704
 msgid "Mark as rea_d"
 msgstr ""
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:706
 msgid "Mark all read"
 msgstr ""
 
-#: src/mainwindow.c:704 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr ""
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "Unignore thread"
 msgstr ""
 
-#: src/mainwindow.c:706 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr ""
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "Unwatch thread"
 msgstr ""
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "Mark as _spam"
 msgstr ""
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "Mark as _ham"
 msgstr ""
 
-#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr ""
 
-#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr ""
 
-#: src/mainwindow.c:717 src/summaryview.c:427
+#: src/mainwindow.c:721 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "Colour la_bel"
 
-#: src/mainwindow.c:718 src/summaryview.c:428
+#: src/mainwindow.c:722 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr ""
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:725
 msgid "Re-_edit"
 msgstr ""
 
-#: src/mainwindow.c:724 src/messageview.c:311 src/mimeview.c:1021
+#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
 msgid "Check signature"
 msgstr ""
 
-#: src/mainwindow.c:729 src/messageview.c:315
+#: src/mainwindow.c:733 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr ""
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:735
 msgid "C_ollect addresses"
 msgstr ""
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:736
 msgid "From current _folder..."
 msgstr ""
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:737
 msgid "From selected _messages..."
 msgstr ""
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:740
 msgid "_Filter all messages in folder"
 msgstr ""
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:741
 msgid "Filter _selected messages"
 msgstr ""
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:742
 msgid "Run folder pr_ocessing rules"
 msgstr ""
 
-#: src/mainwindow.c:740 src/messageview.c:318
+#: src/mainwindow.c:744 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr ""
 
-#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:319
-#: src/messageview.c:325
+#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
+#: src/messageview.c:324
 msgid "_Automatically"
 msgstr ""
 
-#: src/mainwindow.c:742 src/mainwindow.c:748 src/mainwindow.c:851
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
+#: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr ""
 
-#: src/mainwindow.c:743 src/mainwindow.c:749 src/mainwindow.c:852
-#: src/messageview.c:321 src/messageview.c:327
+#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
+#: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr ""
 
-#: src/mainwindow.c:744 src/mainwindow.c:750 src/messageview.c:322
-#: src/messageview.c:328
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _Subject"
 msgstr ""
 
-#: src/mainwindow.c:746 src/messageview.c:324 src/summaryview.c:431
+#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr ""
 
-#: src/mainwindow.c:753 src/messageview.c:332
+#: src/mainwindow.c:757 src/messageview.c:331
 msgid "List _URLs..."
 msgstr ""
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "Ch_eck for new messages in all folders"
 msgstr ""
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "Delete du_plicated messages"
 msgstr ""
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "In selected folder"
 msgstr ""
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:767
 msgid "In all folders"
 msgstr ""
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "E_xecute"
 msgstr ""
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:771
 msgid "Exp_unge"
 msgstr ""
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:774
 msgid "SSL cer_tificates"
 msgstr ""
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "Filtering Lo_g"
 msgstr ""
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "Network _Log"
 msgstr ""
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "_Forget all session passwords"
 msgstr ""
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:784
+msgid "Forget _master passphrase"
+msgstr ""
+
+#: src/mainwindow.c:788
 msgid "C_hange current account"
 msgstr ""
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:790
 msgid "_Preferences for current account..."
 msgstr ""
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:791
 msgid "Create _new account..."
 msgstr ""
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "_Edit accounts..."
 msgstr ""
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "P_references..."
 msgstr ""
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "Pre-pr_ocessing..."
 msgstr ""
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:797
 msgid "Post-pro_cessing..."
 msgstr ""
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "_Filtering..."
 msgstr ""
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:799
 msgid "_Templates..."
 msgstr ""
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "_Actions..."
 msgstr ""
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:801
 msgid "Tag_s..."
 msgstr ""
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:803
 msgid "Plu_gins..."
 msgstr ""
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:806
 msgid "_Manual"
 msgstr ""
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:807
 msgid "_Online User-contributed FAQ"
 msgstr ""
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:808
 msgid "Icon _Legend"
 msgstr ""
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "Set as default client"
 msgstr ""
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:817
 msgid "Offline _mode"
 msgstr ""
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:818
 msgid "Men_ubar"
 msgstr ""
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:819
 msgid "_Message view"
 msgstr ""
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "Status _bar"
 msgstr ""
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:823
 msgid "Column headers"
 msgstr ""
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "Th_read view"
 msgstr ""
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "Hide read threads"
 msgstr ""
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "_Hide read messages"
 msgstr ""
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "Hide deleted messages"
 msgstr ""
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "_Fullscreen"
 msgstr ""
 
-#: src/mainwindow.c:822 src/messageview.c:344
+#: src/mainwindow.c:829 src/messageview.c:343
 msgid "Show all _headers"
 msgstr ""
 
-#: src/mainwindow.c:823 src/messageview.c:345
+#: src/mainwindow.c:830 src/messageview.c:344
 msgid "_Collapse all"
 msgstr ""
 
-#: src/mainwindow.c:824 src/messageview.c:346
+#: src/mainwindow.c:831 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr ""
 
-#: src/mainwindow.c:825 src/messageview.c:347
+#: src/mainwindow.c:832 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr ""
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:836
 msgid "Text _below icons"
 msgstr ""
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "Text be_side icons"
 msgstr ""
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "_Icons only"
 msgstr ""
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:839
 msgid "_Text only"
 msgstr ""
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:846
 msgid "_Standard"
 msgstr ""
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "_Three columns"
 msgstr ""
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:848
 msgid "_Wide message"
 msgstr ""
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "W_ide message list"
 msgstr ""
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:850
 msgid "S_mall screen"
 msgstr ""
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:854
 msgid "By _number"
 msgstr ""
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:855
 msgid "By s_ize"
 msgstr ""
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:856
 msgid "By _date"
 msgstr ""
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:857
 msgid "By thread date"
 msgstr ""
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:860
 msgid "By s_ubject"
 msgstr ""
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "By _color label"
 msgstr "By _colour label"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:862
 msgid "By tag"
 msgstr ""
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "By _mark"
 msgstr ""
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:864
 msgid "By _status"
 msgstr ""
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:865
 msgid "By a_ttachment"
 msgstr ""
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:866
 msgid "By score"
 msgstr ""
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:867
 msgid "By locked"
 msgstr ""
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:868
 msgid "D_on't sort"
 msgstr ""
 
-#: src/mainwindow.c:865 src/prefs_summaries.c:455
+#: src/mainwindow.c:872 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr ""
 
-#: src/mainwindow.c:866 src/prefs_summaries.c:456
+#: src/mainwindow.c:873 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr ""
 
-#: src/mainwindow.c:908 src/messageview.c:389
+#: src/mainwindow.c:915 src/messageview.c:388
 msgid "_Auto detect"
 msgstr ""
 
-#: src/mainwindow.c:1305 src/summaryview.c:6268
+#: src/mainwindow.c:1312 src/summaryview.c:6218
 msgid "Apply tags..."
 msgstr ""
 
-#: src/mainwindow.c:1949
+#: src/mainwindow.c:1959
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 
-#: src/mainwindow.c:1964
+#: src/mainwindow.c:1974
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 
-#: src/mainwindow.c:1967
+#: src/mainwindow.c:1977
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1991
 msgid "Select account"
 msgstr ""
 
-#: src/mainwindow.c:2008 src/prefs_logging.c:140
+#: src/mainwindow.c:2018 src/prefs_logging.c:140
 msgid "Network log"
 msgstr ""
 
-#: src/mainwindow.c:2012
+#: src/mainwindow.c:2022
 msgid "Filtering/Processing debug log"
 msgstr ""
 
-#: src/mainwindow.c:2031 src/prefs_logging.c:392
+#: src/mainwindow.c:2041 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2033 src/prefs_logging.c:394
+#: src/mainwindow.c:2043 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2476 src/mainwindow.c:2483 src/mainwindow.c:2526
-#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
-#: src/plugins/notification/notification_trayicon.c:360
+#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
+#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
 msgid "Untitled"
 msgstr ""
 
-#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
 msgid "none"
 msgstr ""
 
-#: src/mainwindow.c:2894 src/mainwindow.c:2898
+#: src/mainwindow.c:2904 src/mainwindow.c:2908
 msgid "Delete all messages in trash folders?"
 msgstr "Delete all messages in wastebin folders?"
 
-#: src/mainwindow.c:2895
+#: src/mainwindow.c:2905
 msgid "Don't quit"
 msgstr ""
 
-#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2925
+#: src/mainwindow.c:2935
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 
-#: src/mainwindow.c:2931 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr ""
 
-#: src/mainwindow.c:2936 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:740
+#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:741
 msgid "Mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
 
-#: src/mainwindow.c:3394
+#: src/mainwindow.c:3413
 msgid "No posting allowed"
 msgstr ""
 
-#: src/mainwindow.c:3977
+#: src/mainwindow.c:3996
 msgid "Mbox import has failed."
 msgstr ""
 
-#: src/mainwindow.c:3986 src/mainwindow.c:3995
+#: src/mainwindow.c:4005 src/mainwindow.c:4014
 msgid "Export to mbox has failed."
 msgstr ""
 
-#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:548
 msgid "Exit"
 msgstr ""
 
-#: src/mainwindow.c:4036 src/plugins/notification/notification_trayicon.c:509
+#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:548
 msgid "Exit Claws Mail?"
 msgstr ""
 
-#: src/mainwindow.c:4227
+#: src/mainwindow.c:4246
 msgid "Folder synchronisation"
 msgstr ""
 
-#: src/mainwindow.c:4228
+#: src/mainwindow.c:4247
 msgid "Do you want to synchronise your folders now?"
 msgstr ""
 
-#: src/mainwindow.c:4229
+#: src/mainwindow.c:4248
 msgid "_Synchronise"
 msgstr ""
 
-#: src/mainwindow.c:4670
+#: src/mainwindow.c:4689
 msgid "Deleting duplicated messages..."
 msgstr ""
 
-#: src/mainwindow.c:4707
+#: src/mainwindow.c:4726
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mainwindow.c:4968 src/summaryview.c:5759
+#: src/mainwindow.c:4982 src/summaryview.c:5709
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
-#: src/mainwindow.c:4976
+#: src/mainwindow.c:4990
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
-#: src/mainwindow.c:4984 src/summaryview.c:5770
+#: src/mainwindow.c:4998 src/summaryview.c:5720
 msgid "Filtering configuration"
 msgstr ""
 
-#: src/mainwindow.c:5099
+#: src/mainwindow.c:5113
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 
-#: src/mainwindow.c:5158
+#: src/mainwindow.c:5172
 msgid "Claws Mail has been registered as default client."
 msgstr ""
 
-#: src/mainwindow.c:5160
+#: src/mainwindow.c:5174
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 
-#: src/mainwindow.c:5318
+#: src/mainwindow.c:5188 src/setup.c:91
+#, c-format
+msgid "Scanning folder %s%c%s..."
+msgstr ""
+
+#: src/mainwindow.c:5332
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7399,7 +7437,7 @@ msgstr ""
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: src/mbox.c:555 src/messageview.c:1848 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr ""
@@ -7443,19 +7481,19 @@ msgstr ""
 msgid "Search finished"
 msgstr ""
 
-#: src/messageview.c:298 src/textview.c:238
+#: src/messageview.c:297 src/textview.c:238
 msgid "Compose _new message"
 msgstr ""
 
-#: src/messageview.c:714 src/messageview.c:1393 src/messageview.c:1590
+#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
 msgid "Claws Mail - Message View"
 msgstr ""
 
-#: src/messageview.c:841
+#: src/messageview.c:840
 msgid "<No Return-Path found>"
 msgstr ""
 
-#: src/messageview.c:849
+#: src/messageview.c:848
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7465,11 +7503,11 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 
-#: src/messageview.c:856 src/messageview.c:873
+#: src/messageview.c:855 src/messageview.c:872
 msgid "_Don't Send"
 msgstr ""
 
-#: src/messageview.c:869
+#: src/messageview.c:868
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7477,108 +7515,108 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 
-#: src/messageview.c:1323
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr ""
 
-#: src/messageview.c:1359 src/procmime.c:1007
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
 
-#: src/messageview.c:1440 src/messageview.c:1448
+#: src/messageview.c:1493 src/messageview.c:1501
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 
-#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4837
-#: src/summaryview.c:4840 src/textview.c:3063
+#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
+#: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr ""
 
-#: src/messageview.c:1849
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr ""
 
-#: src/messageview.c:1857 src/summaryview.c:4857 src/summaryview.c:4860
-#: src/summaryview.c:4875
+#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 
-#: src/messageview.c:1910
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr ""
 
-#: src/messageview.c:1912
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr ""
 
-#: src/messageview.c:1943
+#: src/messageview.c:1950
 msgid ""
-"You got a return receipt for this message : it has been displayed by the "
+"You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr ""
 
-#: src/messageview.c:1946
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr ""
 
-#: src/messageview.c:1952
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr ""
 
-#: src/messageview.c:1953
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr ""
 
-#: src/messageview.c:1996
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 
-#: src/messageview.c:2002
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
 
-#: src/messageview.c:2006 src/messageview.c:2028
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr ""
 
-#: src/messageview.c:2007 src/messageview.c:2019
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr ""
 
-#: src/messageview.c:2012
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
 msgstr ""
 
-#: src/messageview.c:2017 src/messageview.c:2030
+#: src/messageview.c:2024 src/messageview.c:2037
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr ""
 
-#: src/messageview.c:2023
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
 msgstr ""
 
-#: src/messageview.c:2096
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr ""
 
-#: src/messageview.c:2097
+#: src/messageview.c:2104
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -7586,46 +7624,46 @@ msgid ""
 "notification:"
 msgstr ""
 
-#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:507
+#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr ""
 
-#: src/messageview.c:2101
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr ""
 
-#: src/messageview.c:2190
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr ""
 
-#: src/messageview.c:2952
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
 msgstr ""
 
-#: src/messageview.c:2960
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
 msgstr ""
 
-#: src/messageview.c:2961
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
 msgstr ""
 
-#: src/messageview.c:2994 src/messageview.c:3000 src/summaryview.c:4207
-#: src/summaryview.c:7037
+#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
+#: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr ""
 
-#: src/mh.c:530
+#: src/mh.c:527
 msgid "Moving messages..."
 msgstr ""
 
-#: src/mh.c:674 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr ""
 
@@ -7633,7 +7671,7 @@ msgstr ""
 msgid "Remove _mailbox..."
 msgstr ""
 
-#: src/mh_gtk.c:223
+#: src/mh_gtk.c:222
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -7641,14 +7679,14 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/mh_gtk.c:365 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:364 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
 
-#: src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr ""
 
@@ -7718,7 +7756,7 @@ msgid "Go back to email"
 msgstr ""
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:424
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
@@ -7777,7 +7815,7 @@ msgid "Type:"
 msgstr ""
 
 #: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2695
+#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2676
 msgid "Size:"
 msgstr ""
 
@@ -7787,81 +7825,80 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: src/news.c:302
+#: src/news.c:303
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr ""
 
-#: src/news.c:335
+#: src/news.c:336
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr ""
 
-#: src/news.c:356
+#: src/news.c:357
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr ""
 
-#: src/news.c:437
+#: src/news.c:438
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 
-#: src/news.c:446
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr ""
 
-#: src/news.c:450
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr ""
 
-#: src/news.c:465
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr ""
 
-#: src/news.c:490
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 
-#: src/news.c:861
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr ""
 
-#: src/news.c:1050 src/news.c:1220
+#: src/news.c:1054 src/news.c:1224
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr ""
 
-#: src/news.c:1059
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr ""
 
-#: src/news.c:1129 src/news.c:1153 src/news.c:1177
+#: src/news.c:1133 src/news.c:1157 src/news.c:1181
 msgid "couldn't get xhdr\n"
 msgstr ""
 
-#: src/news.c:1213
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
 
-#: src/news.c:1228
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr ""
 
-#: src/news.c:1243
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr ""
 
-#: src/news.c:1445
+#: src/news.c:1449
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
-"Mail has been built without News support; your News account(s) are "
-"disabled.\n"
+"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 ""
@@ -7874,19 +7911,57 @@ msgstr ""
 msgid "_Unsubscribe newsgroup"
 msgstr ""
 
-#: src/news_gtk.c:265
+#: src/news_gtk.c:250
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr ""
 
-#: src/news_gtk.c:266
+#: src/news_gtk.c:251
 msgid "Unsubscribe newsgroup"
 msgstr ""
 
-#: src/news_gtk.c:306
+#: src/news_gtk.c:291
 msgid "Rename newsgroup folder"
 msgstr ""
 
+#: src/password.c:128 src/password.c:129
+msgid "Input master passphrase"
+msgstr ""
+
+#: src/password.c:141
+msgid "Incorrect master passphrase."
+msgstr ""
+
+#: src/password_gtk.c:67
+msgid "New passphrases do not match, try again."
+msgstr ""
+
+#: src/password_gtk.c:80
+msgid "Incorrect old master passphrase entered, try again."
+msgstr ""
+
+#: src/password_gtk.c:144
+msgid "Changing master passphrase"
+msgstr ""
+
+#: src/password_gtk.c:165
+msgid ""
+"If a master passphrase is currently active, it\n"
+"needs to be entered."
+msgstr ""
+
+#: src/password_gtk.c:175
+msgid "Old passphrase:"
+msgstr ""
+
+#: src/password_gtk.c:191
+msgid "New passphrase:"
+msgstr ""
+
+#: src/password_gtk.c:202
+msgid "Confirm passphrase:"
+msgstr ""
+
 #: src/plugins/acpi_notifier/acpi_notifier.c:51
 msgid "Acpi Notifier"
 msgstr ""
@@ -8261,7 +8336,7 @@ msgstr ""
 
 #: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/archive/archiver_prefs.c:194
-#: src/plugins/pgpcore/select-keys.c:422
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "_Select"
 msgstr ""
 
@@ -8442,12 +8517,12 @@ msgid "Remove attachments"
 msgstr ""
 
 #: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:945
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:944
 msgid "Remove"
 msgstr ""
 
 #: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2789
+#: src/prefs_summary_column.c:80 src/summaryview.c:2770
 msgid "Attachment"
 msgstr ""
 
@@ -8603,7 +8678,7 @@ msgid "Bogofilter: learning from message..."
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter.c:779
-#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:511
+#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:513
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr ""
@@ -8635,12 +8710,12 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr ""
@@ -8665,7 +8740,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1507
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr ""
 
@@ -8766,15 +8841,15 @@ msgstr ""
 msgid "Bsfilter"
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:299
+#: src/plugins/bsfilter/bsfilter.c:300
 msgid "Bsfilter: fetching body..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:308
+#: src/plugins/bsfilter/bsfilter.c:309
 msgid "Bsfilter: filtering message..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:393
+#: src/plugins/bsfilter/bsfilter.c:394
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -8782,18 +8857,18 @@ msgid ""
 "a few hundred spam and ham messages."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:400
+#: src/plugins/bsfilter/bsfilter.c:401
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:501
+#: src/plugins/bsfilter/bsfilter.c:502
 msgid "Bsfilter: learning from message..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:641
+#: src/plugins/bsfilter/bsfilter.c:643
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -9149,7 +9224,7 @@ msgstr ""
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1441 src/prefs_account.c:1530 src/prefs_account.c:1991
+#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr ""
@@ -9158,93 +9233,93 @@ msgstr ""
 msgid "Select stylesheet"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:395
+#: src/plugins/fancy/fancy_viewer.c:387
 msgid "Remote content loading is disabled."
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:464
 msgid "Load images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:466
 msgid "Enable remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:476
+#: src/plugins/fancy/fancy_viewer.c:468
 msgid "Enable Javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:470
 msgid "Enable Plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:480
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable Java"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:482
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Open links with external browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:651
+#: src/plugins/fancy/fancy_viewer.c:643
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:707
+#: src/plugins/fancy/fancy_viewer.c:699
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:718
+#: src/plugins/fancy/fancy_viewer.c:710
 msgid "Search the Web"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:730
+#: src/plugins/fancy/fancy_viewer.c:722
 msgid "Open in Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:732
+#: src/plugins/fancy/fancy_viewer.c:724
 msgid "Open in Viewer (enable remote content)"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:741
+#: src/plugins/fancy/fancy_viewer.c:733
 msgid "Open in Browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:743
 msgid "Open Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:760
+#: src/plugins/fancy/fancy_viewer.c:752
 msgid "Copy Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:756
 msgid "Download Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:775
+#: src/plugins/fancy/fancy_viewer.c:767
 msgid "Save Image As"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:785
+#: src/plugins/fancy/fancy_viewer.c:777
 msgid "Copy Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:803
+#: src/plugins/fancy/fancy_viewer.c:795
 msgid "Import feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1016
+#: src/plugins/fancy/fancy_viewer.c:1007
 msgid "Fancy"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1044
+#: src/plugins/fancy/fancy_viewer.c:1035
 msgid "Fancy HTML Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1049
+#: src/plugins/fancy/fancy_viewer.c:1040
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9326,11 +9401,11 @@ msgid ""
 "RFC822 format"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:126
+#: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid "GData plugin: Authorization required"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:128
+#: src/plugins/gdata/cm_gdata_contacts.c:129
 msgid ""
 "You need to authorize Claws Mail to access your Google contact list to use "
 "the GData plugin.\n"
@@ -9341,29 +9416,29 @@ msgid ""
 "list."
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:143
+#: src/plugins/gdata/cm_gdata_contacts.c:144
 msgid "Step 1:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:149
+#: src/plugins/gdata/cm_gdata_contacts.c:150
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:153
+#: src/plugins/gdata/cm_gdata_contacts.c:154
 msgid "Step 2:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:159
+#: src/plugins/gdata/cm_gdata_contacts.c:160
 msgid "Enter code:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:325
+#: src/plugins/gdata/cm_gdata_contacts.c:326
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr ""
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:341
+#: src/plugins/gdata/cm_gdata_contacts.c:342
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -9371,98 +9446,98 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:343
+#: src/plugins/gdata/cm_gdata_contacts.c:344
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:353
+#: src/plugins/gdata/cm_gdata_contacts.c:354
 msgid "GData plugin: Starting async contacts query\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:374
+#: src/plugins/gdata/cm_gdata_contacts.c:375
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:411
+#: src/plugins/gdata/cm_gdata_contacts.c:412
 msgid "GData plugin: Groups received\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:418
+#: src/plugins/gdata/cm_gdata_contacts.c:419
 msgid "GData plugin: Starting async groups query\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:443
+#: src/plugins/gdata/cm_gdata_contacts.c:444
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:450
+#: src/plugins/gdata/cm_gdata_contacts.c:451
 msgid "GData plugin: Authorization successful\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:460
+#: src/plugins/gdata/cm_gdata_contacts.c:461
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:470
+#: src/plugins/gdata/cm_gdata_contacts.c:471
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:477
+#: src/plugins/gdata/cm_gdata_contacts.c:478
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:494
+#: src/plugins/gdata/cm_gdata_contacts.c:495
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:503
+#: src/plugins/gdata/cm_gdata_contacts.c:504
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:556
+#: src/plugins/gdata/cm_gdata_contacts.c:560
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77
-#: src/plugins/managesieve/sieve_prefs.c:200 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:78
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:152 src/wizard.c:1554
+#: src/plugins/gdata/cm_gdata_prefs.c:84
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
 msgid "Username:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:94
+#: src/plugins/gdata/cm_gdata_prefs.c:95
 msgid "Polling interval (seconds):"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:101
+#: src/plugins/gdata/cm_gdata_prefs.c:102
 msgid "Maximum number of results:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:137 src/plugins/gdata/gdata_plugin.c:101
-#: src/plugins/gdata/gdata_plugin.c:156
+#: src/plugins/gdata/cm_gdata_prefs.c:138 src/plugins/gdata/gdata_plugin.c:102
+#: src/plugins/gdata/gdata_plugin.c:165
 msgid "GData"
 msgstr ""
 
-#: src/plugins/gdata/gdata_plugin.c:107
+#: src/plugins/gdata/gdata_plugin.c:108
 msgid "Failed to register address completion hook in the GData plugin"
 msgstr ""
 
-#: src/plugins/gdata/gdata_plugin.c:114
+#: src/plugins/gdata/gdata_plugin.c:115
 msgid "Failed to register offline switch hook in the GData plugin"
 msgstr ""
 
-#: src/plugins/gdata/gdata_plugin.c:161
+#: src/plugins/gdata/gdata_plugin.c:170
 msgid ""
 "This plugin provides access to the GData protocol for Claws Mail.\n"
 "\n"
@@ -9473,7 +9548,7 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 
-#: src/plugins/gdata/gdata_plugin.c:187
+#: src/plugins/gdata/gdata_plugin.c:196
 msgid "GData integration"
 msgstr ""
 
@@ -9581,8 +9656,8 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1486
-#: src/prefs_matcher.c:336
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1490
+#: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr ""
 
@@ -9667,11 +9742,6 @@ msgid "Request timeout"
 msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
-#: src/plugins/notification/notification_prefs.c:1073
-#: src/plugins/notification/notification_prefs.c:1368
-#: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:557
-#: src/prefs_summaries.c:538
 msgid "second(s)"
 msgstr ""
 
@@ -9715,64 +9785,64 @@ msgstr ""
 #: src/plugins/mailmbox/plugin_gtk.c:330
 #, c-format
 msgid ""
-"All folder(s) and message(s) under '%s' will be deleted.\n"
+"All folders and messages under '%s' will be deleted.\n"
 "Do you really want to delete?"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:435
 msgid "No Sieve auth method available\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:443
+#: src/plugins/managesieve/managesieve.c:439
 msgid "Selected Sieve auth method not available\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:672
 msgid "Disconnected"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:680
+#: src/plugins/managesieve/managesieve.c:676
 #, c-format
 msgid "Disconnected: %s"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:728
-#: src/plugins/managesieve/managesieve.c:873
+#: src/plugins/managesieve/managesieve.c:724
+#: src/plugins/managesieve/managesieve.c:869
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:735
+#: src/plugins/managesieve/managesieve.c:731
 msgid "TLS failed"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:800
-#: src/plugins/managesieve/managesieve.c:816
-#: src/plugins/managesieve/managesieve.c:843
-#: src/plugins/managesieve/managesieve.c:925
-#: src/plugins/managesieve/managesieve.c:943
+#: src/plugins/managesieve/managesieve.c:796
+#: src/plugins/managesieve/managesieve.c:812
+#: src/plugins/managesieve/managesieve.c:839
+#: src/plugins/managesieve/managesieve.c:921
+#: src/plugins/managesieve/managesieve.c:939
 msgid "error occurred on SIEVE session\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:869
+#: src/plugins/managesieve/managesieve.c:865
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:878
+#: src/plugins/managesieve/managesieve.c:874
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:1135
+#: src/plugins/managesieve/managesieve.c:1131
 msgid "Sieve: retrying auth\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:1137
+#: src/plugins/managesieve/managesieve.c:1133
 msgid "Auth method not available"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5657
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5607
 msgid "_Filter"
 msgstr ""
 
@@ -9829,7 +9899,7 @@ msgid "%s - Sieve Filter%s"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1278
+#: src/plugins/pdf_viewer/poppler_viewer.c:1275
 msgid "Loading..."
 msgstr ""
 
@@ -9896,94 +9966,94 @@ msgstr ""
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:146
+#: src/plugins/managesieve/sieve_prefs.c:149
 msgid "Enable Sieve"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:153 src/prefs_account.c:1095
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1090
 msgid "Server information"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:162
+#: src/plugins/managesieve/sieve_prefs.c:165
 msgid "Server name"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:171
+#: src/plugins/managesieve/sieve_prefs.c:174
 msgid "Connect to this host instead of the host used for receiving mail"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:175
+#: src/plugins/managesieve/sieve_prefs.c:178
 msgid "Server port"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:182
+#: src/plugins/managesieve/sieve_prefs.c:185
 msgid "Connect to this port instead of the default"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:186
+#: src/plugins/managesieve/sieve_prefs.c:189
 msgid "Encryption"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/managesieve/sieve_prefs.c:194
 msgid "No TLS"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:193
+#: src/plugins/managesieve/sieve_prefs.c:196
 msgid "Use TLS when available"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:195
+#: src/plugins/managesieve/sieve_prefs.c:198
 msgid "Require TLS"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:203
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/managesieve/sieve_prefs.c:206
+#: src/plugins/rssyl/rssyl_feed_props.c:264
 msgid "No authentication"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:205
+#: src/plugins/managesieve/sieve_prefs.c:208
 msgid "Use same authentication as for receiving mail"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:207
+#: src/plugins/managesieve/sieve_prefs.c:210
 msgid "Specify authentication"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:237
-#: src/plugins/vcalendar/vcal_prefs.c:345
-#: src/plugins/vcalendar/vcal_prefs.c:464 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
+#: src/plugins/managesieve/sieve_prefs.c:240
+#: src/plugins/vcalendar/vcal_prefs.c:348
+#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
+#: src/prefs_account.c:1798
 msgid "User ID"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:247
-#: src/plugins/rssyl/rssyl_feed_props.c:394
-#: src/plugins/vcalendar/vcal_prefs.c:353
-#: src/plugins/vcalendar/vcal_prefs.c:472 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1208 src/wizard.c:1628
+#: src/plugins/managesieve/sieve_prefs.c:250
+#: src/plugins/rssyl/rssyl_feed_props.c:395
+#: src/plugins/vcalendar/vcal_prefs.c:356
+#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
+#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
+#: src/wizard.c:1215 src/wizard.c:1635
 msgid "Password"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:263 src/prefs_account.c:1569
-#: src/prefs_account.c:1763
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
+#: src/prefs_account.c:1770
 msgid "Authentication method"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:272 src/prefs_account.c:1579
-#: src/prefs_account.c:1772 src/prefs_send.c:291
+#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
+#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
 msgid "Automatic"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:379
+#: src/plugins/managesieve/sieve_prefs.c:391
 msgid "Sieve server must not contain a space."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:385
+#: src/plugins/managesieve/sieve_prefs.c:397
 msgid "Sieve server is not entered."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:413
+#: src/plugins/managesieve/sieve_prefs.c:425
 msgid "Sieve"
 msgstr ""
 
@@ -10111,7 +10181,7 @@ msgid "New Calendar message"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:340
-#: src/plugins/notification/notification_trayicon.c:866
+#: src/plugins/notification/notification_trayicon.c:905
 msgid "A new calendar message arrived"
 msgstr ""
 
@@ -10120,7 +10190,7 @@ msgid "New RSS feed article"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:344
-#: src/plugins/notification/notification_trayicon.c:869
+#: src/plugins/notification/notification_trayicon.c:908
 msgid "A new article in a RSS feed arrived"
 msgstr ""
 
@@ -10133,7 +10203,7 @@ msgid "Unknown message type arrived"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:381
-#: src/plugins/notification/notification_trayicon.c:638
+#: src/plugins/notification/notification_trayicon.c:677
 msgid "Present main window"
 msgstr ""
 
@@ -10158,7 +10228,7 @@ msgid "Calendar message"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:504
-#: src/plugins/notification/notification_trayicon.c:903
+#: src/plugins/notification/notification_trayicon.c:942
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -10196,7 +10266,7 @@ msgid "Popup"
 msgstr ""
 
 #: src/plugins/notification/notification_prefs.c:471 src/prefs_actions.c:263
-#: src/prefs_receive.c:133
+#: src/prefs_receive.c:152
 msgid "Command"
 msgstr ""
 
@@ -10257,12 +10327,12 @@ msgid "Show banner"
 msgstr ""
 
 #: src/plugins/notification/notification_prefs.c:767
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:143
-#: src/prefs_receive.c:183 src/prefs_summaries.c:504
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
+#: src/prefs_receive.c:231 src/prefs_summaries.c:504
 msgid "Never"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:769 src/prefs_receive.c:181
+#: src/plugins/notification/notification_prefs.c:769 src/prefs_receive.c:229
 #: src/prefs_summaries.c:486 src/prefs_summaries.c:505
 msgid "Always"
 msgstr ""
@@ -10291,8 +10361,7 @@ msgstr ""
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
-#: src/prefs_message.c:223
+#: src/plugins/notification/notification_prefs.c:850
 msgid "pixel(s)"
 msgstr ""
 
@@ -10359,6 +10428,14 @@ msgstr ""
 msgid "Popup timeout"
 msgstr ""
 
+#: src/plugins/notification/notification_prefs.c:1073
+#: src/plugins/notification/notification_prefs.c:1368
+#: src/plugins/notification/notification_prefs.c:1674
+#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
+#: src/prefs_receive.c:203 src/prefs_summaries.c:538
+msgid "seconds"
+msgstr ""
+
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
 msgstr ""
@@ -10467,74 +10544,78 @@ msgstr ""
 msgid "Toggle minimize"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:114
+#: src/plugins/notification/notification_trayicon.c:121
 msgid "_Get Mail"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:116
+#: src/plugins/notification/notification_trayicon.c:122
+msgid "_Get Mail from account"
+msgstr ""
+
+#: src/plugins/notification/notification_trayicon.c:124
 msgid "_Email"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:117
+#: src/plugins/notification/notification_trayicon.c:125
 msgid "E_mail from account"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:118
+#: src/plugins/notification/notification_trayicon.c:126
 msgid "Open A_ddressbook"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:119
+#: src/plugins/notification/notification_trayicon.c:127
 msgid "E_xit Claws Mail"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:124
+#: src/plugins/notification/notification_trayicon.c:132
 msgid "_Work Offline"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:126
+#: src/plugins/notification/notification_trayicon.c:134
 msgid "Show Trayicon Notifications"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:269
+#: src/plugins/notification/notification_trayicon.c:277
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:816
+#: src/plugins/notification/notification_trayicon.c:855
 msgid "New mail message"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:818
+#: src/plugins/notification/notification_trayicon.c:857
 msgid "New news post"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:820
+#: src/plugins/notification/notification_trayicon.c:859
 msgid "New calendar message"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:822
+#: src/plugins/notification/notification_trayicon.c:861
 msgid "New article in RSS feed"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:825
+#: src/plugins/notification/notification_trayicon.c:864
 msgid "New messages arrived"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:881
+#: src/plugins/notification/notification_trayicon.c:920
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_trayicon.c:892
+#: src/plugins/notification/notification_trayicon.c:931
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_trayicon.c:914
+#: src/plugins/notification/notification_trayicon.c:953
 #, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
@@ -10578,87 +10659,87 @@ msgstr ""
 msgid "PDF properties"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1329
+#: src/plugins/pdf_viewer/poppler_viewer.c:1326
 msgid "Enter password"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1330
+#: src/plugins/pdf_viewer/poppler_viewer.c:1327
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1345
+#: src/plugins/pdf_viewer/poppler_viewer.c:1342
 #, c-format
 msgid "%s Document"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1351
+#: src/plugins/pdf_viewer/poppler_viewer.c:1348
 #, c-format
 msgid "of %d"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1368
+#: src/plugins/pdf_viewer/poppler_viewer.c:1364
 msgid "PDF rendering failed for an unknown reason."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1732
-#: src/plugins/pdf_viewer/poppler_viewer.c:1950
+#: src/plugins/pdf_viewer/poppler_viewer.c:1728
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Document Index"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1913
 msgid "First Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1916
 msgid "Previous Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1919
 msgid "Next Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1922
 msgid "Last Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom In"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1932
+#: src/plugins/pdf_viewer/poppler_viewer.c:1927
 msgid "Zoom Out"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1935
+#: src/plugins/pdf_viewer/poppler_viewer.c:1930
 msgid "Fit Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
+#: src/plugins/pdf_viewer/poppler_viewer.c:1933
 msgid "Fit Page Width"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1941
+#: src/plugins/pdf_viewer/poppler_viewer.c:1936
 msgid "Rotate Left"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+#: src/plugins/pdf_viewer/poppler_viewer.c:1939
 msgid "Rotate Right"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1942
 msgid "Document Info"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1952
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Page Number"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1954
+#: src/plugins/pdf_viewer/poppler_viewer.c:1949
 msgid "Zoom Factor"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2059
+#: src/plugins/pdf_viewer/poppler_viewer.c:2054
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -10667,13 +10748,13 @@ msgid ""
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2065
-#: src/plugins/pdf_viewer/poppler_viewer.c:2073
-#: src/plugins/pdf_viewer/poppler_viewer.c:2093
+#: src/plugins/pdf_viewer/poppler_viewer.c:2060
+#: src/plugins/pdf_viewer/poppler_viewer.c:2068
+#: src/plugins/pdf_viewer/poppler_viewer.c:2088
 msgid "PDF Viewer"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2069
+#: src/plugins/pdf_viewer/poppler_viewer.c:2064
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -10691,101 +10772,97 @@ msgstr ""
 msgid "Failed to register PGP address autocompletion hook"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:127
+#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:127
 msgid "Passphrase"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:249
+#: src/plugins/pgpcore/passphrase.c:248
 msgid "[no user id]"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:261
+#: src/plugins/pgpcore/passphrase.c:260
 msgid "Please enter the passphrase for the new key:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:268
+#: src/plugins/pgpcore/passphrase.c:267
 msgid "Please re-enter the passphrase for the new key:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:273
+#: src/plugins/pgpcore/passphrase.c:272
 msgid "Please enter the passphrase for:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:276
+#: src/plugins/pgpcore/passphrase.c:275
 msgid "Bad passphrase.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:121
+#: src/plugins/pgpcore/pgp_viewer.c:173
 msgid "Key import"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:122
+#: src/plugins/pgpcore/pgp_viewer.c:174
 msgid ""
 "This key is not in your keyring. Do you want Claws Mail to try and import it "
 "from a keyserver?"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
+#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:279
 msgid ""
 "\n"
 "  Key ID "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:132 src/plugins/pgpcore/pgp_viewer.c:194
+#: src/plugins/pgpcore/pgp_viewer.c:184
 msgid "   This key is not in your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:133
+#: src/plugins/pgpcore/pgp_viewer.c:185
 msgid "   It should be possible to import it "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:135
+#: src/plugins/pgpcore/pgp_viewer.c:187
 msgid ""
 "when working online,\n"
 "   or "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:136
+#: src/plugins/pgpcore/pgp_viewer.c:188
 msgid ""
 "with the following command: \n"
 "\n"
 "     "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:143
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid ""
 "\n"
 "  Importing key ID "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:186
+#: src/plugins/pgpcore/pgp_viewer.c:268
 msgid "   This key has been imported to your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:188
+#: src/plugins/pgpcore/pgp_viewer.c:270
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:189
+#: src/plugins/pgpcore/pgp_viewer.c:271
 msgid "   Key servers are sometimes slow.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:190
+#: src/plugins/pgpcore/pgp_viewer.c:272
 msgid ""
 "   You can try to import it manually with the command:\n"
 "\n"
 "     "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:195
-msgid "   Key import isn't implemented in Windows.\n"
-msgstr ""
-
-#: src/plugins/pgpcore/pgp_viewer.c:204
+#: src/plugins/pgpcore/pgp_viewer.c:282
 msgid "   This key is in your keyring.\n"
 msgstr ""
 
@@ -10834,9 +10911,10 @@ msgstr ""
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:475
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
-msgid "minute(s)"
+#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:476
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
+#: src/prefs_receive.c:187
+msgid "minutes"
 msgstr ""
 
 #: src/plugins/pgpcore/prefs_gpg.c:173
@@ -10861,96 +10939,96 @@ msgstr ""
 msgid "Select GnuPG executable"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:353
+#: src/plugins/pgpcore/prefs_gpg.c:356
 msgid "Sign key"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:361
+#: src/plugins/pgpcore/prefs_gpg.c:364
 msgid "Use default GnuPG key"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:372
+#: src/plugins/pgpcore/prefs_gpg.c:375
 msgid "Select key by your email address"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:383
+#: src/plugins/pgpcore/prefs_gpg.c:386
 msgid "Specify key manually"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:393
+#: src/plugins/pgpcore/prefs_gpg.c:396
 msgid "User or key ID:"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:434
+#: src/plugins/pgpcore/prefs_gpg.c:437
 msgid "No secret key found."
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:437
+#: src/plugins/pgpcore/prefs_gpg.c:440
 msgid "Generate a new key pair"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:615
+#: src/plugins/pgpcore/prefs_gpg.c:618
 msgid "GPG"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:95
+#: src/plugins/pgpcore/select-keys.c:94
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:97
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:141
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:145
 msgid "Undefined"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:145
-#: src/plugins/pgpcore/sgpgme.c:161
+#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:149
+#: src/plugins/pgpcore/sgpgme.c:165
 msgid "Marginal"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
+#: src/plugins/pgpcore/select-keys.c:246 src/plugins/pgpcore/sgpgme.c:153
+#: src/plugins/pgpcore/sgpgme.c:169
 msgid "Ultimate"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:368
+#: src/plugins/pgpcore/select-keys.c:367
 msgid "Select Keys"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:395
+#: src/plugins/pgpcore/select-keys.c:394
 msgid "Key ID"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:398
+#: src/plugins/pgpcore/select-keys.c:397
 msgid "Trust"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:423
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "_Other"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:423
 msgid "Do_n't encrypt"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:583
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Add key"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:584
+#: src/plugins/pgpcore/select-keys.c:583
 msgid "Enter another user or key ID:"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:606
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:607
+#: src/plugins/pgpcore/select-keys.c:606
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -10962,228 +11040,228 @@ msgid ""
 "Do you trust this key enough to use it anyway?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:79 src/privacy.c:249 src/privacy.c:253
+#: src/plugins/pgpcore/sgpgme.c:83 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:159
+#: src/plugins/pgpcore/sgpgme.c:163
 msgid "Untrusted"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:199 src/plugins/pgpcore/sgpgme.c:218
+#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:203 src/plugins/pgpcore/sgpgme.c:207
+#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
 msgid "The signature has not been checked."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:213
+#: src/plugins/pgpcore/sgpgme.c:251
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:269
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:272
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:275
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:282
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:247 src/plugins/pgpcore/sgpgme.c:267
+#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:305
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:292
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:295
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:260
+#: src/plugins/pgpcore/sgpgme.c:298
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:301
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:310
 msgid "The signature has not been checked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:329
 msgid "Error checking signature: no status\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:309
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:365
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:333
+#: src/plugins/pgpcore/sgpgme.c:371
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:338
+#: src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:381
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:386
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:353
+#: src/plugins/pgpcore/sgpgme.c:391
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:368
+#: src/plugins/pgpcore/sgpgme.c:406
 msgid "Revoked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:373
+#: src/plugins/pgpcore/sgpgme.c:411
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:374
+#: src/plugins/pgpcore/sgpgme.c:412
 msgid "No key!"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:414
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:394
+#: src/plugins/pgpcore/sgpgme.c:432
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:472
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:450
+#: src/plugins/pgpcore/sgpgme.c:488
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:643
 msgid "Secret key specification is ambiguous"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:653
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:628
+#: src/plugins/pgpcore/sgpgme.c:666
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:759
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:723
+#: src/plugins/pgpcore/sgpgme.c:765
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 "version %s is required.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:731
+#: src/plugins/pgpcore/sgpgme.c:773
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:747
+#: src/plugins/pgpcore/sgpgme.c:789
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:781
+#: src/plugins/pgpcore/sgpgme.c:866
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:786
+#: src/plugins/pgpcore/sgpgme.c:871
 msgid "No PGP key found"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:787
+#: src/plugins/pgpcore/sgpgme.c:872
 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 ""
 
-#: src/plugins/pgpcore/sgpgme.c:857 src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:961 src/plugins/pgpcore/sgpgme.c:983
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:864
+#: src/plugins/pgpcore/sgpgme.c:971
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:879
+#: src/plugins/pgpcore/sgpgme.c:989
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:993
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11192,22 +11270,18 @@ msgid ""
 "Do you want to export it to a keyserver?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid "Key generated"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:926
+#: src/plugins/pgpcore/sgpgme.c:1073
 msgid "Key exported."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:928
+#: src/plugins/pgpcore/sgpgme.c:1075
 msgid "Couldn't export key."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:932
-msgid "Key export isn't implemented in Windows."
-msgstr ""
-
 #: src/plugins/pgpinline/pgpinline.c:155
 msgid "Incorrect part"
 msgstr ""
@@ -11228,7 +11302,7 @@ msgstr ""
 #: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
 #: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
 #: src/plugins/pgpmime/pgpmime.c:509 src/plugins/pgpmime/pgpmime.c:652
-#: src/plugins/smime/smime.c:415
+#: src/plugins/smime/smime.c:413
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr ""
@@ -11349,11 +11423,11 @@ msgstr ""
 msgid "Signature boundary not found."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:496
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:494
 msgid "Couldn't parse decrypted file."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:503
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:501
 msgid "Couldn't parse decrypted file parts."
 msgstr ""
 
@@ -11404,13 +11478,13 @@ msgid "Show Python console..."
 msgstr ""
 
 #: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:482
+#: src/plugins/rssyl/rssyl_feed_props.c:483
 msgid "Refresh"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
-#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1198
-#: src/wizard.c:1618
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
+#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1205
+#: src/wizard.c:1625
 msgid "Browse"
 msgstr ""
 
@@ -11544,26 +11618,26 @@ msgstr ""
 msgid "'%c' can't be used in folder name."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/rssyl/rssyl_cb_menu.c:251
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
+#: src/plugins/rssyl/rssyl_cb_menu.c:314
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:317
+#: src/plugins/rssyl/rssyl_cb_menu.c:315
 msgid "Remove feed tree"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:351
+#: src/plugins/rssyl/rssyl_cb_menu.c:349
 msgid "Select an OPML file"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:155
+#: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:158
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr ""
@@ -11608,102 +11682,104 @@ msgstr ""
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:273
+#: src/plugins/rssyl/rssyl_feed_props.c:270
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:290
+#: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:302
+#: src/plugins/rssyl/rssyl_feed_props.c:303
 msgid "Keep old items"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:308
+#: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:310
+#: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:313
+#: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Always mark it as new"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:344
+#: src/plugins/rssyl/rssyl_feed_props.c:345
 msgid "Only mark it as new if its text has changed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid "Never mark it as new"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:356
 msgid "Add item title to the top of message"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:362
+#: src/plugins/rssyl/rssyl_feed_props.c:363
 msgid "Ignore title rename"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:367
+#: src/plugins/rssyl/rssyl_feed_props.c:368
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:371
-#: src/plugins/vcalendar/vcal_prefs.c:547
+#: src/plugins/rssyl/rssyl_feed_props.c:372
+#: src/plugins/vcalendar/vcal_prefs.c:550
 msgid "Verify SSL certificate validity"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:391
+#: src/plugins/rssyl/rssyl_feed_props.c:392
 msgid "User name"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:404
+#: src/plugins/rssyl/rssyl_feed_props.c:405
 msgid "Source URL"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:417
+#: src/plugins/rssyl/rssyl_feed_props.c:418
 msgid "Fetch comments on posts aged less than"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:425
-msgid "day(s)"
+#: src/plugins/rssyl/rssyl_feed_props.c:426
+#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
+#: src/prefs_account.c:1480 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+msgid "days"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:426
+#: src/plugins/rssyl/rssyl_feed_props.c:427
 msgid "Set to -1 to fetch all comments"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:450
+#: src/plugins/rssyl/rssyl_feed_props.c:451
 msgid "If an item changes"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:455
+#: src/plugins/rssyl/rssyl_feed_props.c:456
 msgid "Items"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:468
+#: src/plugins/rssyl/rssyl_feed_props.c:469
 msgid "Refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:476
+#: src/plugins/rssyl/rssyl_feed_props.c:477
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:528
+#: src/plugins/rssyl/rssyl_feed_props.c:529
 msgid "_OK"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:536
+#: src/plugins/rssyl/rssyl_feed_props.c:537
 msgid "Set feed properties"
 msgstr ""
 
@@ -11754,7 +11830,7 @@ msgid ""
 "there?"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl.h:17
+#: src/plugins/rssyl/rssyl.h:20
 msgid "My Feeds"
 msgstr ""
 
@@ -11814,17 +11890,17 @@ msgid "Updating comments for '%s'..."
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1599
+#: src/plugins/vcalendar/vcal_folder.c:1614
 msgid "401 (Authorisation required)"
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1602
+#: src/plugins/vcalendar/vcal_folder.c:1617
 msgid "403 (Unauthorised)"
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1620
 msgid "404 (Not found)"
 msgstr ""
 
@@ -11859,12 +11935,12 @@ msgstr ""
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:228
+#: src/plugins/rssyl/rssyl_update_feed.c:231
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:250
+#: src/plugins/rssyl/rssyl_update_feed.c:258
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -11873,7 +11949,7 @@ msgid ""
 "Please contact developers, this should not happen."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:334
+#: src/plugins/rssyl/rssyl_update_feed.c:342
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr ""
 
@@ -11884,7 +11960,7 @@ msgid ""
 msgstr ""
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:915
+#: src/plugins/smime/smime.c:913
 msgid "S/MIME"
 msgstr ""
 
@@ -11908,44 +11984,44 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
 
-#: src/plugins/smime/smime.c:423
+#: src/plugins/smime/smime.c:421
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr ""
 
-#: src/plugins/smime/smime.c:451
+#: src/plugins/smime/smime.c:449
 msgid "Couldn't open temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:462 src/plugins/smime/smime.c:477
+#: src/plugins/smime/smime.c:460 src/plugins/smime/smime.c:475
 msgid "Couldn't write to temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:488
+#: src/plugins/smime/smime.c:486
 msgid "Couldn't close temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:710
+#: src/plugins/smime/smime.c:708
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:293
+#: src/plugins/spam_report/spam_report.c:299
 msgid "Reporting spam..."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:328
+#: src/plugins/spam_report/spam_report.c:334
 msgid "Report spam online..."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:339
-#: src/plugins/spam_report/spam_report.c:377
-#: src/plugins/spam_report/spam_report_prefs.c:80
+#: src/plugins/spam_report/spam_report.c:345
+#: src/plugins/spam_report/spam_report.c:383
+#: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:382
+#: src/plugins/spam_report/spam_report.c:388
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -11955,19 +12031,19 @@ msgid ""
 " * lists.debian.org nomination system"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:407
+#: src/plugins/spam_report/spam_report.c:413
 msgid "Spam reporting"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:122
+#: src/plugins/spam_report/spam_report_prefs.c:137
 msgid "Enabled"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:149
+#: src/plugins/spam_report/spam_report_prefs.c:169
 msgid "Forward to:"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1566
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1573
 msgid "Password:"
 msgstr ""
 
@@ -12001,7 +12077,7 @@ msgstr ""
 
 #: src/plugins/spamassassin/spamassassin.c:429
 msgid ""
-"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
 msgstr ""
 
@@ -12144,11 +12220,6 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
-msgid "days"
-msgstr ""
-
 #: src/plugins/vcalendar/month-view.c:109
 msgid "Monday"
 msgstr ""
@@ -12238,7 +12309,7 @@ msgid "Next month"
 msgstr ""
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:710
+#: src/plugins/vcalendar/vcal_prefs.c:729
 msgid "vCalendar"
 msgstr ""
 
@@ -12437,80 +12508,80 @@ msgstr ""
 msgid "Action:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:164
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to webCal..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1094
+#: src/plugins/vcalendar/vcal_folder.c:1095
 msgid "Meetings"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1479
+#: src/plugins/vcalendar/vcal_folder.c:1494
 msgid "in the past"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1482
+#: src/plugins/vcalendar/vcal_folder.c:1497
 msgid "today"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1485
+#: src/plugins/vcalendar/vcal_folder.c:1500
 msgid "tomorrow"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1488
+#: src/plugins/vcalendar/vcal_folder.c:1503
 msgid "this week"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1491
+#: src/plugins/vcalendar/vcal_folder.c:1506
 msgid "later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1495
+#: src/plugins/vcalendar/vcal_folder.c:1510
 #, c-format
 msgid ""
 "\n"
 "These are the events planned %s:\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1590
+#: src/plugins/vcalendar/vcal_folder.c:1605
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1608
+#: src/plugins/vcalendar/vcal_folder.c:1623
 #, c-format
 msgid "Error %ld"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1805
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -12519,7 +12590,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1809
+#: src/plugins/vcalendar/vcal_folder.c:1824
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -12528,7 +12599,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1835
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -12536,7 +12607,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1823
+#: src/plugins/vcalendar/vcal_folder.c:1838
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -12544,42 +12615,42 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1852
-#: src/plugins/vcalendar/vcal_folder.c:1855
+#: src/plugins/vcalendar/vcal_folder.c:1867
+#: src/plugins/vcalendar/vcal_folder.c:1870
 #, c-format
 msgid "Could not create directory %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1893
+#: src/plugins/vcalendar/vcal_folder.c:1908
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1904
+#: src/plugins/vcalendar/vcal_folder.c:1919
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1905
+#: src/plugins/vcalendar/vcal_folder.c:1920
 msgid "new subscription"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1931
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Subscribe to WebCal"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Enter the WebCal URL:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1940
+#: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Could not parse the URL."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1968
+#: src/plugins/vcalendar/vcal_folder.c:1983
 msgid "Do you really want to unsubscribe?"
 msgstr ""
 
@@ -12635,15 +12706,15 @@ msgstr ""
 msgid "Later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1242
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1244
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1246
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr ""
 
@@ -12665,7 +12736,7 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:779
 msgid ""
-"The following person(s) are busy at the time of your planned meeting:\n"
+"The following people are busy at the time of your planned meeting:\n"
 "- "
 msgstr ""
 
@@ -12928,88 +12999,88 @@ msgstr ""
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:282
+#: src/plugins/vcalendar/vcal_prefs.c:285
 msgid "Reminders"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:291
+#: src/plugins/vcalendar/vcal_prefs.c:294
 msgid "Alert me"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:303
+#: src/plugins/vcalendar/vcal_prefs.c:306
 msgid "minutes before an event"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:315
+#: src/plugins/vcalendar/vcal_prefs.c:318
 msgid "Calendar export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:326
+#: src/plugins/vcalendar/vcal_prefs.c:329
 msgid "Automatically export calendar to"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:335
-#: src/plugins/vcalendar/vcal_prefs.c:454
+#: src/plugins/vcalendar/vcal_prefs.c:338
+#: src/plugins/vcalendar/vcal_prefs.c:457
 msgid "You can export to a local file or URL"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:340
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:367
+#: src/plugins/vcalendar/vcal_prefs.c:370
 msgid "Include webcal subscriptions in export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:377
+#: src/plugins/vcalendar/vcal_prefs.c:380
 msgid "Command to run after calendar export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:409
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:408
+#: src/plugins/vcalendar/vcal_prefs.c:411
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:421
+#: src/plugins/vcalendar/vcal_prefs.c:424
 msgid "Export as GNOME shell calendar server"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:423
+#: src/plugins/vcalendar/vcal_prefs.c:426
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:433
+#: src/plugins/vcalendar/vcal_prefs.c:436
 msgid "Free/Busy information"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:445
+#: src/plugins/vcalendar/vcal_prefs.c:448
 msgid "Automatically export free/busy status to"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:456
+#: src/plugins/vcalendar/vcal_prefs.c:459
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:486
+#: src/plugins/vcalendar/vcal_prefs.c:489
 msgid "Command to run after free/busy status export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:513
+#: src/plugins/vcalendar/vcal_prefs.c:516
 msgid "Get free/busy status of others from"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:521
+#: src/plugins/vcalendar/vcal_prefs.c:524
 #, c-format
 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 ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:535
+#: src/plugins/vcalendar/vcal_prefs.c:538
 msgid "SSL options"
 msgstr ""
 
@@ -13064,508 +13135,496 @@ msgstr ""
 msgid "TOP command unsupported\n"
 msgstr ""
 
-#: src/prefs_account.c:334 src/prefs_account.c:1450 src/prefs_account.c:2434
-#: src/wizard.c:1492
+#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
+#: src/wizard.c:1499
 msgid "POP3"
 msgstr ""
 
-#: src/prefs_account.c:337 src/prefs_account.c:1563 src/prefs_account.c:2449
+#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
 msgid "IMAP4"
 msgstr ""
 
-#: src/prefs_account.c:338
+#: src/prefs_account.c:336
 msgid "News (NNTP)"
 msgstr ""
 
-#: src/prefs_account.c:339 src/wizard.c:1494
+#: src/prefs_account.c:337 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr ""
 
-#: src/prefs_account.c:340
+#: src/prefs_account.c:338
 msgid "None (SMTP only)"
 msgstr ""
 
-#: src/prefs_account.c:1033
+#: src/prefs_account.c:1028
 msgid "Name of account"
 msgstr ""
 
-#: src/prefs_account.c:1042
+#: src/prefs_account.c:1037
 msgid "Set as default"
 msgstr ""
 
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1045
 msgid "Personal information"
 msgstr ""
 
-#: src/prefs_account.c:1059
+#: src/prefs_account.c:1054
 msgid "Full name"
 msgstr ""
 
-#: src/prefs_account.c:1065
+#: src/prefs_account.c:1060
 msgid "Mail address"
 msgstr ""
 
-#: src/prefs_account.c:1128 src/wizard.c:1517
+#: src/prefs_account.c:1123 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr ""
 
-#: src/prefs_account.c:1130 src/wizard.c:1518
+#: src/prefs_account.c:1125 src/wizard.c:1525
 msgid "Cancel"
 msgstr ""
 
-#: src/prefs_account.c:1147
+#: src/prefs_account.c:1142
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
 msgstr ""
 
-#: src/prefs_account.c:1176
+#: src/prefs_account.c:1171
 msgid "This server requires authentication"
 msgstr ""
 
-#: src/prefs_account.c:1183
+#: src/prefs_account.c:1178
 msgid "Authenticate on connect"
 msgstr ""
 
-#: src/prefs_account.c:1237
+#: src/prefs_account.c:1232
 msgid "News server"
 msgstr ""
 
-#: src/prefs_account.c:1243
+#: src/prefs_account.c:1238
 msgid "Server for receiving"
 msgstr ""
 
-#: src/prefs_account.c:1249
+#: src/prefs_account.c:1244
 msgid "Local mailbox"
 msgstr ""
 
-#: src/prefs_account.c:1256
+#: src/prefs_account.c:1251
 msgid "SMTP server (send)"
 msgstr ""
 
-#: src/prefs_account.c:1264
+#: src/prefs_account.c:1259
 msgid "Use mail command rather than SMTP server"
 msgstr ""
 
-#: src/prefs_account.c:1273
+#: src/prefs_account.c:1268
 msgid "command to send mails"
 msgstr ""
 
-#: src/prefs_account.c:1338
+#: src/prefs_account.c:1332
 #, c-format
 msgid "Account%d"
 msgstr ""
 
-#: src/prefs_account.c:1424
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr ""
 
-#: src/prefs_account.c:1430 src/prefs_account.c:1519
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr ""
 
-#: src/prefs_account.c:1437 src/prefs_account.c:1444 src/prefs_account.c:1526
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
+#: src/prefs_account.c:1537
 msgid "Unfiltered messages will be stored in this folder"
 msgstr ""
 
-#: src/prefs_account.c:1452
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr ""
 
-#: src/prefs_account.c:1455
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr ""
 
-#: src/prefs_account.c:1466
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr ""
 
-#: src/prefs_account.c:1473 src/prefs_account.c:1483
+#: src/prefs_account.c:1477 src/prefs_account.c:1487
 msgid "0 days and 0 hours : remove immediately"
 msgstr ""
 
-#: src/prefs_account.c:1496
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1499
+#: src/prefs_account.c:1503
 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:1539 src/prefs_account.c:2464
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account.c:1546
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr ""
 
-#: src/prefs_account.c:1556
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr ""
 
-#: src/prefs_account.c:1592
+#: src/prefs_account.c:1585
+msgid "Plain text"
+msgstr ""
+
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr ""
 
-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr ""
 
-#: src/prefs_account.c:1610
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr ""
 
-#: src/prefs_account.c:1617
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1633
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1637
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account.c:1718 src/prefs_customheader.c:208
+#: src/prefs_account.c:1725 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr ""
 
-#: src/prefs_account.c:1720
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1723
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1726
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr ""
 
-#: src/prefs_account.c:1733
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr ""
 
-#: src/prefs_account.c:1748
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr ""
 
-#: src/prefs_account.c:1833
+#: src/prefs_account.c:1840
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account.c:1844
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr ""
 
-#: src/prefs_account.c:1859
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr ""
 
-#: src/prefs_account.c:1867
-msgid "minutes"
-msgstr ""
-
-#: src/prefs_account.c:1937 src/prefs_account.c:1983
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr ""
 
-#: src/prefs_account.c:1940
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr ""
 
-#: src/prefs_account.c:1945
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr ""
 
-#: src/prefs_account.c:1970
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr ""
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr ""
 
-#: src/prefs_account.c:2055
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr ""
 
-#: src/prefs_account.c:2065 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2078 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2164 src/prefs_account.c:3288
+#: src/prefs_account.c:2181 src/prefs_account.c:3341
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr ""
 
-#: src/prefs_account.c:2179 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr ""
 
-#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr ""
 
-#: src/prefs_account.c:2241
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr ""
 
-#: src/prefs_account.c:2270
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr ""
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr ""
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 
-#: src/prefs_account.c:2277
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 
-#: src/prefs_account.c:2280
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr ""
 
-#: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
+#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
 msgid "Don't use SSL"
 msgstr ""
 
-#: src/prefs_account.c:2441
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr ""
 
-#: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
+#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
 msgid "Use STARTTLS command to start SSL session"
 msgstr ""
 
-#: src/prefs_account.c:2456
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr ""
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr ""
 
-#: src/prefs_account.c:2480
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account.c:2484
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr ""
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr ""
 
-#: src/prefs_account.c:2495
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr ""
 
-#: src/prefs_account.c:2503
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr ""
 
-#: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
-#: src/prefs_account.c:2532
+#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
+#: src/prefs_account.c:2550
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr ""
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr ""
 
-#: src/prefs_account.c:2558
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr ""
 
-#: src/prefs_account.c:2561
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr ""
 
-#: src/prefs_account.c:2691
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr ""
 
-#: src/prefs_account.c:2698
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr ""
 
-#: src/prefs_account.c:2705
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr ""
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr ""
 
-#: src/prefs_account.c:2718
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr ""
 
-#: src/prefs_account.c:2721
+#: src/prefs_account.c:2756
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr ""
 
-#: src/prefs_account.c:2735
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr ""
 
-#: src/prefs_account.c:2743
-msgid "Move deleted mails to trash and expunge immediately"
-msgstr "Move deleted mails to wastebin and expunge immediately"
-
-#: src/prefs_account.c:2745
-msgid ""
-"Moves deleted mails to trash instead of using the \\Deleted flag without "
-"expunging."
-msgstr ""
-"Moves deleted mails to wastebin instead of using the \\Deleted flag without "
-"expunging."
-
-#: src/prefs_account.c:2749
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mark cross-posted messages as read and colour:"
 
-#: src/prefs_account.c:2805
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr ""
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr ""
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr ""
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr ""
 
-#: src/prefs_account.c:2871
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2875
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2882
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2892
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2912
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr ""
 
-#: src/prefs_account.c:2918
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2923
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2929
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2935
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr ""
 
-#: src/prefs_account.c:3306 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr ""
 
-#: src/prefs_account.c:3324
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr ""
 
-#: src/prefs_account.c:3435
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr ""
 
-#: src/prefs_account.c:3726
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr ""
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr ""
 
-#: src/prefs_account.c:3849 src/wizard.c:1382
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr ""
 
-#: src/prefs_account.c:3934
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr ""
 
-#: src/prefs_account.c:3952 src/prefs_account.c:3969 src/wizard.c:1059
+#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr ""
 
-#: src/prefs_account.c:4065
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr ""
 
-#: src/prefs_account.c:4205
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr ""
@@ -13790,7 +13849,7 @@ msgstr ""
 msgid "for a literal %"
 msgstr ""
 
-#: src/prefs_actions.c:1004 src/prefs_themes.c:936
+#: src/prefs_actions.c:1004 src/prefs_themes.c:935
 msgid "Actions"
 msgstr ""
 
@@ -13814,21 +13873,21 @@ msgstr ""
 msgid "Action string is not valid."
 msgstr ""
 
-#: src/prefs_common.c:220 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr ""
 
-#: src/prefs_common.c:298
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr ""
 
-#: src/prefs_common.c:304 src/prefs_quote.c:85
+#: src/prefs_common.c:307 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
 
-#: src/prefs_common.c:448
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr ""
 
@@ -14078,7 +14137,7 @@ msgid "Message flags"
 msgstr ""
 
 #: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2795
+#: src/prefs_summary_column.c:78 src/summaryview.c:2776
 msgid "Mark"
 msgstr ""
 
@@ -14567,7 +14626,7 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs_gtk.c:948 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:911 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr ""
 
@@ -14699,7 +14758,7 @@ msgstr ""
 msgid "Status messages for filtering/processing log"
 msgstr ""
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:688
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
 msgid "Other"
 msgstr ""
 
@@ -14775,11 +14834,11 @@ msgstr ""
 msgid "whole message"
 msgstr ""
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6332
+#: src/prefs_matcher.c:394 src/summaryview.c:6282
 msgid "Marked"
 msgstr ""
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6330
+#: src/prefs_matcher.c:395 src/summaryview.c:6280
 msgid "Deleted"
 msgstr ""
 
@@ -14787,11 +14846,11 @@ msgstr ""
 msgid "Replied"
 msgstr ""
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6324
+#: src/prefs_matcher.c:397 src/summaryview.c:6274
 msgid "Forwarded"
 msgstr ""
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6314 src/toolbar.c:416
+#: src/prefs_matcher.c:399 src/summaryview.c:6264 src/toolbar.c:416
 #: src/toolbar.c:934 src/toolbar.c:1978
 msgid "Spam"
 msgstr ""
@@ -14800,7 +14859,7 @@ msgstr ""
 msgid "Has attachment"
 msgstr ""
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6350
+#: src/prefs_matcher.c:401 src/summaryview.c:6300
 msgid "Signed"
 msgstr ""
 
@@ -15094,6 +15153,10 @@ msgstr ""
 msgid "Line space"
 msgstr ""
 
+#: src/prefs_message.c:189 src/prefs_message.c:223
+msgid "pixels"
+msgstr ""
+
 #: src/prefs_message.c:195
 msgid "Scroll"
 msgstr ""
@@ -15130,6 +15193,23 @@ msgstr ""
 msgid "Text Options"
 msgstr ""
 
+#: src/prefs_migration.c:95
+#, c-format
+msgid ""
+"Your Claws Mail configuration is from a newer version than the version which "
+"you are currently using.\n"
+"\n"
+"This is not recommended.\n"
+"\n"
+"For further information see the %sClaws Mail website%s.\n"
+"\n"
+"Do you want to exit now?"
+msgstr ""
+
+#: src/prefs_migration.c:104
+msgid "Configuration warning"
+msgstr ""
+
 #: src/prefs_msg_colors.c:147
 msgid "Message view"
 msgstr ""
@@ -15316,110 +15396,128 @@ msgstr "Pick colour for folder"
 msgid "Colors"
 msgstr "Colours"
 
-#: src/prefs_other.c:96
+#: src/prefs_other.c:107
 msgid "Choose preset keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:110
+#: src/prefs_other.c:121
 msgid "Select preset:"
 msgstr ""
 
-#: src/prefs_other.c:125
+#: src/prefs_other.c:136
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_other.c:478
+#: src/prefs_other.c:496
 msgid "Add address to destination when double-clicked"
 msgstr ""
 
-#: src/prefs_other.c:481
+#: src/prefs_other.c:499
 msgid "On exit"
 msgstr ""
 
-#: src/prefs_other.c:484
+#: src/prefs_other.c:502
 msgid "Confirm on exit"
 msgstr ""
 
-#: src/prefs_other.c:491
+#: src/prefs_other.c:509
 msgid "Empty trash on exit"
 msgstr "Empty wastebin on exit"
 
-#: src/prefs_other.c:494
+#: src/prefs_other.c:512
 msgid "Warn if there are queued messages"
 msgstr ""
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:514
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:517
 msgid "Enable customisable keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:520
 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 ""
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:527
 msgid " Choose preset keyboard shortcuts... "
 msgstr ""
 
-#: src/prefs_other.c:519
+#: src/prefs_other.c:537
 msgid "Metadata handling"
 msgstr ""
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:538
 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 ""
 
-#: src/prefs_other.c:524
+#: src/prefs_other.c:542
 msgid "Safer"
 msgstr ""
 
-#: src/prefs_other.c:526
+#: src/prefs_other.c:544
 msgid "Faster"
 msgstr ""
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:562
 msgid "Socket I/O timeout"
 msgstr ""
 
-#: src/prefs_other.c:566
+#: src/prefs_other.c:584
 msgid "Ask before emptying trash"
 msgstr "Ask before emptying wastebin"
 
-#: src/prefs_other.c:568
+#: src/prefs_other.c:586
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 
-#: src/prefs_other.c:573
+#: src/prefs_other.c:591
 msgid "Use secure file deletion if possible"
 msgstr ""
 
-#: src/prefs_other.c:577
+#: src/prefs_other.c:595
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
 msgstr ""
 
-#: src/prefs_other.c:582
+#: src/prefs_other.c:600
 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 ""
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:604
 msgid "Synchronise offline folders as soon as possible"
 msgstr ""
 
-#: src/prefs_other.c:689
+#: src/prefs_other.c:607
+msgid "Master passphrase"
+msgstr ""
+
+#: src/prefs_other.c:610
+msgid "Use a master passphrase"
+msgstr ""
+
+#: src/prefs_other.c:613
+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 ""
+
+#: src/prefs_other.c:618
+msgid "Change master passphrase"
+msgstr ""
+
+#: src/prefs_other.c:778
 msgid "Miscellaneous"
 msgstr ""
 
@@ -15427,251 +15525,247 @@ msgstr ""
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr ""
 
-#: src/prefs_receive.c:123
+#: src/prefs_receive.c:142
 msgid "External incorporation program"
 msgstr ""
 
-#: src/prefs_receive.c:126
+#: src/prefs_receive.c:145
 msgid "Use external program for receiving mail"
 msgstr ""
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:161
 msgid "Automatic checking"
 msgstr ""
 
-#: src/prefs_receive.c:149
+#: src/prefs_receive.c:168
 msgid "Check for new mail every"
 msgstr ""
 
-#: src/prefs_receive.c:167
+#: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
 msgstr ""
 
-#: src/prefs_receive.c:170
+#: src/prefs_receive.c:218
 msgid "Dialogs"
 msgstr "Dialogues"
 
-#: src/prefs_receive.c:172
+#: src/prefs_receive.c:220
 msgid "Show receive dialog"
 msgstr "Show receive dialogue"
 
-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:230
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_receive.c:193
+#: src/prefs_receive.c:241
 msgid "Close receive dialog when finished"
 msgstr "Close receive dialogue when finished"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:244
 msgid "Don't popup error dialog on receive error"
 msgstr "Don't popup error dialogue on receive error"
 
-#: src/prefs_receive.c:199
+#: src/prefs_receive.c:247
 msgid "After receiving new mail"
 msgstr ""
 
-#: src/prefs_receive.c:201
+#: src/prefs_receive.c:249
 msgid "Go to Inbox"
 msgstr ""
 
-#: src/prefs_receive.c:203
+#: src/prefs_receive.c:251
 msgid "Update all local folders"
 msgstr ""
 
-#: src/prefs_receive.c:205
+#: src/prefs_receive.c:253
 msgid "Run command"
 msgstr ""
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:258
 msgid "after automatic check"
 msgstr ""
 
-#: src/prefs_receive.c:212
+#: src/prefs_receive.c:260
 msgid "after manual check"
 msgstr ""
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:268
 #, c-format
 msgid ""
 "Command to execute:\n"
 "(use %d as number of new mails)"
 msgstr ""
 
-#: src/prefs_receive.c:343 src/prefs_send.c:358
+#: src/prefs_receive.c:411 src/prefs_send.c:371
 msgid "Mail Handling"
 msgstr ""
 
-#: src/prefs_receive.c:344
+#: src/prefs_receive.c:412
 msgid "Receiving"
 msgstr ""
 
-#: src/prefs_send.c:161
+#: src/prefs_send.c:159
 msgid "Save sent messages"
 msgstr ""
 
-#: src/prefs_send.c:164
-msgid "Confirm before sending queued messages"
+#: src/prefs_send.c:162
+msgid "Never send Return Receipts"
 msgstr ""
 
-#: src/prefs_send.c:167
-msgid "Never send Return Receipts"
+#: src/prefs_send.c:180
+msgid "Confirm before sending queued messages"
 msgstr ""
 
-#: src/prefs_send.c:170
+#: src/prefs_send.c:183
 msgid "Show send dialog"
 msgstr "Show send dialogue"
 
-#: src/prefs_send.c:172
+#: src/prefs_send.c:186
 msgid "Warn when Subject is empty"
 msgstr ""
 
-#: src/prefs_send.c:180
+#: src/prefs_send.c:193
 msgid "Outgoing encoding"
 msgstr ""
 
-#: src/prefs_send.c:205
+#: src/prefs_send.c:218
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr ""
 
-#: src/prefs_send.c:220
-msgid "Automatic (Recommended)"
-msgstr ""
-
-#: src/prefs_send.c:222
+#: src/prefs_send.c:235
 msgid "7bit ASCII (US-ASCII)"
 msgstr ""
 
-#: src/prefs_send.c:223
+#: src/prefs_send.c:236
 msgid "Unicode (UTF-8)"
 msgstr ""
 
-#: src/prefs_send.c:225
+#: src/prefs_send.c:238
 msgid "Western European (ISO-8859-1)"
 msgstr ""
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:239
 msgid "Western European (ISO-8859-15)"
 msgstr ""
 
-#: src/prefs_send.c:228
+#: src/prefs_send.c:241
 msgid "Central European (ISO-8859-2)"
 msgstr ""
 
-#: src/prefs_send.c:230
+#: src/prefs_send.c:243
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:244
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: src/prefs_send.c:233
+#: src/prefs_send.c:246
 msgid "Greek (ISO-8859-7)"
 msgstr ""
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:248
 msgid "Hebrew (ISO-8859-8)"
 msgstr ""
 
-#: src/prefs_send.c:236
+#: src/prefs_send.c:249
 msgid "Hebrew (Windows-1255)"
 msgstr ""
 
-#: src/prefs_send.c:238
+#: src/prefs_send.c:251
 msgid "Arabic (ISO-8859-6)"
 msgstr ""
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:252
 msgid "Arabic (Windows-1256)"
 msgstr ""
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:254
 msgid "Turkish (ISO-8859-9)"
 msgstr ""
 
-#: src/prefs_send.c:243
+#: src/prefs_send.c:256
 msgid "Cyrillic (ISO-8859-5)"
 msgstr ""
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:257
 msgid "Cyrillic (KOI8-R)"
 msgstr ""
 
-#: src/prefs_send.c:245
+#: src/prefs_send.c:258
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr ""
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:259
 msgid "Cyrillic (KOI8-U)"
 msgstr ""
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:260
 msgid "Cyrillic (Windows-1251)"
 msgstr ""
 
-#: src/prefs_send.c:249
+#: src/prefs_send.c:262
 msgid "Japanese (ISO-2022-JP)"
 msgstr ""
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:264
 msgid "Japanese (EUC-JP)"
 msgstr ""
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:265
 msgid "Japanese (Shift_JIS)"
 msgstr ""
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:268
 msgid "Simplified Chinese (GB18030)"
 msgstr ""
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:269
 msgid "Simplified Chinese (GB2312)"
 msgstr ""
 
-#: src/prefs_send.c:257
+#: src/prefs_send.c:270
 msgid "Simplified Chinese (GBK)"
 msgstr ""
 
-#: src/prefs_send.c:258
+#: src/prefs_send.c:271
 msgid "Traditional Chinese (Big5)"
 msgstr ""
 
-#: src/prefs_send.c:260
+#: src/prefs_send.c:273
 msgid "Traditional Chinese (EUC-TW)"
 msgstr ""
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:274
 msgid "Chinese (ISO-2022-CN)"
 msgstr ""
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:277
 msgid "Korean (EUC-KR)"
 msgstr ""
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:279
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:280
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:284
 msgid "Transfer encoding"
 msgstr ""
 
-#: src/prefs_send.c:282
+#: src/prefs_send.c:295
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr ""
 
-#: src/prefs_send.c:359 src/send_message.c:502 src/send_message.c:506
-#: src/send_message.c:511
+#: src/prefs_send.c:372 src/send_message.c:501 src/send_message.c:505
+#: src/send_message.c:510
 msgid "Sending"
 msgstr ""
 
@@ -16089,7 +16183,7 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: src/prefs_themes.c:344 src/prefs_themes.c:705
+#: src/prefs_themes.c:344 src/prefs_themes.c:704
 msgid "Default internal theme"
 msgstr ""
 
@@ -16186,54 +16280,54 @@ msgid ""
 "while installing theme."
 msgstr ""
 
-#: src/prefs_themes.c:667
+#: src/prefs_themes.c:666
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr ""
 
-#: src/prefs_themes.c:708
+#: src/prefs_themes.c:707
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr ""
 
-#: src/prefs_themes.c:714
+#: src/prefs_themes.c:713
 msgid "No info file available for this theme"
 msgstr ""
 
-#: src/prefs_themes.c:732
+#: src/prefs_themes.c:731
 msgid "Error: couldn't get theme status"
 msgstr ""
 
-#: src/prefs_themes.c:756
+#: src/prefs_themes.c:755
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr ""
 
-#: src/prefs_themes.c:804
+#: src/prefs_themes.c:803
 msgid "Selector"
 msgstr ""
 
-#: src/prefs_themes.c:815
+#: src/prefs_themes.c:814
 msgid "Install new..."
 msgstr ""
 
-#: src/prefs_themes.c:820
+#: src/prefs_themes.c:819
 msgid "Get more..."
 msgstr ""
 
-#: src/prefs_themes.c:831
+#: src/prefs_themes.c:830
 msgid "Information"
 msgstr ""
 
-#: src/prefs_themes.c:845
+#: src/prefs_themes.c:844
 msgid "Author: "
 msgstr ""
 
-#: src/prefs_themes.c:853
+#: src/prefs_themes.c:852
 msgid "URL:"
 msgstr ""
 
-#: src/prefs_themes.c:895
+#: src/prefs_themes.c:894
 msgid "Preview"
 msgstr ""
 
@@ -16380,53 +16474,53 @@ msgstr ""
 msgid "No recipient keys defined."
 msgstr ""
 
-#: src/procmime.c:432 src/procmime.c:434 src/procmime.c:435
+#: src/procmime.c:433 src/procmime.c:435 src/procmime.c:436
 msgid "[Error decoding BASE64]\n"
 msgstr ""
 
-#: src/procmsg.c:937 src/procmsg.c:940
+#: src/procmsg.c:936 src/procmsg.c:939
 msgid "Already trying to send."
 msgstr ""
 
-#: src/procmsg.c:1550 src/procmsg.c:1609
+#: src/procmsg.c:1557 src/procmsg.c:1616
 #, c-format
 msgid "Couldn't open file %s."
 msgstr ""
 
-#: src/procmsg.c:1619
+#: src/procmsg.c:1626
 msgid "Queued message header is broken."
 msgstr ""
 
-#: src/procmsg.c:1639
+#: src/procmsg.c:1646
 msgid "An error happened during SMTP session."
 msgstr ""
 
-#: src/procmsg.c:1653
+#: src/procmsg.c:1660
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 
-#: src/procmsg.c:1661
+#: src/procmsg.c:1668
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 
-#: src/procmsg.c:1683
+#: src/procmsg.c:1690
 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 
-#: src/procmsg.c:1696
+#: src/procmsg.c:1703
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 
-#: src/procmsg.c:1710
+#: src/procmsg.c:1717
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr ""
 
-#: src/procmsg.c:2262
+#: src/procmsg.c:2269
 msgid "Filtering messages...\n"
 msgstr ""
 
@@ -16695,88 +16789,88 @@ msgstr ""
 msgid "Enter variable"
 msgstr ""
 
-#: src/send_message.c:152
+#: src/send_message.c:153
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr ""
 
-#: src/send_message.c:166
+#: src/send_message.c:167
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr ""
 
-#: src/send_message.c:201
+#: src/send_message.c:202
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr ""
 
-#: src/send_message.c:351
+#: src/send_message.c:350
 msgid "Connecting"
 msgstr ""
 
-#: src/send_message.c:356
+#: src/send_message.c:355
 msgid "Doing POP before SMTP..."
 msgstr ""
 
-#: src/send_message.c:359
+#: src/send_message.c:358
 msgid "POP before SMTP"
 msgstr ""
 
-#: src/send_message.c:364
+#: src/send_message.c:363
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr ""
 
-#: src/send_message.c:421
+#: src/send_message.c:420
 msgid "Mail sent successfully."
 msgstr ""
 
-#: src/send_message.c:487
+#: src/send_message.c:486
 msgid "Sending HELO..."
 msgstr ""
 
-#: src/send_message.c:488 src/send_message.c:493 src/send_message.c:498
+#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
 msgid "Authenticating"
 msgstr ""
 
-#: src/send_message.c:489 src/send_message.c:494
+#: src/send_message.c:488 src/send_message.c:493
 msgid "Sending message..."
 msgstr ""
 
-#: src/send_message.c:492
+#: src/send_message.c:491
 msgid "Sending EHLO..."
 msgstr ""
 
-#: src/send_message.c:501
+#: src/send_message.c:500
 msgid "Sending MAIL FROM..."
 msgstr ""
 
-#: src/send_message.c:505
+#: src/send_message.c:504
 msgid "Sending RCPT TO..."
 msgstr ""
 
-#: src/send_message.c:510
+#: src/send_message.c:509
 msgid "Sending DATA..."
 msgstr ""
 
-#: src/send_message.c:514
+#: src/send_message.c:513
 msgid "Quitting..."
 msgstr ""
 
-#: src/send_message.c:543
+#: src/send_message.c:542
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr ""
 
-#: src/send_message.c:596
+#: src/send_message.c:595
 msgid "Sending message"
 msgstr ""
 
-#: src/send_message.c:665 src/send_message.c:685
+#: src/send_message.c:664 src/send_message.c:684
 msgid "Error occurred while sending the message."
 msgstr ""
 
-#: src/send_message.c:668
+#: src/send_message.c:667
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -16804,15 +16898,15 @@ msgstr ""
 msgid "%s - Source"
 msgstr ""
 
-#: src/ssl_manager.c:157
+#: src/ssl_manager.c:156
 msgid "Saved SSL certificates"
 msgstr ""
 
-#: src/ssl_manager.c:431
+#: src/ssl_manager.c:436
 msgid "Delete certificate"
 msgstr ""
 
-#: src/ssl_manager.c:432
+#: src/ssl_manager.c:437
 msgid "Do you really want to delete this certificate?"
 msgstr ""
 
@@ -16840,7 +16934,7 @@ msgstr ""
 msgid "Find _all"
 msgstr ""
 
-#: src/summary_search.c:690 src/summaryview.c:1105 src/summaryview.c:1366
+#: src/summary_search.c:690 src/summaryview.c:1086 src/summaryview.c:1347
 #, c-format
 msgid "Searching in %s... \n"
 msgstr ""
@@ -16865,325 +16959,328 @@ msgstr ""
 msgid "Toggle multiple selection"
 msgstr ""
 
-#: src/summaryview.c:1294
+#: src/summaryview.c:1275
 msgid "Process mark"
 msgstr ""
 
-#: src/summaryview.c:1295
+#: src/summaryview.c:1276
 msgid "Some marks are left. Process them?"
 msgstr ""
 
-#: src/summaryview.c:1345
+#: src/summaryview.c:1326
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr ""
 
-#: src/summaryview.c:1842 src/summaryview.c:1894
+#: src/summaryview.c:1823 src/summaryview.c:1875
 msgid "No more unread messages"
 msgstr ""
 
-#: src/summaryview.c:1843
+#: src/summaryview.c:1824
 msgid "No unread message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:1855 src/summaryview.c:1907 src/summaryview.c:1950
-#: src/summaryview.c:2002 src/summaryview.c:2081
+#: src/summaryview.c:1836 src/summaryview.c:1888 src/summaryview.c:1931
+#: src/summaryview.c:1983 src/summaryview.c:2062
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
-#: src/summaryview.c:1863
+#: src/summaryview.c:1844
 msgid "No unread messages."
 msgstr ""
 
-#: src/summaryview.c:1895
+#: src/summaryview.c:1876
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:1937 src/summaryview.c:1989
+#: src/summaryview.c:1918 src/summaryview.c:1970
 msgid "No more new messages"
 msgstr ""
 
-#: src/summaryview.c:1938
+#: src/summaryview.c:1919
 msgid "No new message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:1958
+#: src/summaryview.c:1939
 msgid "No new messages."
 msgstr ""
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:1971
 msgid "No new message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2027 src/summaryview.c:2068
+#: src/summaryview.c:2008 src/summaryview.c:2049
 msgid "No more marked messages"
 msgstr ""
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2009
 msgid "No marked message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:2037
+#: src/summaryview.c:2018
 msgid "No marked messages."
 msgstr ""
 
-#: src/summaryview.c:2069
+#: src/summaryview.c:2050
 msgid "No marked message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2106 src/summaryview.c:2131
+#: src/summaryview.c:2087 src/summaryview.c:2112
 msgid "No more labeled messages"
 msgstr "No more labelled messages"
 
-#: src/summaryview.c:2107
+#: src/summaryview.c:2088
 msgid "No labeled message found. Search from the end?"
 msgstr "No labelled message found. Search from the end?"
 
-#: src/summaryview.c:2116 src/summaryview.c:2141
+#: src/summaryview.c:2097 src/summaryview.c:2122
 msgid "No labeled messages."
 msgstr "No labelled messages."
 
-#: src/summaryview.c:2132
+#: src/summaryview.c:2113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No labelled message found. Search from the beginning?"
 
-#: src/summaryview.c:2446
+#: src/summaryview.c:2427
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2631
+#: src/summaryview.c:2612
 #, c-format
 msgid "%d deleted"
 msgstr ""
 
-#: src/summaryview.c:2635
+#: src/summaryview.c:2616
 #, c-format
 msgid "%s%d moved"
 msgstr ""
 
-#: src/summaryview.c:2636 src/summaryview.c:2643
+#: src/summaryview.c:2617 src/summaryview.c:2624
 msgid ", "
 msgstr ""
 
-#: src/summaryview.c:2641
+#: src/summaryview.c:2622
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:2655
+#: src/summaryview.c:2636
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:2673 src/summaryview.c:2716
+#: src/summaryview.c:2654 src/summaryview.c:2697
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr ""
 
-#: src/summaryview.c:2691
+#: src/summaryview.c:2672
 msgid "Message summary"
 msgstr ""
 
-#: src/summaryview.c:2692
+#: src/summaryview.c:2673
 msgid "New:"
 msgstr ""
 
-#: src/summaryview.c:2693
+#: src/summaryview.c:2674
 msgid "Unread:"
 msgstr ""
 
-#: src/summaryview.c:2694
+#: src/summaryview.c:2675
 msgid "Total:"
 msgstr ""
 
-#: src/summaryview.c:2696
+#: src/summaryview.c:2677
 msgid "Marked:"
 msgstr ""
 
-#: src/summaryview.c:2697
+#: src/summaryview.c:2678
 msgid "Replied:"
 msgstr ""
 
-#: src/summaryview.c:2698
+#: src/summaryview.c:2679
 msgid "Forwarded:"
 msgstr ""
 
-#: src/summaryview.c:2699
+#: src/summaryview.c:2680
 msgid "Locked:"
 msgstr ""
 
-#: src/summaryview.c:2700
+#: src/summaryview.c:2681
 msgid "Ignored:"
 msgstr ""
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2682
 msgid "Watched:"
 msgstr ""
 
-#: src/summaryview.c:2711
+#: src/summaryview.c:2692
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr ""
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:2972
 msgid "Sorting summary..."
 msgstr ""
 
-#: src/summaryview.c:3130
+#: src/summaryview.c:3111
 msgid "Setting summary from message data..."
 msgstr ""
 
-#: src/summaryview.c:3335
+#: src/summaryview.c:3316
 msgid "(No Date)"
 msgstr ""
 
-#: src/summaryview.c:3387
+#: src/summaryview.c:3368
 msgid "(No Recipient)"
 msgstr ""
 
-#: src/summaryview.c:3422
+#: src/summaryview.c:3403
 #, c-format
 msgid "From: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:3431
+#: src/summaryview.c:3412
 #, c-format
 msgid "To: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:4310
+#: src/summaryview.c:4291
 msgid "You're not the author of the article.\n"
 msgstr ""
 
-#: src/summaryview.c:4403
+#: src/summaryview.c:4381
 #, 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] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4406
-msgid "Delete message(s)"
-msgstr ""
+#: src/summaryview.c:4384
+#, fuzzy
+msgid "Delete message"
+msgid_plural "Delete messages"
+msgstr[0] "Next la_belled message"
+msgstr[1] "Next la_belled message"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4548
 msgid "Destination is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4679
+#: src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4818
 msgid "Append or Overwrite"
 msgstr ""
 
-#: src/summaryview.c:4845
+#: src/summaryview.c:4819
 msgid "Append or overwrite existing file?"
 msgstr ""
 
-#: src/summaryview.c:4846
+#: src/summaryview.c:4820
 msgid "_Append"
 msgstr ""
 
-#: src/summaryview.c:4846
+#: src/summaryview.c:4820
 msgid "_Overwrite"
 msgstr ""
 
-#: src/summaryview.c:4887
+#: src/summaryview.c:4861
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 
-#: src/summaryview.c:5371
+#: src/summaryview.c:5321
 msgid "Building threads..."
 msgstr ""
 
-#: src/summaryview.c:5619
+#: src/summaryview.c:5569
 msgid "Skip these rules"
 msgstr ""
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5572
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 
-#: src/summaryview.c:5625
+#: src/summaryview.c:5575
 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 
-#: src/summaryview.c:5654
+#: src/summaryview.c:5604
 msgid "Filtering"
 msgstr ""
 
-#: src/summaryview.c:5655
+#: src/summaryview.c:5605
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgstr ""
 
-#: src/summaryview.c:5685
+#: src/summaryview.c:5635
 msgid "Filtering..."
 msgstr ""
 
-#: src/summaryview.c:5764
+#: src/summaryview.c:5714
 msgid "Processing configuration"
 msgstr ""
 
-#: src/summaryview.c:6310
+#: src/summaryview.c:6260
 msgid "Ignored thread"
 msgstr ""
 
-#: src/summaryview.c:6312
+#: src/summaryview.c:6262
 msgid "Watched thread"
 msgstr ""
 
-#: src/summaryview.c:6320
+#: src/summaryview.c:6270
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6322
+#: src/summaryview.c:6272
 msgid "Replied - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6334
+#: src/summaryview.c:6284
 msgid "To be moved"
 msgstr ""
 
-#: src/summaryview.c:6336
+#: src/summaryview.c:6286
 msgid "To be copied"
 msgstr ""
 
-#: src/summaryview.c:6348
+#: src/summaryview.c:6298
 msgid "Signed, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6352
+#: src/summaryview.c:6302
 msgid "Encrypted, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6354
+#: src/summaryview.c:6304
 msgid "Encrypted"
 msgstr ""
 
-#: src/summaryview.c:6356
+#: src/summaryview.c:6306
 msgid "Has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:8004
+#: src/summaryview.c:7953
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
 msgstr ""
 
-#: src/summaryview.c:8107
+#: src/summaryview.c:8056
 msgid "Go back to the folder list (You have unread messages)"
 msgstr ""
 
-#: src/summaryview.c:8112
+#: src/summaryview.c:8061
 msgid "Go back to the folder list"
 msgstr ""
 
@@ -17635,12 +17732,12 @@ msgstr ""
 msgid "Select All"
 msgstr ""
 
-#: src/wizard.c:520
+#: src/wizard.c:521
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr ""
 
-#: src/wizard.c:543
+#: src/wizard.c:544
 #, c-format
 msgid ""
 "\n"
@@ -17689,139 +17786,139 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/wizard.c:619
+#: src/wizard.c:620
 msgid "Please enter the mailbox name."
 msgstr ""
 
-#: src/wizard.c:647
+#: src/wizard.c:648
 msgid "Please enter your name and email address."
 msgstr ""
 
-#: src/wizard.c:658
+#: src/wizard.c:659
 msgid "Please enter your receiving server and username."
 msgstr ""
 
-#: src/wizard.c:668
+#: src/wizard.c:669
 msgid "Please enter your username."
 msgstr ""
 
-#: src/wizard.c:678
+#: src/wizard.c:679
 msgid "Please enter your SMTP server."
 msgstr ""
 
-#: src/wizard.c:689
+#: src/wizard.c:690
 msgid "Please enter your SMTP username."
 msgstr ""
 
-#: src/wizard.c:968
+#: src/wizard.c:975
 msgid "Your name:"
 msgstr ""
 
-#: src/wizard.c:979
+#: src/wizard.c:986
 msgid "Your email address:"
 msgstr ""
 
-#: src/wizard.c:990
+#: src/wizard.c:997
 msgid "Your organization:"
 msgstr "Your organisation:"
 
-#: src/wizard.c:1024
+#: src/wizard.c:1031
 msgid "Mailbox name:"
 msgstr ""
 
-#: src/wizard.c:1032
+#: src/wizard.c:1039
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 
-#: src/wizard.c:1103
+#: src/wizard.c:1110
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 
-#: src/wizard.c:1106
+#: src/wizard.c:1113
 msgid "SMTP server address:"
 msgstr ""
 
-#: src/wizard.c:1112
+#: src/wizard.c:1119
 msgid "Use authentication"
 msgstr ""
 
-#: src/wizard.c:1121
+#: src/wizard.c:1128
 msgid "(empty to use the same as receive)"
 msgstr ""
 
-#: src/wizard.c:1135
+#: src/wizard.c:1142
 msgid "SMTP username:"
 msgstr ""
 
-#: src/wizard.c:1146
+#: src/wizard.c:1153
 msgid "SMTP password:"
 msgstr ""
 
-#: src/wizard.c:1159
+#: src/wizard.c:1166
 msgid "Use SSL to connect to SMTP server"
 msgstr ""
 
-#: src/wizard.c:1170 src/wizard.c:1590
+#: src/wizard.c:1177 src/wizard.c:1597
 msgid "Use SSL via STARTTLS"
 msgstr ""
 
-#: src/wizard.c:1182 src/wizard.c:1602
+#: src/wizard.c:1189 src/wizard.c:1609
 msgid "Client SSL certificate (optional)"
 msgstr ""
 
-#: src/wizard.c:1250 src/wizard.c:1282 src/wizard.c:1537
+#: src/wizard.c:1257 src/wizard.c:1289 src/wizard.c:1544
 msgid "Server address:"
 msgstr ""
 
-#: src/wizard.c:1314
+#: src/wizard.c:1321
 msgid "Local mailbox:"
 msgstr ""
 
-#: src/wizard.c:1483
+#: src/wizard.c:1490
 msgid "Server type:"
 msgstr ""
 
-#: src/wizard.c:1493
+#: src/wizard.c:1500
 msgid "IMAP"
 msgstr ""
 
-#: src/wizard.c:1548
+#: src/wizard.c:1555
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 
-#: src/wizard.c:1579
+#: src/wizard.c:1586
 msgid "Use SSL to connect to receiving server"
 msgstr ""
 
-#: src/wizard.c:1644
+#: src/wizard.c:1651
 msgid "IMAP server directory:"
 msgstr ""
 
-#: src/wizard.c:1655
+#: src/wizard.c:1662
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: src/wizard.c:1663
+#: src/wizard.c:1670
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
 msgstr ""
 
-#: src/wizard.c:1781
+#: src/wizard.c:1788
 msgid "Claws Mail Setup Wizard"
 msgstr ""
 
-#: src/wizard.c:1815
+#: src/wizard.c:1822
 msgid "Welcome to Claws Mail"
 msgstr ""
 
-#: src/wizard.c:1823
+#: src/wizard.c:1829
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -17830,32 +17927,42 @@ msgid ""
 "five minutes."
 msgstr ""
 
-#: src/wizard.c:1836
+#: src/wizard.c:1842
 msgid "About You"
 msgstr ""
 
-#: src/wizard.c:1844 src/wizard.c:1859 src/wizard.c:1874 src/wizard.c:1890
+#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
 msgid "Bold fields must be completed"
 msgstr ""
 
-#: src/wizard.c:1851
+#: src/wizard.c:1857
 msgid "Receiving mail"
 msgstr ""
 
-#: src/wizard.c:1866
+#: src/wizard.c:1872
 msgid "Sending mail"
 msgstr ""
 
-#: src/wizard.c:1882
+#: src/wizard.c:1888
 msgid "Saving mail on disk"
 msgstr ""
 
-#: src/wizard.c:1898
+#: src/wizard.c:1904
 msgid "Configuration finished"
 msgstr ""
 
-#: src/wizard.c:1906
+#: src/wizard.c:1911
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
+
+#~ msgid "Move deleted mails to trash and expunge immediately"
+#~ msgstr "Move deleted mails to wastebin and expunge immediately"
+
+#~ msgid ""
+#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
+#~ "expunging."
+#~ msgstr ""
+#~ "Moves deleted mails to wastebin instead of using the \\Deleted flag "
+#~ "without expunging."
diff --git a/po/es.po b/po/es.po
index 425cc98..fd2f1db 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.14.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-07 00:33+0200\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-08-07 01:04+0200\n"
 "Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
 "Language-Team: Spanish\n"
@@ -82,7 +82,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 
 #: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1264
+#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -95,7 +95,7 @@ msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4128
+#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -810,8 +810,8 @@ msgstr "Agendas de direcciones"
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:343
-#: src/folderview.c:431 src/prefs_account.c:2786 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
+#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -952,19 +952,18 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Falló la actualización. No se escribieron los cambios en el directorio."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
-#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867
-#: src/plugins/pgpcore/sgpgme.c:788 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4866
+#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
+#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5632 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Error"
@@ -997,66 +996,66 @@ msgstr "Nombre LDAP"
 msgid "Attribute Value"
 msgstr "Valor del atributo"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "un visor"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "un parser MIME"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "carpetas"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "filtrado"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "un interfaz de privacidad"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "un notificador"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "una utilidad"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "cosas"
 
-#: src/common/plugin.c:332
+#: src/common/plugin.c:334
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 "Este módulo proporciona %s (%s), que ya está proporcionado por el módulo %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "El módulo ya está cargado"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Falló la petición de memoria para el Módulo"
 
-#: src/common/plugin.c:480
+#: src/common/plugin.c:482
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "Este módulo no está bajo licencia compatible con GPL v3 o posterior."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Este módulo es para la versión GTK1 de Claws Mail."
 
-#: src/common/plugin.c:771
+#: src/common/plugin.c:769
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1065,7 +1064,7 @@ msgstr ""
 "Su versión de Claws Mail es más moderna que la versión con la que se "
 "construyó el módulo «%s»"
 
-#: src/common/plugin.c:774
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1073,12 +1072,12 @@ msgstr ""
 "Su versión de Claws Mail es más moderna que la versión con la que se "
 "construyó el módulo."
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:781
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo «%s»."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo."
 
@@ -1248,212 +1247,212 @@ msgstr "%d.%02d MB"
 msgid "%.2fGB"
 msgstr "%.2f GB"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lunes"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Enero"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrero"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marzo"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayo"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junio"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julio"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septiembre"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Noviembre"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Diciembre"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mié"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jue"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Vie"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Ene"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "May"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dic"
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
@@ -1467,7 +1466,7 @@ msgstr "_Añadir..."
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
@@ -1908,7 +1907,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: src/compose.c:3628 src/compose.c:10529 src/compose.c:11390
+#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -1963,7 +1962,7 @@ msgstr ""
 "Seleccione alguna cuenta antes de enviar."
 
 #: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
-#: src/prefs_account.c:3310 src/toolbar.c:406 src/toolbar.c:424
+#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Enviar"
 
@@ -1973,8 +1972,8 @@ msgstr ""
 "El único destinatario es la dirección CC por omisión. ¿Enviar de todas "
 "formas?"
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5633
-#: src/folderview.c:2445 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
+#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Enviar"
@@ -2010,7 +2009,7 @@ msgstr "¿Ponerlo en la cola igualmente?"
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:5169 src/compose.c:9993
+#: src/compose.c:5169 src/compose.c:9999
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2020,7 +2019,7 @@ msgstr ""
 "\n"
 "Falló la conversión del conjunto caracteres."
 
-#: src/compose.c:5172 src/compose.c:9996
+#: src/compose.c:5172 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2030,7 +2029,7 @@ msgstr ""
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 
-#: src/compose.c:5178 src/compose.c:9990
+#: src/compose.c:5178 src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2073,7 +2072,7 @@ msgstr ""
 "%s\n"
 "Utilice «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2084,7 +2083,7 @@ msgstr ""
 "al conjunto de caracteres %s especificado.\n"
 "¿Enviarlo como %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2097,73 +2096,72 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "No se puede cifrar el correo: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Aviso de cifrado"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "C_ontinuar"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar correos!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "El adjunto %s ya no existe. ¿Ignorar?"
 
-#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231
-#: src/toolbar.c:2167
+#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancelar envío"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ignorar adjunto"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Parte original %s"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Añadir a la agen_da"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Borrar contenidos de la cuenta"
 
-#: src/compose.c:6997 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar «tab» para autocompletar con la agenda"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
-#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2174,23 +2172,23 @@ msgstr "Guardar mensaje en "
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "_Cabecera"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Adjuntos"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "Ot_ros"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "As_unto:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2199,19 +2197,19 @@ msgstr ""
 "No se puede iniciar el corrector ortográfico.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_Desde:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Dirección del remitente a usar"
 
-#: src/compose.c:8373
+#: src/compose.c:8379
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2220,68 +2218,68 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
 "o cifrar este mensaje."
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/compose.c:8575 src/prefs_template.c:760
+#: src/compose.c:8581 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla en la línea %d."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Error de formato en el Desde de la plantilla."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Error de formato en el Para de la plantilla."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Error de formato en el Cc de la plantilla."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Error de formato en el Bcc de la plantilla."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Error de formato en el Reply-To de la plantilla."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Error de formato en el asunto de la plantilla."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2292,15 +2290,15 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:9959 src/messageview.c:1096
+#: src/compose.c:9965 src/messageview.c:1096
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail necesita acceso a la red para poder enviar este correo."
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "El mensaje no se pudo poner en la cola."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2311,15 +2309,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "No se puede guardar el borrador"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2327,24 +2325,24 @@ msgstr ""
 "No se ha podido guardar el borrador.\n"
 "¿Desea cancelar la salida o descartar este correo?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Cancelar salida"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Descartar correo"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero «%s»."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2353,54 +2351,54 @@ msgstr ""
 "El fichero «%s» contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
-#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Este mensaje se ha modificado. ¿Guardar los últimos cambios?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_No guardar"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:10529 src/prefs_actions.c:329
-#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
-#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
+#: src/compose.c:10535 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "¿Insertar o adjuntar?"
 
-#: src/compose.c:11388
+#: src/compose.c:11400
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2408,16 +2406,16 @@ msgstr ""
 "¿Quiere insertar el contenido de este/os fichero/s en el cuerpo del correo o "
 "prefiere adjuntarlo/s al mismo?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de formato de cita en la línea %d."
 
-#: src/compose.c:11902
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2634,7 +2632,7 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1970
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Fichero"
@@ -2783,7 +2781,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3383
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
@@ -2967,7 +2965,7 @@ msgstr ""
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Básicas"
 
@@ -3666,10 +3664,10 @@ msgstr "Seleccionar carpeta"
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:592 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:422 src/plugins/rssyl/rssyl_cb_menu.c:204
+#: src/foldersel.c:592 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:422
+#: src/plugins/rssyl/rssyl_cb_menu.c:204
 #: src/plugins/vcalendar/vcal_folder.c:2056
 #, c-format
 msgid "'%c' can't be included in folder name."
@@ -3690,61 +3688,61 @@ msgstr "La carpeta «%s» ya existe."
 msgid "Can't create the folder '%s'."
 msgstr "No se puede crear la carpeta «%s»."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Marcar todos como l_eídos"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Marcar todos como leídos recursi_vamente"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "Ejec_utar reglas de procesamiento"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Buscar en carpeta..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "Pr_ocesamiento..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "_Vaciar papelera..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Enviar _cola..."
 
-#: src/folderview.c:385 src/folderview.c:432
+#: src/folderview.c:389 src/folderview.c:436
 #: src/plugins/notification/notification_lcdproc.c:141
 #: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
 msgid "New"
 msgstr "Nuevos"
 
-#: src/folderview.c:386 src/folderview.c:433
+#: src/folderview.c:390 src/folderview.c:437
 #: src/plugins/notification/notification_lcdproc.c:145
 #: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:387 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:391 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:435 src/summaryview.c:445
+#: src/folderview.c:439 src/summaryview.c:445
 msgid "#"
 msgstr "N.º"
 
-#: src/folderview.c:765
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:837
+#: src/folderview.c:845
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -3752,98 +3750,98 @@ msgstr ""
 "¿Desea marcar todos los correos en esta carpeta y sus subcarpetas como "
 "leídos?"
 
-#: src/folderview.c:839 src/summaryview.c:4115
+#: src/folderview.c:847 src/summaryview.c:4115
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "¿Quiere realmente marcar todos los correos en la carpeta como leídos?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Revisando carpeta %s/%s..."
 
-#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1030 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Revisando carpeta %s..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Reconstruir el árbol de carpetas eliminará la caché local. ¿Desea continuar?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo árbol de carpetas..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Explorando árbol de carpetas..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No se puede explorar la carpeta %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Cerrando carpeta %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abriendo carpeta %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
-#: src/folderview.c:2386 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Vaciar papelera"
 
-#: src/folderview.c:2431 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Notificación conexión"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "¿Enviar todos los mensajes en la cola?"
 
-#: src/folderview.c:2453 src/toolbar.c:2647
+#: src/folderview.c:2466 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
-#: src/folderview.c:2456 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2469 src/main.c:2743 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3852,64 +3850,64 @@ msgstr ""
 "Hubo algún error enviando los mensajes en la cola:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "¿Quiere realmente copiar la carpeta «%s» a «%s»?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "¿Quiere realmente hacer de la carpeta «%s» una subcarpeta de «%s»?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Mover carpeta"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "No se puede copiar una carpeta a una de sus subcarpetas."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "No se puede mover la carpeta a una de sus subcarpetas."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "¡Copiar falló!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "¡Mover falló!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuración de procesamiento para la carpeta «%s»"
 
-#: src/folderview.c:3068 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta destino sólo puede usarse para almacenar subcarpetas."
 
@@ -4251,63 +4249,63 @@ msgstr "_Notas de la versión"
 msgid "_Statistics"
 msgstr "E_stadísticas"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rojo"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Azul cielo"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Azul"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Verde"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Marrón"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Gris"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Marrón claro"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Rojo oscuro"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Rosa oscuro"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Azul acero"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Dorado"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Verde brillante"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5045,7 +5043,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:734 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:728 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Módulos"
 
@@ -5088,9 +5086,9 @@ msgid "_Hide"
 msgstr "_Ocultar"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3273 src/prefs_account.c:3291 src/prefs_account.c:3309
-#: src/prefs_account.c:3327 src/prefs_account.c:3345 src/prefs_account.c:3363
-#: src/prefs_account.c:3382 src/prefs_account.c:3475
+#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
+#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
+#: src/prefs_account.c:3395 src/prefs_account.c:3488
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5760,8 +5758,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Las autenticaciones PLAIN sólo funcionarán si libetpan ha sido "
-"compilada con soporte SASL y el módulo PLAIN de SASL está instalado."
+"Las autenticaciones PLAIN sólo funcionarán si libetpan ha sido compilada con "
+"soporte SASL y el módulo PLAIN de SASL está instalado."
 
 #: src/imap.c:976
 msgid ""
@@ -5772,8 +5770,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Las autenticaciones con LOGIN sólo funcionarán si libetpan ha sido "
-"compilada con soporte SASL y el módulo LOGIN de SASL está instalado."
+"Las autenticaciones con LOGIN sólo funcionarán si libetpan ha sido compilada "
+"con soporte SASL y el módulo LOGIN de SASL está instalado."
 
 #: src/imap.c:983
 #, c-format
@@ -5795,8 +5793,8 @@ msgstr "Falló la conexión con %s"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha desconectado. Reconectando...\n"
 
-#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
-#: src/imap.c:4622 src/imap.c:5433
+#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
+#: src/imap.c:4620 src/imap.c:5431
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder acceder al servidor IMAP."
@@ -5837,85 +5835,85 @@ msgstr "No se puede conectar al servidor IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4112
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr "No se puede iniciar la sesión TLS.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No se puede entrar al servidor IMAP %s.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Añadiendo mensajes..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar el buzón: %s a %s\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Etiquetando mensajes..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor necesita TLS para acceder a él.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5924,29 +5922,29 @@ msgstr ""
 "La conexión con %s falló: el servidor necesita TLS, pero Claws Mail ha sido "
 "compilado sin soporte TLS.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 
-#: src/imap.c:6091
+#: src/imap.c:6089
 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 ""
-"Tiene definidas una o más cuentas IMAP. Sin embargo esta versión de "
-"Claws Mail ha sido compilada sin soporte para IMAP: sus cuentas IMAP "
-"están deshabilitadas.\n"
+"Tiene definidas una o más cuentas IMAP. Sin embargo esta versión de Claws "
+"Mail ha sido compilada sin soporte para IMAP: sus cuentas IMAP están "
+"deshabilitadas.\n"
 "\n"
 "Probablemente deberá instalar libetpan y recompilar Claws Mail."
 
@@ -6121,8 +6119,8 @@ msgstr "suscribir"
 msgid "unsubscribe"
 msgstr "desuscribir"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428
-#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
+#: src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Aplicar a subcarpetas"
 
@@ -7867,7 +7865,7 @@ msgstr "Sobreescribir fichero mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
 
-#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Sobreescribir"
@@ -7917,7 +7915,7 @@ msgstr "Búsqueda concluida"
 msgid "Compose _new message"
 msgstr "Componer un mensaje _nuevo"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
+#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Vista de mensaje"
 
@@ -7956,47 +7954,47 @@ msgstr ""
 "oficialmente dirigido a usted.\n"
 "Se recomienda no enviar el acuse de recibo."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Recuperando mensaje (%s)..."
 
-#: src/messageview.c:1409 src/procmime.c:1008
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1493 src/messageview.c:1501
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "El mensaje no cumple el estándar MIME. Puede mostrarse incorrectamente."
 
-#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
+#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Guardar como"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 
-#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No se pudo guardar el fichero «%s»."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Mostrar todo %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Mostrar sólo el primer megabyte de texto."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1950
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8004,19 +8002,19 @@ msgstr ""
 "Recibió un acuse de recibo en este mensaje: éste ha sido visualizado por el "
 "destinatario."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Usted solicitó acuse de recibo en este mensaje."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Este mensaje solicita acuse de recibo."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8024,7 +8022,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente,\n"
 "y ha sido eliminado del servidor."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8033,15 +8031,15 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Marcar para descargar"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Marcar para eliminar"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8050,12 +8048,12 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será descargado."
 
-#: src/messageview.c:2021 src/messageview.c:2034
+#: src/messageview.c:2024 src/messageview.c:2037
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Desmarca"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8064,11 +8062,11 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será eliminado."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 
-#: src/messageview.c:2101
+#: src/messageview.c:2104
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8080,19 +8078,19 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
-#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Enviar notificación"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No se puede imprimir: el mensaje no contiene texto."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8100,7 +8098,7 @@ msgstr ""
 "\n"
 "  No hay mensajes en esta carpeta"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8108,7 +8106,7 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8116,7 +8114,7 @@ msgstr ""
 "\n"
 "  El mensaje se ha borrado o movido a otra carpeta"
 
-#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
+#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
@@ -8226,8 +8224,7 @@ msgid "Go back to email"
 msgstr "Volver al correo"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190
-#: src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No se pudo guardar la parte del mensaje multipartes: %s"
@@ -8351,43 +8348,43 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "no se pudo seleccionar el grupo: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1054 src/news.c:1224
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "no se pudo establecer el grupo: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos inválido: %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1133 src/news.c:1157 src/news.c:1181
 msgid "couldn't get xhdr\n"
 msgstr "no se pudo obtener xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "no se pudo obtener xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "línea xover inválida\n"
 
-#: src/news.c:1446
+#: src/news.c:1449
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Tiene definidas una o más cuentas de noticias. Sin embargo esta versión "
-"de Claws Mail ha sido compilada sin soporte de noticias: sus cuentas "
-"de noticias están deshabilitadas.\n"
+"Tiene definidas una o más cuentas de noticias. Sin embargo esta versión de "
+"Claws Mail ha sido compilada sin soporte de noticias: sus cuentas de "
+"noticias están deshabilitadas.\n"
 "\n"
 "Probablemente deberá instalar libetpan y recompilar Claws Mail."
 
@@ -8426,7 +8423,8 @@ msgstr "Las nuevas contraseñas no coinciden, inténtelo de nuevo."
 
 #: src/password_gtk.c:80
 msgid "Incorrect old master passphrase entered, try again."
-msgstr "Se introdujo una contraseña maestra antigua incorrecta, inténtelo de nuevo."
+msgstr ""
+"Se introdujo una contraseña maestra antigua incorrecta, inténtelo de nuevo."
 
 #: src/password_gtk.c:144
 msgid "Changing master passphrase"
@@ -9195,8 +9193,7 @@ msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "No comprueba si faltan adjuntos al reenviar o redirigir mensajes"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135
-#: src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Firmas"
 
@@ -9307,14 +9304,12 @@ msgstr ""
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/"
 "Bogofilter»"
 
-#: src/plugins/bogofilter/bogofilter.c:1043
-#: src/plugins/bsfilter/bsfilter.c:676
+#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Detección de correo basura"
 
-#: src/plugins/bogofilter/bogofilter.c:1044
-#: src/plugins/bsfilter/bsfilter.c:677
+#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Aprendizaje de correo basura"
@@ -9339,7 +9334,7 @@ msgstr "No se comprobarán los mensajes mayores de este tamaño"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "kB"
 
@@ -9915,7 +9910,7 @@ msgstr "Las CSS en este fichero se aplicarán a todas las partes HTML"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1442 src/prefs_account.c:1531 src/prefs_account.c:2002
+#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "E_xplorar"
@@ -10222,7 +10217,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Módulo GData: Tratando de renovar la autorización\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Autenticación"
 
@@ -10403,7 +10398,7 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Intervalo de refresco de la caché"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1487
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1490
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr "horas"
@@ -10786,7 +10781,7 @@ msgstr "Especificar autenticación"
 #: src/plugins/managesieve/sieve_prefs.c:240
 #: src/plugins/vcalendar/vcal_prefs.c:348
 #: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
-#: src/prefs_account.c:1795
+#: src/prefs_account.c:1798
 msgid "User ID"
 msgstr "Usuario"
 
@@ -10794,18 +10789,18 @@ msgstr "Usuario"
 #: src/plugins/rssyl/rssyl_feed_props.c:395
 #: src/plugins/vcalendar/vcal_prefs.c:356
 #: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
-#: src/prefs_account.c:1815 src/prefs_account.c:2529 src/prefs_account.c:2551
+#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
 #: src/wizard.c:1215 src/wizard.c:1635
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1570
-#: src/prefs_account.c:1767
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
+#: src/prefs_account.c:1770
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1580
-#: src/prefs_account.c:1776 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
+#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
 msgid "Automatic"
 msgstr "Automático"
 
@@ -11741,9 +11736,8 @@ msgstr "Caduca después de"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Estableciéndolo a '0' guarda la contraseña durante toda la sesión"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163
-#: src/plugins/rssyl/rssyl_feed_props.c:476
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
+#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:476
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
 msgstr "minutos"
@@ -12367,8 +12361,8 @@ msgstr "Mostrar la consola de Python..."
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2518
-#: src/prefs_account.c:2540 src/prefs_account.c:2809 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
+#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Explorar"
@@ -12695,8 +12689,7 @@ msgstr "Recuperar los comentarios de elementos con una antiguedad inferior a"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553
-#: src/prefs_matcher.c:337
+#: src/prefs_account.c:1480 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
 msgid "days"
 msgstr "días"
 
@@ -13324,7 +13317,7 @@ msgid "Next month"
 msgstr "Mes siguiente"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:735
+#: src/plugins/vcalendar/vcal_prefs.c:729
 msgid "vCalendar"
 msgstr "vCalendar"
 
@@ -13757,15 +13750,15 @@ msgstr "Esta semana"
 msgid "Later"
 msgstr "Más tarde"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Aceptada: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Rehusada: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Aceptada provisionalmente: "
 
@@ -13790,8 +13783,7 @@ msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
 msgstr ""
-"Las siguientes personas están ocupadas a la hora planeada para su "
-"reunión:\n"
+"Las siguientes personas están ocupadas a la hora planeada para su reunión:\n"
 "- "
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:780
@@ -14214,12 +14206,12 @@ msgstr "hubo un error en la sesión POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "orden TOP no soportada\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1451 src/prefs_account.c:2446
+#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
 #: src/wizard.c:1499
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1564 src/prefs_account.c:2461
+#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14308,40 +14300,40 @@ msgstr "orden para enviar los correos"
 msgid "Account%d"
 msgstr "Cuenta%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Entrada por defecto"
 
-#: src/prefs_account.c:1438 src/prefs_account.c:1445 src/prefs_account.c:1527
-#: src/prefs_account.c:1534
+#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
+#: src/prefs_account.c:1537
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Utilizar autenticación segura (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibirlos"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Eliminar después de"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1484
+#: src/prefs_account.c:1477 src/prefs_account.c:1487
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 días y 0 horas: borrar inmediatamente"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Límite de tamaño al recibir"
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1503
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14349,83 +14341,83 @@ msgstr ""
 "Los mensajes que sobrepasen este límite serán recuperados parcialmente. Al "
 "seleccionarlos podrá descargarlos por completo o borrarlos."
 
-#: src/prefs_account.c:1540 src/prefs_account.c:2476
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "sin límite si se especifica 0"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Texto plano"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(vacío habitualmente)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Mostrar sólo carpetas suscritas"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Modo de ancho de banda eficiente (evita recuperar las etiquetas remotas)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Este modo usa menos ancho de banda, pero puede ser más lento con algunos "
 "servidores."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permitir el filtrado usando módulos al recibir"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "«Recibir correo» comprueba si hay nuevos mensajes en esta cuenta"
 
-#: src/prefs_account.c:1722 src/prefs_customheader.c:208
+#: src/prefs_account.c:1725 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Generar identificador de mensaje"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Enviar la dirección de correo de la cuenta en el «Message-Id»"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Añadir cabecera de agente de usuario"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticación SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1840
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14433,177 +14425,177 @@ msgstr ""
 "Si deja estos campos vacíos, se utilizarán el mismo identificador de usuario "
 "y contraseña usados para la recepción."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticación con POP3 antes de enviar"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Tiempo límite para autenticación POP: "
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Insertar la firma automáticamente"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Separador de la firma"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Diccionarios de corrección ortográfica"
 
-#: src/prefs_account.c:2076 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Diccionario por omisión"
 
-#: src/prefs_account.c:2089 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Diccionario alternativo predeterminado"
 
-#: src/prefs_account.c:2175 src/prefs_account.c:3328
+#: src/prefs_account.c:2181 src/prefs_account.c:3341
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account.c:2190 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2205 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Sistema de privacidad por omisión"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Firmar siempre los mensajes"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Cifrar siempre los mensajes"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Firmar siempre los mensajes al responder a un mensaje firmado"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Cifrar siempre los mensajes al responder a un mensaje cifrado"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifrar los mensajes enviados con la clave propia además de las del "
 "destinatario"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en claro los mensajes enviados cifrados"
 
-#: src/prefs_account.c:2450 src/prefs_account.c:2465 src/prefs_account.c:2479
+#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2502
+#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar la orden STARTTLS para abrir la sesión SSL"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL (pero usar STARTTLS si es necesario)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Certificados de cliente"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Certificado para recepción"
 
-#: src/prefs_account.c:2520 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2544
+#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
+#: src/prefs_account.c:2550
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado de cliente como fichero PKCS12 o PEM"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Certificado para envío"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Aceptar automáticamente los certificados SSL válidos"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL no-bloqueante"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desactive esto si tiene problemas de conexión con SSL"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "Puerto POP3"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "Puerto IMAP4"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Nombre de dominio"
 
-#: src/prefs_account.c:2743
+#: src/prefs_account.c:2756
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14611,112 +14603,112 @@ msgstr ""
 "El nombre de dominio se usará en la parte derecha de los identificadores de "
 "mensaje generados («Message-Id») y al conectar a servidores SMTP."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "No se especificó el servidor POP3."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "La carpeta de entrada por omisión no existe."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "No se especificó el servidor IMAP4."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "no se especificó el nombre de fichero del buzón local."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "no se especificó el mandato de correo."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account.c:3346 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferencias de la cuenta"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Falló (dirección errónea)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Seleccionar fichero de firma"
 
-#: src/prefs_account.c:4019 src/prefs_account.c:4036 src/wizard.c:1066
+#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Seleccionar fichero del certificado"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (módulo no cargado)"
@@ -14838,21 +14830,20 @@ msgid "Do you really want to delete all the actions?"
 msgstr "¿Realmente quiere borrar todas las acciones?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
-#: src/prefs_template.c:572 src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
+#: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573
-#: src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
-#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Seguir editando"
 
@@ -14976,15 +14967,15 @@ msgstr "Acciones actuales"
 msgid "Action string is not valid."
 msgstr "La cadena de la acción no es válida."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hola,\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "El %d\\n%f escribió:\\n%q\\n%X"
 
-#: src/prefs_common.c:306 src/prefs_quote.c:85
+#: src/prefs_common.c:307 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -14993,7 +14984,7 @@ msgstr ""
 "t{Para: %t\\n}?c{Cc: %c\\n}?n{Grupos de noticias: %n\\n}?s{Asunto: %s\\n}\\n"
 "\\n%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -16352,8 +16343,8 @@ msgid ""
 "\n"
 "Do you want to exit now?"
 msgstr ""
-"Su configuración de Claws Mail corresponde a una versión más moderna que "
-"la versión que está usando actualmente.\n"
+"Su configuración de Claws Mail corresponde a una versión más moderna que la "
+"versión que está usando actualmente.\n"
 "\n"
 "Esto no está recomendado.\n"
 "\n"
diff --git a/po/fi.po b/po/fi.po
index 9b53dc2..b38c3b3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.14.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-01 21:41+0100\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-08-03 00:47+0200\n"
 "Last-Translator: Flammie Pirinen <flammie at iki.fi>\n"
 "Language-Team: Finnish <laatu at lokalisointi.org>\n"
@@ -106,7 +106,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Hae viestit hakee viestit merkityiltä tileiltä"
 
 #: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1264
+#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -119,7 +119,7 @@ msgstr "Hae viestit hakee viestit merkityiltä tileiltä"
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4128
+#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Käytäntö"
 
@@ -830,8 +830,8 @@ msgstr "Osoitekirjat"
 msgid "Person"
 msgstr "Henkilö"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:343
-#: src/folderview.c:431 src/prefs_account.c:2786 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
+#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Kansio"
 
@@ -971,19 +971,18 @@ msgstr "Osoitteiden päivitys"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Päivitys epäonnistui. Muutoksia ei kirjoitettu hakemistoon."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Huomautus"
 
-#: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
-#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867
-#: src/plugins/pgpcore/sgpgme.c:788 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4866
+#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
+#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
 msgid "Warning"
 msgstr "Varoitus"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5632 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Virhe"
@@ -1016,83 +1015,83 @@ msgstr "LDAP-nimi"
 msgid "Attribute Value"
 msgstr "Attribuutin arvo"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Ei mitään"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "näytin"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "MIME-tulkitsin"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "kansiot"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "suodatus"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "yksityisyysrajapinta"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "ilmoitin"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "toiminto"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "juttuja"
 
-#: src/common/plugin.c:332
+#: src/common/plugin.c:334
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Tämä liitännäinen on %s (%s),samoin kuin olemassaoleva %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Liitännäinen on jo ladattu"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Muistin varaaminen liitännäiselle epäonnistui"
 
-#: src/common/plugin.c:480
+#: src/common/plugin.c:482
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "Tämä moduuli ei ole GPL v3 tai myöhempi -yhteensopivasti lisensoitu."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Tämä moduuli on Claws Mailin GTK+1-versiolle."
 
-#: src/common/plugin.c:771
+#: src/common/plugin.c:769
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr "Claws Mail on uudempi kuin mille liitännäinen %s on käännetty"
 
-#: src/common/plugin.c:774
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "Claws Mail on uudempi kuin mille liitännäinen on käännetty"
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:781
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Claws Mail on liian vanha liitännäiselle %s"
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Claws Mail on liian vanha liitännäiselle"
 
@@ -1262,212 +1261,212 @@ msgstr "%d,%02d Mt"
 msgid "%.2fGB"
 msgstr "%.2f Gt"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "sunnuntai"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "maanantai"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "tiistai"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "keskiviikko"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "torstai"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "perjantai"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "lauantai"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "tammikuu"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "helmikuu"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "maaliskuu"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "huhtikuu"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "toukokuu"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "kesäkuu"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "heinäkuu"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "elokuu"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "syyskuu"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "lokakuu"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "marraskuu"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "joulukuu"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "su"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "ma"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "ti"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "ke"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "to"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "pe"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "la"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "tammi"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "helmi"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "maalis"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "huhti"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "touko"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "kesä"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "heinä"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "elo"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "syys"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "loka"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "marras"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "joulu"
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "Ap."
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "Ip."
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "ap."
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "ip."
@@ -1481,7 +1480,7 @@ msgstr "_Lisää…"
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Asetukset"
 
@@ -1917,7 +1916,7 @@ msgstr "Olet lisäämässä tiedostoa %s viestiin. Jatketaanko?"
 msgid "Are you sure?"
 msgstr "Toteutetaanko?"
 
-#: src/compose.c:3628 src/compose.c:10529 src/compose.c:11390
+#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
 msgid "_Insert"
 msgstr "_Lisää"
 
@@ -1973,7 +1972,7 @@ msgstr ""
 "Valitse postitili ennen lähettämistä."
 
 #: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
-#: src/prefs_account.c:3310 src/toolbar.c:406 src/toolbar.c:424
+#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Lähetä"
 
@@ -1981,8 +1980,8 @@ msgstr "Lähetä"
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Ainoa vastaanottaja on oletuskopio-osoite. Lähetetäänkö silti?"
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5633
-#: src/folderview.c:2445 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
+#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Lähetä"
@@ -2016,7 +2015,7 @@ msgstr "Lisätäänkö jonoon?"
 msgid "Send later"
 msgstr "Lähetä myöhemmin"
 
-#: src/compose.c:5169 src/compose.c:9993
+#: src/compose.c:5169 src/compose.c:9999
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2026,7 +2025,7 @@ msgstr ""
 "\n"
 "Merkistön muunnos epäonnistui."
 
-#: src/compose.c:5172 src/compose.c:9996
+#: src/compose.c:5172 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2036,7 +2035,7 @@ msgstr ""
 "\n"
 "Vastaanottajan salausavainta ei saatu."
 
-#: src/compose.c:5178 src/compose.c:9990
+#: src/compose.c:5178 src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2081,7 +2080,7 @@ msgstr ""
 "Käytä pääikkunan Lähetä jonottavat viestit -painiketta yrittääksesi "
 "uudelleen."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2091,7 +2090,7 @@ msgstr ""
 "Viestin merkistön muutos merkistöstä merkistölle %s\n"
 "ei onnistu, lähetetäänkö se joka merkistöllä %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2104,73 +2103,72 @@ msgstr ""
 "\n"
 "Lähetetäänkö joka tapauksessa?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Ei voitu salata viesti': %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Salausvaroitus"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "_Jatka"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Sähköpostin lähettämiseen tarkoitettu tiliä ei ole saatavilla!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Tili ei ole NNTP:lle joten lähetys ei onnistu."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Liitetiedostoa %s ei enää ole, ohitetaanko?"
 
-#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231
-#: src/toolbar.c:2167
+#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Peruuta lähetys"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ohita liite"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Alkuperäinen osa %s"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Lisää osoitekirj_aan"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Poista kohteen sisältö"
 
-#: src/compose.c:6997 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Käytä tabulaattoria automaattiseen täydennykseen osoitekirjasta"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "MIME-tyyppi"
 
-#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Koko"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Tallenna viesti kohteeseen "
 
-#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2181,23 +2179,23 @@ msgstr "Tallenna viesti kohteeseen "
 msgid "_Browse"
 msgstr "_Selaa"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "_Otsake"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Liitteet"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "_Muut"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2206,19 +2204,19 @@ msgstr ""
 "Oikolukua ei voitu käynnistää.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_Lähettäjä:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Viestissä käytettävä tili"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Käytettävä lähettäjäosoite"
 
-#: src/compose.c:8373
+#: src/compose.c:8379
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2227,68 +2225,68 @@ msgstr ""
 "Salausjärjestelmää %s ei voi ladata. Viestien salaus tai allekirjoitus tälle "
 "viestille ei onnistu."
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: src/compose.c:8575 src/prefs_template.c:760
+#: src/compose.c:8581 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Mallineen sisällön muotovirhe rivillä %d."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Mallineen lähettäjän muodon virhe."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Mallineen vastaanottajan muodon virhe."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Mallineen kopioiden muodon virhe."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Mallineen piilokopioiden muodon virhe."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Mallineen paluuosoitteen muodon virhe."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Viestin aiheen muodon virhe."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Virheellinen MIME-tyyppi."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Tiedostoa ei ole tai se on tyhjä"
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Asetukset"
 
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "MIME-tyyppi"
 
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Polku"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Tiedostonimi"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2299,15 +2297,15 @@ msgstr ""
 "Suljetaanko se väkisin?\n"
 "prosessiryhmän id: %d"
 
-#: src/compose.c:9959 src/messageview.c:1096
+#: src/compose.c:9965 src/messageview.c:1096
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Sähköpostin lähettämiseen tarvitaan verkkoyhteyttä."
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Viestin lisääminen jonoon ei onnistunut."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2318,15 +2316,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Ei voitu tallentaa luonnosta."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Ei voitu tallentaa luonnosta"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2334,24 +2332,24 @@ msgstr ""
 "Luonnosta ei voitu tallentaa.\n"
 "Perutaanko lopetus vai poistetaanko viestin?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Peru lopetus"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Poista viesti"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Valitse tiedosto"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Tiedostoa ”%s” ei voitu lukea."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2360,70 +2358,70 @@ msgstr ""
 "Tiedosto ”%s” sisältää nykyiseen koodaukseen\n"
 "sopimattomia merkkejä, lisäykset saattavat olla virheellisiä."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Poista viesti"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Tätä viestiä on muokattu, poistetaanko se?"
 
-#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Poista"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "_Pane luonnoksiin"
 
-#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Tallenna muutokset"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Tätä viestiä on muokattu, tallennetaanko muutokset?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Älä tallenna"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Haluatko käyttää mallinetta ”%s”?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Käytä mallinetta"
 
-#: src/compose.c:10529 src/prefs_actions.c:329
-#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
-#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
+#: src/compose.c:10535 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Liitä vai sisällytä?"
 
-#: src/compose.c:11388
+#: src/compose.c:11400
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 "Haluatko sisällyttää tiedostot viestin sisältöön vai liitetiedostoiksi?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Liitä"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Lainausten merkintöjen muotovirhe rivillä %d."
 
-#: src/compose.c:11902
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2640,7 +2638,7 @@ msgid " Check File "
 msgstr " Tarkasta tiedosto "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1970
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Tiedosto"
@@ -2788,7 +2786,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3383
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
@@ -2964,7 +2962,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Yläraja haussa palautettavien kenttien määrälle."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Perus"
 
@@ -3648,10 +3646,10 @@ msgstr "Valitse hakemisto"
 msgid "NewFolder"
 msgstr "UusiKansio"
 
-#: src/foldersel.c:592 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:422 src/plugins/rssyl/rssyl_cb_menu.c:204
+#: src/foldersel.c:592 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:422
+#: src/plugins/rssyl/rssyl_cb_menu.c:204
 #: src/plugins/vcalendar/vcal_folder.c:2056
 #, c-format
 msgid "'%c' can't be included in folder name."
@@ -3672,157 +3670,157 @@ msgstr "Kansio ”%s” on jo olemassa."
 msgid "Can't create the folder '%s'."
 msgstr "Kansiota ”%s” ei voi luoda."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Merkitse kaikki _luetuiksi"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Merkitse kaikki luetuiksi rekursii_visesti"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "S_uorita käsittelysäännöt"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Hae hakemistosta…"
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "_Käsittely…"
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "_Tyhjennä roskakori…"
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Lähetä _jonottavat…"
 
-#: src/folderview.c:385 src/folderview.c:432
+#: src/folderview.c:389 src/folderview.c:436
 #: src/plugins/notification/notification_lcdproc.c:141
 #: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
 msgid "New"
 msgstr "Uusi"
 
-#: src/folderview.c:386 src/folderview.c:433
+#: src/folderview.c:390 src/folderview.c:437
 #: src/plugins/notification/notification_lcdproc.c:145
 #: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
 msgid "Unread"
 msgstr "Lukematta"
 
-#: src/folderview.c:387 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:391 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Yhteensä"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:435 src/summaryview.c:445
+#: src/folderview.c:439 src/summaryview.c:445
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:765
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr "Asetetaan hakemiston tietoja…"
 
-#: src/folderview.c:837
+#: src/folderview.c:845
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
 msgstr "Merkitäänkö kaikki kansion ja alikansioiden viestit luetuiksi?"
 
-#: src/folderview.c:839 src/summaryview.c:4115
+#: src/folderview.c:847 src/summaryview.c:4115
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Merkitäänkö kaikki kansion viestit luetuiksi?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Merkitse kaikki luetuksi"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Luetaan hakemistoa %s/%s..."
 
-#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1030 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Luetaan hakemistoa %s..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Uudelleenrakenna kansioopuu"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "Kansiopuun rakennus tuhoaa paikallisen välimuistin. Rakennetaanko?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Rakennetaan uudelleen kansiopuuta…"
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Luetaan kansiopuuta…"
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kansiota %s ei pysty lukemaan\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Tarkastetaan uudet viestit kaikissa kansioissa…"
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Suljetaan kansiota %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Avataan kansiota %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Kansiota ei voitu avata."
 
-#: src/folderview.c:2386 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Empty trash"
 msgstr "Tyhjä roskis"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Poistetaanko kaikki viestit roskiksesta?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Tyhjennä roskat"
 
-#: src/folderview.c:2431 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Yhteydettömyysvaroitus"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Olet poissa linjoilta. Palataanko?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Lähetä jonottavat viestit"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Lähetetäänkö kaikki jonottavat viestit?"
 
-#: src/folderview.c:2453 src/toolbar.c:2647
+#: src/folderview.c:2466 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Jonottavien viestien lähetyksessä tapahtui virheitä."
 
-#: src/folderview.c:2456 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2469 src/main.c:2743 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3831,64 +3829,64 @@ msgstr ""
 "Jonottavien viestien lähetyksessä tapahtui virheitä:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Kopioidaanko kansio %s kohteessa %s?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Tehdäänkö kansiosta %s kansion %s alikansio?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Kopioi kansio"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Siirrä kansio"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopioidaan kohteesta %s kohteeseen %s…"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Siirretään kohteesta %s kohteeseen %s…"
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Lähde ja kohde ovat samoja."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Ei voida kopioida hakemistoa lapsekseen."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Ei voida siirtää hakemistoa lapsekseen."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Kansiota ei voida siirtää postilaatikkojen välillä."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Kopiointi epäonnistui!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Siirto epäonnistui!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Kansion %s asetuksia luetaan"
 
-#: src/folderview.c:3068 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Kohdekansiota voidaan käyttää vain alikansioiden säilytykseen."
 
@@ -4228,63 +4226,63 @@ msgstr "_Julkaisutiedotteet"
 msgid "_Statistics"
 msgstr "_Tilastot"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Oranssi"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Punainen"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Pinkki"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Taivaansininen"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Sininen"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Vihreä"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Ruskea"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Harmaa"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Vaaleanruskea"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Tummanpunainen"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Tummanpinkki"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Teräksenharmaa"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Kultainen"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Kirkas vihreä"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5019,7 +5017,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:734 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:728 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Liitännäiset"
 
@@ -5061,9 +5059,9 @@ msgid "_Hide"
 msgstr "_Piilota"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3273 src/prefs_account.c:3291 src/prefs_account.c:3309
-#: src/prefs_account.c:3327 src/prefs_account.c:3345 src/prefs_account.c:3363
-#: src/prefs_account.c:3382 src/prefs_account.c:3475
+#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
+#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
+#: src/prefs_account.c:3395 src/prefs_account.c:3488
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -5769,8 +5767,8 @@ msgstr "Yhteydenotto kohteeseen %s epäonnistui"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-yhteys kohteeseen %s on katkennut, yhdistetään uudelleen…\n"
 
-#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
-#: src/imap.c:4622 src/imap.c:5433
+#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
+#: src/imap.c:4620 src/imap.c:5431
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "IMAP-palvelimeen ei saada yhteyttä ilman verkkoyhteyttä."
 
@@ -5810,85 +5808,85 @@ msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä\n"
 
-#: src/imap.c:1255 src/imap.c:4112
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr "TLS-session aloitus ei onnistu.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Yhdistetään IMAP-palvelimeen: %s…\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Yhdistetään IMAP-palvelimeen: %s…"
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Lisätään viestejä…"
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopioidaan viestejä…"
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "poistomerkkejä ei voitu asettaa\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "ei voida hävittää\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Haetaan tilaamattomia kansioita kohteesta %s…"
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Haetaan kansion %s alikansioita…"
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei voitu luoda postilaatikkoa: LIST epäonnistui\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "ei voitu luoda postilaatikkoa\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ei voida uudelleennimetä postilaatikkoa %s %s:ksi\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "ei voida poistaa postilaatikkoa\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST epäonnistui\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Merkitään viestejä…"
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "hakemistoa %s ei voida valita\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Palvelin vaatii TLS:ää kirjautumiseen\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Ominaisuuksia ei voida päivittää.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5897,20 +5895,20 @@ msgstr ""
 "Yhteydenotto palvelimelle %s epäonnistui: palvelin vaatii TLS:ää, mutta "
 "Claws Mail on käännetty ilman TLS-tukea.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Palvelimelle kirjautuminen on poissa käytöstä.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Haetaan viestiä…"
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "poistomerkkejä ei voitu asettaa: %d\n"
 
-#: src/imap.c:6091
+#: src/imap.c:6089
 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"
@@ -6093,8 +6091,8 @@ msgstr "tilata"
 msgid "unsubscribe"
 msgstr "epätilata"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428
-#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
+#: src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Pätee myös alikansioihin"
 
@@ -7831,7 +7829,7 @@ msgstr "Korvaa olemassaoleva mbox-tiedosto"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tiedosto on jo olemassa, korvataanko?"
 
-#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Korvaa"
@@ -7881,7 +7879,7 @@ msgstr "Haku päättyi"
 msgid "Compose _new message"
 msgstr "Kirjoita _uusi viesti"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
+#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail — Viestinäkymä"
 
@@ -7919,65 +7917,65 @@ msgstr ""
 "lähetetty suoraan sinulle.\n"
 "Saapumisilmoitus kannattaa peruuttaa."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Haetaan viestiä (%s)…"
 
-#: src/messageview.c:1409 src/procmime.c:1008
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Ei voitu salata: %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1493 src/messageview.c:1501
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Viesti ei noudata MIME-standardia ja saattaa hajota."
 
-#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
+#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Tallenna nimellä"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Korvataanko olemassaoleva tiedosto?"
 
-#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Tiedostoa ”%s” ei voida tallentaa."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Näytä koko %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Vain ensimmäinen megatavu näytetään."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1950
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr ""
 "Sait saapumisilmoituksen tälle viestille: se on näytetty vastaanottajalle."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Pyysit saapumisilmoituspyyntöä tässä viestissä."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Viestissä on saapumisilmoituspyyntö."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Lähetä ilmoitus."
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7985,7 +7983,7 @@ msgstr ""
 "Tämä viesti on osittain haettu,\n"
 "ja poistettu jo palvelimelta."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7994,15 +7992,15 @@ msgstr ""
 "Tämä viesti on osittain haettu;\n"
 "se on %s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Merkitse ladattavaksi"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Merkitse poistettavaksi"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8011,12 +8009,12 @@ msgstr ""
 "Tämä viesti on osittain ladattu;\n"
 "se on %s ja ladataan kokonaan."
 
-#: src/messageview.c:2021 src/messageview.c:2034
+#: src/messageview.c:2024 src/messageview.c:2037
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Poista merkintä"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8025,11 +8023,11 @@ msgstr ""
 "Tämä viesti on osittain ladattu;\n"
 "se on %s ja poistetaan."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Saapumisilmoituspyyntö"
 
-#: src/messageview.c:2101
+#: src/messageview.c:2104
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8039,19 +8037,19 @@ msgstr ""
 "Viesti on lähetetty useille tileistäsi.\n"
 "Valitse mitä niistä käytät saapumisilmoituksen lähettämiseen:"
 
-#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Lähetä ilmoitus"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Tulostus ei onnistu: viestissä ei ole sisältötekstiä"
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8059,7 +8057,7 @@ msgstr ""
 "\n"
 "  Kansiossa ei ole viestejä"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8067,7 +8065,7 @@ msgstr ""
 "\n"
 "  Viesti on poistettu"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8075,7 +8073,7 @@ msgstr ""
 "\n"
 "  Viesti on poistettu tai siirretty toiseen kansioon"
 
-#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
+#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Virhe luokiteltaessa roskapostia muistiin.\n"
@@ -8186,8 +8184,7 @@ msgid "Go back to email"
 msgstr "Palaa sähköpostiin"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190
-#: src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Ei voida tallentaa osaa moniosaviestistä: %s"
@@ -8308,34 +8305,34 @@ msgstr "Ilman verkkoytheyttä ei voi yhdistää nyyssipalvelimelle."
 msgid "couldn't select group: %s\n"
 msgstr "ei voida valita ryhmää: %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1054 src/news.c:1224
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "ei voida asettaa ryhmää: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "virheellinen viestiväli: %d—%d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1133 src/news.c:1157 src/news.c:1181
 msgid "couldn't get xhdr\n"
 msgstr "ei voida hakea xhdr:ää\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "haetaan xover %d—%d kohteesta %s…\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "ei voida hakea xoveria\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "virheellinen xover-rivi\n"
 
-#: src/news.c:1446
+#: src/news.c:1449
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -9138,8 +9135,7 @@ msgstr ""
 "Älä tarkasta puuttuvia liitetiedostoja kun edelleenlähetetään tai "
 "uudelleenohjataan"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135
-#: src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
@@ -9249,14 +9245,12 @@ msgstr ""
 "\n"
 "Asetukset ovat valikossa Asetukset→Asetukset→Liitännäiset→BogoFilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043
-#: src/plugins/bsfilter/bsfilter.c:676
+#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Roskapostin tunnistus"
 
-#: src/plugins/bogofilter/bogofilter.c:1044
-#: src/plugins/bsfilter/bsfilter.c:677
+#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Roskapostin oppiminen"
@@ -9281,7 +9275,7 @@ msgstr "Ylärajaa suurempia viestejä ei tarkisteta."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "Kt"
 
@@ -9843,7 +9837,7 @@ msgstr "CSS tässä tiedostossa sovelletaan kaikkiin HTML-osiin"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1442 src/prefs_account.c:1531 src/prefs_account.c:2002
+#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Selaa"
@@ -10141,7 +10135,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Gdata-liitännäinen: Aloitetaan varmennuksen päivitys\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Todennus"
 
@@ -10316,7 +10310,7 @@ msgstr "Säilytä kuvakkeet levyllä ja vältä toistuvat verkkokyselyt"
 msgid "Cache refresh interval"
 msgstr "Välimuistin päivitysvuoroväli"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1487
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1490
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr "tunnin jälkeen"
@@ -10693,7 +10687,7 @@ msgstr "Määritä todennus"
 #: src/plugins/managesieve/sieve_prefs.c:240
 #: src/plugins/vcalendar/vcal_prefs.c:348
 #: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
-#: src/prefs_account.c:1795
+#: src/prefs_account.c:1798
 msgid "User ID"
 msgstr "Käyttäjätunnus"
 
@@ -10701,18 +10695,18 @@ msgstr "Käyttäjätunnus"
 #: src/plugins/rssyl/rssyl_feed_props.c:395
 #: src/plugins/vcalendar/vcal_prefs.c:356
 #: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
-#: src/prefs_account.c:1815 src/prefs_account.c:2529 src/prefs_account.c:2551
+#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
 #: src/wizard.c:1215 src/wizard.c:1635
 msgid "Password"
 msgstr "Salasana"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1570
-#: src/prefs_account.c:1767
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
+#: src/prefs_account.c:1770
 msgid "Authentication method"
 msgstr "Varmennuskeino"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1580
-#: src/prefs_account.c:1776 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
+#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
 msgid "Automatic"
 msgstr "Automaattinen"
 
@@ -11627,9 +11621,8 @@ msgstr "Vanhenee"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Asettamalla nollaksi salasana muistetaan session ajan"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163
-#: src/plugins/rssyl/rssyl_feed_props.c:476
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
+#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:476
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
 msgstr "minuuttia"
@@ -12245,8 +12238,8 @@ msgstr "Näytä Pythonin konsoli..."
 msgid "Refresh"
 msgstr "Päivitä"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2518
-#: src/prefs_account.c:2540 src/prefs_account.c:2809 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
+#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Selaa"
@@ -12563,8 +12556,7 @@ msgstr "Hae kommentit jos viesti on uudempi kuin"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553
-#: src/prefs_matcher.c:337
+#: src/prefs_account.c:1480 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
 msgid "days"
 msgstr "päivän jälkeen"
 
@@ -13181,7 +13173,7 @@ msgid "Next month"
 msgstr "Seuraava kuukausi"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:735
+#: src/plugins/vcalendar/vcal_prefs.c:729
 msgid "vCalendar"
 msgstr "vKalenteri"
 
@@ -13611,15 +13603,15 @@ msgstr "Tämä viikko"
 msgid "Later"
 msgstr "Myöhempi"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Hyväksynyt: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Kieltäytynyt: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Alustavasti hyväksynyt kutsun:"
 
@@ -14064,12 +14056,12 @@ msgstr "virhe POP3‐session aikana\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP‐komentoa ei tueta\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1451 src/prefs_account.c:2446
+#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
 #: src/wizard.c:1499
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1564 src/prefs_account.c:2461
+#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -14158,40 +14150,40 @@ msgstr "postin lähetyskomento"
 msgid "Account%d"
 msgstr "Tili%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Paikallinen"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Oletusarvoinen saapuneet-kansio"
 
-#: src/prefs_account.c:1438 src/prefs_account.c:1445 src/prefs_account.c:1527
-#: src/prefs_account.c:1534
+#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
+#: src/prefs_account.c:1537
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Suodattamattomat viestit tallennetaan tänne"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Käytä turvallista tunnistautumista (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Poista viestit palvelimelta hakemisen jälkeen"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Poista"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1484
+#: src/prefs_account.c:1477 src/prefs_account.c:1487
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 päivän ja 0 tunnin jälkeen: poistetaan heti"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Hakemisen koon yläraja"
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1503
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14199,82 +14191,82 @@ msgstr ""
 "Tätä suuremmat viestit ladataan vain osittain. Kun ne valitaan ne voi ladata "
 "kokonaan tai poistaa."
 
-#: src/prefs_account.c:1540 src/prefs_account.c:2476
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr "Ladattavien viestien määrän yläraja"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "rajoittamaton, jos luku on nolla"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Pelkkä teksti"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "IMAP-palvelimen hakemisto"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(yleensä tyhjä)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Näytä vain tilatut kansiot"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Kaistaa säästävä tila (ei hae etätägejä)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Tässä tilassa käytetään vähemmän kaistaa, mutta se saattaa ollahitaampi "
 "joillain palvelimilla."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Suodata viestit haettaessa"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Mahdollista liitännäissuodatus viesteille haettaessa"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "”Hae kaikki” tarkastaa tämän tilin uudet viestit"
 
-#: src/prefs_account.c:1722 src/prefs_customheader.c:208
+#: src/prefs_account.c:1725 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "Otsake"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Luo viestin tunniste"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Lähetä tilin osoite Message-Id:ssä"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Lisää sovellusotsake (User-Agent)"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Lisää mukautettu otsakekenttä"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-todennus (SMTP AUTH)"
 
-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1840
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14282,177 +14274,177 @@ msgstr ""
 "Jos nämä kentät jätetään tyhjiksi, käytetään samaa käyttäjätunnusta ja "
 "salasanaa kuin viestejä haettaessa."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Todenna POP3:lla ennen lähetystä"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "POP-todennuksen aikakatkaisu: "
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Allekirjoitus"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Lisää allekirjoitus automaattisesti"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Allekirjoituksen erotin"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Komennon tuloste"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Aseta seuraavat osoitteet automaattisesti"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Oikeinkirjoitussanakirjat"
 
-#: src/prefs_account.c:2076 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Oletussanakirja"
 
-#: src/prefs_account.c:2089 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Oletusvaihtoehtosanakirja"
 
-#: src/prefs_account.c:2175 src/prefs_account.c:3328
+#: src/prefs_account.c:2181 src/prefs_account.c:3341
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Viestin kirjoitus"
 
-#: src/prefs_account.c:2190 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Vastaa"
 
-#: src/prefs_account.c:2205 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Edelleenlähetä"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Oletusarvoinen yksityisyysturvajärjestelmä"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Allekirjoita viestit aina"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Salaa viestit aina"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 "Allekirjoita viestit oletusarvoisesti vastattaessa allekirjoitettuun "
 "viestiin."
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Salaa viestit oletusarvoisesti vastattaessa salattuun viestiin."
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Salaa viestit omalla avaimella vastaanottajan lisäksi"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Tallenna lähetetyt salatut viestit salaamattomina"
 
-#: src/prefs_account.c:2450 src/prefs_account.c:2465 src/prefs_account.c:2479
+#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
 msgid "Don't use SSL"
 msgstr "Älä käytä SSL:ää"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Käytä SSL:ää POP3-yhteydelle"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2502
+#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Aloita SSL-sessio STARTTLS-komennolla"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Käytä SSL:ää IMAP4-yhteydelle"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Käytä SSL:ää NNTP-yhteydelle"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Lähetys (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Älä käytä SSL:ää (mutta käytä STARTTLS:ää tarvittaessa)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Käytä SSL:ää SMTP-yhteydelle"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Asiakasvarmenteet"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Vastaanottovarmenne"
 
-#: src/prefs_account.c:2520 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2544
+#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
+#: src/prefs_account.c:2550
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Asiakassertifikaatti PKCS12- tai PEM-tiedostona"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Lähetysvarmenne"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Hyväksy automaattisesti tuntemattomat mutta validit SSL-sertifikaatit"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Käytä blokkaamatonta SSL:ää"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Aseta tämä pois päältä jos SSL-yhteydessä on ongelmia"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP-portti"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "POP3-portti"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "IMAP4-portti"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "NNTP-portti"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Verkkotunnus"
 
-#: src/prefs_account.c:2743
+#: src/prefs_account.c:2756
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14460,112 +14452,112 @@ msgstr ""
 "Verkkotunnusta käytetään Message-Id:n osana ja SMTP-palvelimille "
 "yhdistettäessä."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Käytä palvelimen kanssa kommunikointiin komentoa"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Merkitse yhteislähetetyt viestit luetuiksi ja värillä:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Pane lähetetyt viestit kansioon"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Pane poistetut viestit kansioon"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Pane luonnokset kansioon"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Pane poistetut viestit kansioon"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Tilin nimeä ei syötetty."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Postiosoitetta ei syötetty."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "SMTP-palvelinta ei syötetty."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Käyttäjän tunnistetta ei syötetty."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "POP3-palvelinta ei syötetty."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Oletusarvoinen saapuneet-kansio puuttuu."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-palvelinta ei syötetty."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "NNTP-palvelinta ei syötetty."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "paikallisen postilaatikon tiedostonimeä ei syötetty."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "lähetyskomentoa ei syötetty."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Haku"
 
-#: src/prefs_account.c:3346 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Mallineet"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Uuden tilin asetukset"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s — Tilin asetukset"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Epäonnistui (väärä osoite)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Valitse allekirjoitustiedosto"
 
-#: src/prefs_account.c:4019 src/prefs_account.c:4036 src/wizard.c:1066
+#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Valitse varmennetiedosto"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Käytäntö:"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (liitännäistä lataamatta)"
@@ -14687,21 +14679,20 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Poistetaanko kaikki toiminnot?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
-#: src/prefs_template.c:572 src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
+#: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Kenttää on tallentamatta"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573
-#: src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Kenttää ei ole tallennettu, suljetaanko joka tapauksessa?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
-#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Jatka muokkausta"
 
@@ -14821,15 +14812,15 @@ msgstr "Nykyiset toiminnot"
 msgid "Action string is not valid."
 msgstr "Toimintomerkkijono ei ole toimiva."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hei,\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "%d\\n%f kirjoitti:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:306 src/prefs_quote.c:85
+#: src/prefs_common.c:307 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -14839,7 +14830,7 @@ msgstr ""
 "\\n}\\n\\n%M"
 
 # strftime; esim. ”Maanantai 28.2.1984 13.52”
-#: src/prefs_common.c:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%A %x %H.%M"
 
diff --git a/po/fr.po b/po/fr.po
index 5232de2..f4b9047 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -643,14 +643,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-01 21:41+0100\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-08-04 18:33+0100\n"
 "Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
 "Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "X-Generator: Poedit 1.5.4\n"
 
@@ -713,10 +713,11 @@ msgstr "R"
 
 #: src/account.c:1568
 msgid "'Get Mail' retrieves mail from the checked accounts"
-msgstr "La fonctionnalité « Relever » récupèrera le courrier des comptes cochés"
+msgstr ""
+"La fonctionnalité « Relever » récupèrera le courrier des comptes cochés"
 
 #: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7224 src/editaddress.c:1264
+#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
 #: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
@@ -729,7 +730,7 @@ msgstr "La fonctionnalité « Relever » récupèrera le courrier des comptes co
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4128
+#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -1460,8 +1461,8 @@ msgstr "Carnets d'adresses"
 msgid "Person"
 msgstr "Contact"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:343
-#: src/folderview.c:431 src/prefs_account.c:2786 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
+#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Dossier"
 
@@ -1604,19 +1605,18 @@ msgstr ""
 "La mise à jour a échoué. Les modifications ne seront pas appliquées au "
 "répertoire."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:159 src/compose.c:5691 src/compose.c:6214
-#: src/compose.c:11908 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867
-#: src/plugins/pgpcore/sgpgme.c:788 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4866
+#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
+#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
 msgid "Warning"
 msgstr "Alerte"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5632 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Erreur"
@@ -1649,67 +1649,67 @@ msgstr "Nom LDAP"
 msgid "Attribute Value"
 msgstr "Valeur de l'attribut"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "« Rien »"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "un visualiseur"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "un parser MIME"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "des dossiers"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "un outil de filtrage"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "une interface de confidentialité"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "un notificateur"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "un utilitaire"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "des choses"
 
-#: src/common/plugin.c:332
+#: src/common/plugin.c:334
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Ce module fournit %s (%s), qui est déjà fourni par le module %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Module déjà chargé."
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Échec lors de l'allocation de la mémoire pour le module."
 
-#: src/common/plugin.c:480
+#: src/common/plugin.c:482
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Ce module n'est pas distribué sous la licence GPL en version 3 ou une "
 "licence ultérieure compatible."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Ce module est pour Claws Mail GTK1."
 
-#: src/common/plugin.c:771
+#: src/common/plugin.c:769
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1718,7 +1718,7 @@ msgstr ""
 "La version de Claws Mail actuellement utilisée est plus récente que celle "
 "pour laquelle le module '%s' a été compilé."
 
-#: src/common/plugin.c:774
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1726,14 +1726,14 @@ msgstr ""
 "La version de Claws Mail actuellement utilisée est plus récente que celle "
 "pour laquelle le module a été compilé."
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:781
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 "La version de Claws Mail actuellement utilisée est trop ancienne pour le "
 "module '%s'."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 "La version de Claws Mail actuellement utilisée est trop ancienne pour le "
@@ -1905,212 +1905,212 @@ msgstr "%d.%02dMo"
 msgid "%.2fGB"
 msgstr "%.2fGo"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lundi"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Vendredi"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Samedi"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Janvier"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Février"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Mars"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Avril"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juin"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juillet"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Août"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septembre"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octobre"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembre"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Décembre"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dim"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mer"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jeu"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Ven"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sam"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Fév"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Avr"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jui"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aoû"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Déc"
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
@@ -2124,7 +2124,7 @@ msgstr "_Ajouter.."
 msgid "_Remove"
 msgstr "Enleve_r"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Propriétés.."
 
@@ -2565,7 +2565,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr ?"
 
-#: src/compose.c:3628 src/compose.c:10529 src/compose.c:11390
+#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2620,18 +2620,18 @@ msgstr ""
 "Veuillez en sélectionner un avant d'envoyer du courrier."
 
 #: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
-#: src/prefs_account.c:3310 src/toolbar.c:406 src/toolbar.c:424
+#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Envoyer"
 
 #: src/compose.c:5043
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
-"Le seul destinataire est l'adresse « Cc: » par défaut. Voulez-vous quand même "
-"envoyer le message ?"
+"Le seul destinataire est l'adresse « Cc: » par défaut. Voulez-vous quand "
+"même envoyer le message ?"
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5633
-#: src/folderview.c:2445 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
+#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Envoyer"
@@ -2667,7 +2667,7 @@ msgstr "Voulez-vous quand même le mettre en file d'attente d'envoi ?"
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5169 src/compose.c:9993
+#: src/compose.c:5169 src/compose.c:9999
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2677,7 +2677,7 @@ msgstr ""
 "\n"
 "La conversion de jeu de caractères a échoué."
 
-#: src/compose.c:5172 src/compose.c:9996
+#: src/compose.c:5172 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2687,7 +2687,7 @@ msgstr ""
 "\n"
 "La clé de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5178 src/compose.c:9990
+#: src/compose.c:5178 src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2730,7 +2730,7 @@ msgstr ""
 "%s\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2741,7 +2741,7 @@ msgstr ""
 "message vers le jeu de caractères spécifié (%s).\n"
 "Voulez-vous l'envoyer en %s ?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2755,76 +2755,75 @@ msgstr ""
 "\n"
 "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Impossible de chiffrer le message : %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Avertissement concernant le chiffrement"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "_Poursuivre"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 "Le compte sélectionné n'est pas un compte NNTP : Poster est impossible."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "La pièce jointe %s n'existe plus. Ignorer ?"
 
-#: src/compose.c:6214 src/mainwindow.c:655 src/toolbar.c:231
-#: src/toolbar.c:2167
+#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Interrompre l'envoi"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ignorer cette pièce jointe"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Partie %s originale"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Effacer le contenu du champ"
 
-#: src/compose.c:6997 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Veuillez saisir <tab> pour procéder à la complétion depuis le carnet "
 "d'adresse"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "Type Mime"
 
-#: src/compose.c:7218 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Enregistrer le message dans "
 
-#: src/compose.c:7318 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2835,23 +2834,23 @@ msgstr "Enregistrer le message dans "
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "E_n-tête"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "Pièces _jointes"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "A_utres"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "S_ujet :"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2860,19 +2859,19 @@ msgstr ""
 "Le correcteur orthographique n'a pu être lancé.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_De :"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Compte à utiliser pour l'envoi de ce message"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Adresse email à utiliser en tant qu'expéditeur"
 
-#: src/compose.c:8373
+#: src/compose.c:8379
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2881,68 +2880,68 @@ msgstr ""
 "Le système de confidentialité '%s' ne peut être chargé. Il sera impossible "
 "de signer ou chiffrer ce message."
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/compose.c:8575 src/prefs_template.c:760
+#: src/compose.c:8581 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Le corps du modèle a une erreur à la ligne %d."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Erreur de formatage dans l'en-tête « De: » du modèle."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Erreur de formatage dans l'en-tête « À: » du modèle."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Erreur de formatage dans l'en-tête « Cc: » du modèle."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Erreur de formatage dans l'en-tête « Cci: » du modèle."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Erreur de formatage dans l'en-tête « Reply-To: » du modèle."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Erreur de formatage dans le sujet du modèle."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2953,15 +2952,15 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:9959 src/messageview.c:1096
+#: src/compose.c:9965 src/messageview.c:1096
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail nécessite un accès réseau pour envoyer ce message."
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2972,15 +2971,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Enregistrement impossible du brouillon"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2989,24 +2988,24 @@ msgstr ""
 "Souhaitez-vous annuler la fermeture de l'application ou simplement "
 "interrompre l'édition de ce message ?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Veuillez sélectionner un fichier"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Échec lors de la lecture de « %s »."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -3015,58 +3014,58 @@ msgstr ""
 "Le fichier « %s » contient des caractères n'appartenant pas\n"
 "à l'encodage courant : l'insertion peut être incorrecte."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr ""
 "Ce message a été modifié mais non envoyé. Voulez-vous interrompre sa "
 "composition ?"
 
-#: src/compose.c:10451 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 "Ce message a été modifié. Souhaitez-vous enregistrer les dernières "
 "modifications ?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le modèle « %s » ?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Utiliser le modèle"
 
-#: src/compose.c:10529 src/prefs_actions.c:329
-#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
-#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
+#: src/compose.c:10535 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Insérer ou joindre ?"
 
-#: src/compose.c:11388
+#: src/compose.c:11400
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -3074,16 +3073,16 @@ msgstr ""
 "Voulez-vous insérer le contenu du(des) fichier(s) directement dans le corps "
 "du message ou le(s) joindre en tant que pièce(s) jointe(s) ?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Joindre"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation à la ligne %d."
 
-#: src/compose.c:11902
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3301,7 +3300,7 @@ msgid " Check File "
 msgstr " Verifier le fichier "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1970
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Fichier"
@@ -3442,16 +3441,16 @@ msgid ""
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 msgstr ""
-"Nom du serveur LDAP. Par exemple, « ldap.mondomaine.com » peut être approprié "
-"pour l'organisation « mondomaine.com ». Une adresse IP peut aussi être "
-"utilisée. Si le serveur se trouve sur la même machine exécutant Claws Mail, « "
-"localhost » peut être utilisé."
+"Nom du serveur LDAP. Par exemple, « ldap.mondomaine.com » peut être "
+"approprié pour l'organisation « mondomaine.com ». Une adresse IP peut aussi "
+"être utilisée. Si le serveur se trouve sur la même machine exécutant Claws "
+"Mail, « localhost » peut être utilisé."
 
 #: src/editldap.c:470
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3383
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
@@ -3585,10 +3584,10 @@ msgid ""
 "searches against other address interfaces."
 msgstr ""
 "La recherche des noms et adresses utilise les critères « begins-with "
-"» (commençant par) ou « contains » (contenant). Veuillez activer cette option "
-"pour utiliser le critère « contains » (contenant). Celui-ci est généralement "
-"plus lent. Pour des raisons de performances, le critère « begins with » est "
-"néanmoins toujours utilisé pour la complétion d'adresse."
+"» (commençant par) ou « contains » (contenant). Veuillez activer cette "
+"option pour utiliser le critère « contains » (contenant). Celui-ci est "
+"généralement plus lent. Pour des raisons de performances, le critère « "
+"begins with » est néanmoins toujours utilisé pour la complétion d'adresse."
 
 #: src/editldap.c:701
 msgid "Bind DN"
@@ -3631,7 +3630,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Le nombre maximal d'entrées à retourner lors d'une recherche."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Général"
 
@@ -3968,10 +3967,10 @@ msgid ""
 msgstr ""
 "Le fichier LDIF contient différents enregistrements qui sont habituellement "
 "envoyés vers un serveur LDAP. Chaque enregistrement est identifié de manière "
-"unique par un « nom absolu » (Distinguished Name, DN). Un suffixe est rajouté "
-"au « nom relatif » (Relative Distinguished Name, RDN) pour créer le DN. "
-"Veuillez sélectionner une des options RDN proposées qui sera utilisée pour "
-"la création du DN."
+"unique par un « nom absolu » (Distinguished Name, DN). Un suffixe est "
+"rajouté au « nom relatif » (Relative Distinguished Name, RDN) pour créer le "
+"DN. Veuillez sélectionner une des options RDN proposées qui sera utilisée "
+"pour la création du DN."
 
 #: src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
@@ -4087,8 +4086,8 @@ msgstr "Impossible de copier %s vers %s"
 #: src/file_checker.c:98
 #, c-format
 msgid ""
-"The file %s is empty or corrupted! Do you want to use the backup file from %"
-"s?"
+"The file %s is empty or corrupted! Do you want to use the backup file from "
+"%s?"
 msgstr ""
 "Le fichier %s est vide ou corrompu ! Voulez-vous utiliser le fichier de "
 "sauvegarde du %s ?"
@@ -4159,8 +4158,8 @@ msgstr "règle basée sur un compte, sautée à la demande de l'utilisateur\n"
 #: src/filtering.c:694
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], not matching current account [id=%"
-"d, name='%s']\n"
+"rule is account-based [id=%d, name='%s'], not matching current account [id="
+"%d, name='%s']\n"
 msgstr ""
 "règle basée sur un compte [id=%d, nom='%s'], sans correspondance avec le "
 "compte courant [id=%d, nom='%s']\n"
@@ -4173,11 +4172,11 @@ msgstr ""
 #: src/filtering.c:712
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], current account [id=%d, name='%"
-"s']\n"
+"rule is account-based [id=%d, name='%s'], current account [id=%d, "
+"name='%s']\n"
 msgstr ""
-"règle basée sur un compte [id=%d, nom='%s'], compte courant [id=%d, nom='%"
-"s']\n"
+"règle basée sur un compte [id=%d, nom='%s'], compte courant [id=%d, "
+"nom='%s']\n"
 
 #: src/filtering.c:752
 #, c-format
@@ -4333,10 +4332,10 @@ msgstr "Sélection d'un dossier"
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:592 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:422 src/plugins/rssyl/rssyl_cb_menu.c:204
+#: src/foldersel.c:592 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:422
+#: src/plugins/rssyl/rssyl_cb_menu.c:204
 #: src/plugins/vcalendar/vcal_folder.c:2056
 #, c-format
 msgid "'%c' can't be included in folder name."
@@ -4357,61 +4356,61 @@ msgstr "Le dossier '%s' existe déjà."
 msgid "Can't create the folder '%s'."
 msgstr "Impossible de créer le dossier '%s'."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Marquer tous comme _lus"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Marquer comme lu récursivement"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "Exéc_uter les règles de traitement"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "Chercher dans le _dossier.."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "_Traitement.."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "_Vider la corbeille.."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "_Envoyer les messages.."
 
-#: src/folderview.c:385 src/folderview.c:432
+#: src/folderview.c:389 src/folderview.c:436
 #: src/plugins/notification/notification_lcdproc.c:141
 #: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
 msgid "New"
 msgstr "Nouveau"
 
-#: src/folderview.c:386 src/folderview.c:433
+#: src/folderview.c:390 src/folderview.c:437
 #: src/plugins/notification/notification_lcdproc.c:145
 #: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:387 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:391 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:435 src/summaryview.c:445
+#: src/folderview.c:439 src/summaryview.c:445
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:765
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers.."
 
-#: src/folderview.c:837
+#: src/folderview.c:845
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -4419,102 +4418,102 @@ msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
 "dossiers comme lus ?"
 
-#: src/folderview.c:839 src/summaryview.c:4115
+#: src/folderview.c:847 src/summaryview.c:4115
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier comme lus ?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Marquer tous les messages comme lus"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Analyse du dossier %s/%s.."
 
-#: src/folderview.c:1022 src/imap.c:4645 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1030 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Analyse du dossier %s.."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Reconstruction de l'arborescence"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "La reconstruction de l'arborescence supprimera les caches locaux. Voulez-"
 "vous continuer ?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence.."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Analyse de l'arborescence.."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Impossible d'ouvrir le dossier '%s'\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Examiner tous les dossiers pour nouveaux messages.."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fermeture du dossier %s.."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Ouverture du dossier %s.."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Le dossier n'a pu être ouvert."
 
-#: src/folderview.c:2386 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Vider"
 
-#: src/folderview.c:2431 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Travail hors-ligne"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr ""
 "Attention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Envoyer les messages en file d'attente"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
 
-#: src/folderview.c:2453 src/toolbar.c:2647
+#: src/folderview.c:2466 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Une erreur est survenue pendant l'envoi de messages en attente."
 
-#: src/folderview.c:2456 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2469 src/main.c:2743 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4523,67 +4522,67 @@ msgstr ""
 "Une erreur est survenue pendant l'envoi de messages en attente :\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Voulez-vous vraiment copier le dossier '%s' dans '%s' ?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Voulez-vous vraiment faire du dossier '%s' un sous-dossier de '%s' ?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Copie du dossier"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Déplacement du dossier"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copie de %s vers %s.."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Déplacement de %s vers %s.."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Source et destination identiques."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 "Il n'est pas possible de copier un dossier vers un de ses SOUS-DOSSIERS."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Il n'est pas possible de déplacer un dossier vers un de ses SOUS-DOSSIERS."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 "Un dossier ne peut être déplacé à travers différentes boîtes aux lettres."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "La copie a échoué."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Le déplacement a échoué."
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Options de filtrage/traitement du dossier %s"
 
-#: src/folderview.c:3068 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 "Le dossier de destination ne peut être utilisé seulement pour stocker des "
@@ -4935,63 +4934,63 @@ msgstr "_Notes de sortie"
 msgid "_Statistics"
 msgstr "_Statistiques"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Orange"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rouge"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Rose"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Bleu ciel"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Vert"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Brun"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Gris"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Marron clair"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Rouge foncé"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Rose foncé"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Bleu acier"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Or"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Vert clair"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5728,7 +5727,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:734 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:728 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Modules"
 
@@ -5772,9 +5771,9 @@ msgid "_Hide"
 msgstr "_Cacher"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3273 src/prefs_account.c:3291 src/prefs_account.c:3309
-#: src/prefs_account.c:3327 src/prefs_account.c:3345 src/prefs_account.c:3363
-#: src/prefs_account.c:3382 src/prefs_account.c:3475
+#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
+#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
+#: src/prefs_account.c:3395 src/prefs_account.c:3488
 #: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
 #: src/prefs_filtering.c:1875
 msgid "Account"
@@ -6491,8 +6490,8 @@ msgstr "La connexion vers %s a échoué."
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP4 vers %s a été coupée. Reconnexion..\n"
 
-#: src/imap.c:1045 src/imap.c:3691 src/imap.c:4350 src/imap.c:4444
-#: src/imap.c:4622 src/imap.c:5433
+#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
+#: src/imap.c:4620 src/imap.c:5431
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail nécessite un accès réseau pour accéder au serveur IMAP."
 
@@ -6533,85 +6532,85 @@ msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
 
-#: src/imap.c:1255 src/imap.c:4112
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Connexion impossible au serveur IMAP %s.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Authentification impossible au serveur IMAP %s."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Ajout des messages en cours.."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Copie des messages en cours.."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "Impossible de marquer pour la suppression\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "Impossible de purger\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Recherche des dossiers non inscrits dans %s.."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Recherche des sous-dossiers de %s.."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "Impossible de créer la boîte aux lettres\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Impossible de renommer la boîte aux lettres %s en %s.\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "Impossible de supprimer la boîte aux lettres.\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "commande LIST échouée\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Marquage des messages en cours.."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s.\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Le serveur nécessite TLS pour s'y connecter.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossible de rafraîchir la liste des facilités IMAP.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6620,20 +6619,20 @@ msgstr ""
 "La connection vers %s a échoué : le serveur nécessite TLS, mais Claws Mail a "
 "été compilé sans le support TLS.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Les connections au serveur sont désactivées.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Lecture du message en cours.."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Impossible de marquer pour la suppression : %d.\n"
 
-#: src/imap.c:6091
+#: src/imap.c:6089
 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"
@@ -6805,8 +6804,8 @@ msgstr ""
 "Vous êtes déjà inscrit à ce dossier et il ne contient aucun sous-dossier "
 "auquel vous n'êtes pas inscrit.S'il y a des nouveaux dossiers, créés et "
 "auxquels vous vous êtes déjà inscrit depuis un autre client, vous pouvez "
-"utiliser «  Examiner pour de nouveaux dossiers » depuis le menu contextuel du "
-"dossier racine de chaque boîte aux lettres."
+"utiliser «  Examiner pour de nouveaux dossiers » depuis le menu contextuel "
+"du dossier racine de chaque boîte aux lettres."
 
 #: src/imap_gtk.c:557
 #, c-format
@@ -6821,8 +6820,8 @@ msgstr "inscrire au"
 msgid "unsubscribe"
 msgstr "désinscrire du"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428
-#: src/prefs_folder_item.c:1456 src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
+#: src/prefs_folder_item.c:1484
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
@@ -6953,12 +6952,12 @@ msgid ""
 msgstr ""
 "Veuillez choisir, dans la liste ci-dessous, le champ LDIF devant être "
 "renommé ou sélectionné pour l'import. Les champs reservés (marqués dans la "
-"colonne « R »), sont automatiquement importés et ne peuvent être renommés. Un "
-"clique dans la colonne de sélection (« S ») permet de sélectionner le champ "
-"pour l'import. Un clique en dehors de cette colonne sélectionne le champ "
-"pour le renommer dans le champ de saisie au-dessous de la liste. Un double-"
-"clique également en dehors de cette colonne permet de sélectionner le champ "
-"pour l'import."
+"colonne « R »), sont automatiquement importés et ne peuvent être renommés. "
+"Un clique dans la colonne de sélection (« S ») permet de sélectionner le "
+"champ pour l'import. Un clique en dehors de cette colonne sélectionne le "
+"champ pour le renommer dans le champ de saisie au-dessous de la liste. Un "
+"double-clique également en dehors de cette colonne permet de sélectionner le "
+"champ pour l'import."
 
 #: src/importldif.c:822
 msgid "The LDIF field can be renamed to the User Attribute name."
@@ -7468,7 +7467,8 @@ msgid ""
 msgstr ""
 "  --search dossier type texte [récursif]\n"
 "                         rechercher des messages\n"
-"                         dossier, par ex. : « #mh/Mailbox/inbox » ou « Mail »\n"
+"                         dossier, par ex. : « #mh/Mailbox/inbox » ou « Mail "
+"»\n"
 "                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] ou "
 "g: tag\n"
 "                         texte: chaîne de texte à chercher\n"
@@ -8599,7 +8599,7 @@ msgstr "Écrasement du fichier mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
 
-#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842
+#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Écraser"
@@ -8649,7 +8649,7 @@ msgstr "Recherche terminée"
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/messageview.c:713 src/messageview.c:1443 src/messageview.c:1594
+#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Message"
 
@@ -8688,47 +8688,47 @@ msgstr ""
 "destinataire officiel.\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Lecture du message (%s) en cours.."
 
-#: src/messageview.c:1409 src/procmime.c:1008
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Déchiffrement impossible : %s"
 
-#: src/messageview.c:1490 src/messageview.c:1498
+#: src/messageview.c:1493 src/messageview.c:1501
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Le message n'est pas conforme au standard MIME. Il pourrait être mal affiché."
 
-#: src/messageview.c:1844 src/messageview.c:1847 src/mimeview.c:1995
+#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
 #: src/summaryview.c:4814 src/textview.c:3063
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Écraser le fichier existant ?"
 
-#: src/messageview.c:1861 src/summaryview.c:4831 src/summaryview.c:4834
+#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
 #: src/summaryview.c:4849
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Afficher l'ensemble des %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Seul le premier méga-octet de texte est affiché."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1950
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8736,19 +8736,19 @@ msgstr ""
 "Vous avez demandé un accusé de réception pour ce message : cela a été mis en "
 "évidence pour le destinataire."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Vous avez demandé un accusé de réception pour ce message."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Ce message demande l'envoi d'un accusé de réception."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Envoyer"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8756,7 +8756,7 @@ msgstr ""
 "Ce message a été partiellement récupéré,\n"
 "et a été supprimé du serveur."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8765,16 +8765,16 @@ msgstr "Ce message a été partiellement récupéré ; il fait %s au total."
 
 # NDT : problème de longueur de la chaîne "Marquer pour téléchargement" :
 # la chaîne est coupée des 2 côtés (bouton trop petit) -> idée : tooltips
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Télécharger"
 
 # NDT : même pb qu'avec "Mark for download" pr chaîne "Marquer pour suppression"
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Supprimer"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8783,12 +8783,12 @@ msgstr ""
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être téléchargé ultérieurement."
 
-#: src/messageview.c:2021 src/messageview.c:2034
+#: src/messageview.c:2024 src/messageview.c:2037
 #: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Démarquer"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8797,11 +8797,11 @@ msgstr ""
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être supprimé ultérieurement."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Accusé de réception."
 
-#: src/messageview.c:2101
+#: src/messageview.c:2104
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8813,19 +8813,19 @@ msgstr ""
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé "
 "de réception :"
 
-#: src/messageview.c:2105 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Envoyer"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossible d'imprimer : le message ne contient pas de texte."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8833,7 +8833,7 @@ msgstr ""
 "\n"
 " Il n'y a pas de messages dans ce dossier"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8841,7 +8841,7 @@ msgstr ""
 "\n"
 " Le message a été supprimé"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8849,7 +8849,7 @@ msgstr ""
 "\n"
 " Le message a été supprimé ou déplacé vers un autre dossier"
 
-#: src/messageview.c:2998 src/messageview.c:3004 src/summaryview.c:4188
+#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
 #: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'opération d'apprentissage du module SpamAssassin.\n"
@@ -8962,8 +8962,7 @@ msgid "Go back to email"
 msgstr "Revenir à l'email"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190
-#: src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
@@ -9090,34 +9089,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "Impossible de sélectionner le groupe : %s\n"
 
-#: src/news.c:1051 src/news.c:1221
+#: src/news.c:1054 src/news.c:1224
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "Impossible de définir le groupe : %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Intervalle d'articles invalide : %d - %d\n"
 
-#: src/news.c:1130 src/news.c:1154 src/news.c:1178
+#: src/news.c:1133 src/news.c:1157 src/news.c:1181
 msgid "couldn't get xhdr\n"
 msgstr "Impossible d'obtenir xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Exécution de xover %d - %d sur %s..\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "Impossible de faire un xover.\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "Ligne xover invalide\n"
 
-#: src/news.c:1446
+#: src/news.c:1449
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -9948,8 +9947,7 @@ msgstr ""
 "Les expressions régulières ci-dessus ne seront pas vérifiées dans les "
 "messages transférés ainsi que dans les redirections"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135
-#: src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Signature"
 
@@ -10065,14 +10063,12 @@ msgstr ""
 "Ce module est paramétrable via les options situées sous Configuration/"
 "Préférences/Modules/Bogofilter."
 
-#: src/plugins/bogofilter/bogofilter.c:1043
-#: src/plugins/bsfilter/bsfilter.c:676
+#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Analyse anti-SPAMs"
 
-#: src/plugins/bogofilter/bogofilter.c:1044
-#: src/plugins/bsfilter/bsfilter.c:677
+#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Apprentissage de SPAMs"
@@ -10097,7 +10093,7 @@ msgstr "Les messages d'un volume supérieur ne seront pas analysés."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "ko"
 
@@ -10239,8 +10235,8 @@ msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
-"Erreur lors du traitement d'un message par le module Bsfilter. La commande `%"
-"s` n'a pu être exécutée."
+"Erreur lors du traitement d'un message par le module Bsfilter. La commande `"
+"%s` n'a pu être exécutée."
 
 #: src/plugins/bsfilter/bsfilter.c:502
 msgid "Bsfilter: learning from message..."
@@ -10678,7 +10674,7 @@ msgstr "Le CSS de ce fichiers sera appliqué à toutes les parties HTML"
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
 #: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1442 src/prefs_account.c:1531 src/prefs_account.c:2002
+#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Pa_rcourir"
@@ -10991,7 +10987,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Module GData : tentative de renouvellement de l'authentification\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Authentification"
 
@@ -11178,7 +11174,7 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Intervalle de rafraîchissement du cache"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1487
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1490
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
 msgstr "heures"
@@ -11564,7 +11560,7 @@ msgstr "Utiliser l'authentification"
 #: src/plugins/managesieve/sieve_prefs.c:240
 #: src/plugins/vcalendar/vcal_prefs.c:348
 #: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
-#: src/prefs_account.c:1795
+#: src/prefs_account.c:1798
 msgid "User ID"
 msgstr "Nom d'utilisateur"
 
@@ -11572,18 +11568,18 @@ msgstr "Nom d'utilisateur"
 #: src/plugins/rssyl/rssyl_feed_props.c:395
 #: src/plugins/vcalendar/vcal_prefs.c:356
 #: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
-#: src/prefs_account.c:1815 src/prefs_account.c:2529 src/prefs_account.c:2551
+#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
 #: src/wizard.c:1215 src/wizard.c:1635
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1570
-#: src/prefs_account.c:1767
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
+#: src/prefs_account.c:1770
 msgid "Authentication method"
 msgstr "Authentification"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1580
-#: src/prefs_account.c:1776 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
+#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
 msgid "Automatic"
 msgstr "Automatique"
 
@@ -12522,9 +12518,8 @@ msgstr "Expirer après"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Mettre 0 pour la mémoriser pendant toute la session"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163
-#: src/plugins/rssyl/rssyl_feed_props.c:476
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1871
+#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:476
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
 msgstr "minute(s)"
@@ -13068,8 +13063,8 @@ msgstr ""
 "messages, la vérification des signatures ou la signature et le chiffrement "
 "de votre propre courrier.\n"
 "\n"
-"Il peut être activé comme Système de confidentialité par défaut via le menu « "
-"Configuration/Configuration du compte courant.. » dans l'onglet « "
+"Il peut être activé comme Système de confidentialité par défaut via le menu "
+"« Configuration/Configuration du compte courant.. » dans l'onglet « "
 "Confidentialité » et par le menu « Options/Système de confidentialité » lors "
 "d'une composition de message.\n"
 "\n"
@@ -13131,8 +13126,8 @@ msgstr ""
 "déchiffrer les messages, vérifier les signatures ou signer et chiffrer vos "
 "propres mails.\n"
 "\n"
-"Il peut être activé comme Système de confidentialité par défaut via le menu « "
-"Configuration/Configuration du compte courant.. » dans l'onglet « "
+"Il peut être activé comme Système de confidentialité par défaut via le menu "
+"« Configuration/Configuration du compte courant.. » dans l'onglet « "
 "Confidentialité » et par le menu « Options/Système de confidentialité » lors "
 "d'une composition de message.\n"
 "\n"
@@ -13154,8 +13149,8 @@ msgstr "Afficher la console Python.."
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2518
-#: src/prefs_account.c:2540 src/prefs_account.c:2809 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
+#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Pa_rcourir"
@@ -13235,7 +13230,8 @@ msgstr ""
 "\n"
 "Le dossier ~/.claws-mail/python-scripts/auto/ est l'endroit où enregistrer "
 "des scripts à exécuter automatiquement lors de certains évènements. "
-"Actuellement, les fichiers suivants dans le répertoire « auto » sont gérés :\n"
+"Actuellement, les fichiers suivants dans le répertoire « auto » sont "
+"gérés :\n"
 "\n"
 "compose_any\n"
 "Exécuté lorsqu'une fenêtre de composition de message est ouverte (nouveau "
@@ -13488,8 +13484,7 @@ msgstr "Récupérer les commentaires des articles de moins de"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1477 src/prefs_folder_item.c:553
-#: src/prefs_matcher.c:337
+#: src/prefs_account.c:1480 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
 msgid "days"
 msgstr "jour(s)"
 
@@ -13746,8 +13741,8 @@ msgstr ""
 "système S/MIME. Vous pouvez déchiffrer les messages, vérifier les signatures "
 "ou signer et chiffrer vos propres mails.\n"
 "\n"
-"Il peut être activé comme Système de confidentialité par défaut via le menu « "
-"Configuration/Configuration du compte courant.. » dans l'onglet « "
+"Il peut être activé comme Système de confidentialité par défaut via le menu "
+"« Configuration/Configuration du compte courant.. » dans l'onglet « "
 "Confidentialité » et par le menu « Options/Système de confidentialité » lors "
 "d'une composition de message.\n"
 "\n"
@@ -14120,7 +14115,7 @@ msgid "Next month"
 msgstr "Mois suivant"
 
 #: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:735
+#: src/plugins/vcalendar/vcal_prefs.c:729
 msgid "vCalendar"
 msgstr "Calendrier"
 
@@ -14555,15 +14550,15 @@ msgstr "Cette semaine"
 msgid "Later"
 msgstr "Plus tard"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Accepté : "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Refusé : "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Accepté sous réserves : "
 
@@ -15019,12 +15014,12 @@ msgstr "Erreur pendant la session POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "Commande TOP non supportée\n"
 
-#: src/prefs_account.c:334 src/prefs_account.c:1451 src/prefs_account.c:2446
+#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
 #: src/wizard.c:1499
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1564 src/prefs_account.c:2461
+#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -15113,40 +15108,40 @@ msgstr "Commande externe :"
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Dossier de réception par défaut"
 
-#: src/prefs_account.c:1438 src/prefs_account.c:1445 src/prefs_account.c:1527
-#: src/prefs_account.c:1534
+#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
+#: src/prefs_account.c:1537
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Les messages non filtrés seront placés dans ce dossier"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Authentification sécurisée (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur après réception"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Suppression après"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1484
+#: src/prefs_account.c:1477 src/prefs_account.c:1487
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 jour et 0 heure : suppression immédiate"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1503
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15156,85 +15151,85 @@ msgstr ""
 "de les marquer pour un téléchargement complet ou une suppression (effectif "
 "qu'à la relève suivante)."
 
-#: src/prefs_account.c:1540 src/prefs_account.c:2476
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles à récupérer"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "pas de limite si 0 est spécifié"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Texte simple"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "Répertoire sur le serveur IMAP4"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(généralement nul)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Afficher seulement les dossiers inscrits"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Mode économique en bande passante (évite récupération des tags distants)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Ce mode utilise moins de bande passante mais peut apporter un ralentissement "
 "avec certains serveurs."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permission aux modules de filtrer les messages à la réception"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "Le bouton « Relever » de la barre d'outil principale relève le courrier pour "
 "ce compte"
 
-#: src/prefs_account.c:1722 src/prefs_customheader.c:208
+#: src/prefs_account.c:1725 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
 msgid "Header"
 msgstr "En-tête"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Génération de l'en-tête « Message-Id: »"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Mettre l'adresse email dans le Message-ID"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Ajouter l'en-tête user agent"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1840
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15242,177 +15237,177 @@ msgstr ""
 "Veuillez laisser ces champs vides pour utiliser le nom d'utilisateur et le "
 "mot de passe spécifiés pour la réception."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Délai maximal pour l'authentification POP :"
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Signature"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Insérer automatiquement la signature"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Séparateur de signature"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Résultat d'une commande"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Dictionnaires de correction orthographique"
 
-#: src/prefs_account.c:2076 src/prefs_folder_item.c:1080
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Dictionnaire par défaut"
 
-#: src/prefs_account.c:2089 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Dictionnaire alternatif par défaut"
 
-#: src/prefs_account.c:2175 src/prefs_account.c:3328
+#: src/prefs_account.c:2181 src/prefs_account.c:3341
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
 #: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Composition"
 
-#: src/prefs_account.c:2190 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/prefs_account.c:2205 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Système de confidentialité par défaut"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Toujours signer les messages"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Toujours chiffrer les messages"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Toujours signer la réponse à un message signé"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Toujours chiffrer la réponse à un message chiffré"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Chiffrer les messages envoyés avec votre propre clé en plus de celle du "
 "destinataire"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Enregistrer les messages chiffrés envoyés en texte clair"
 
-#: src/prefs_account.c:2450 src/prefs_account.c:2465 src/prefs_account.c:2479
+#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
 msgid "Don't use SSL"
 msgstr "Ne pas utiliser SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Utiliser SSL pour les connexions POP3"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2502
+#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utiliser SSL pour les connexions IMAP4"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Utiliser SSL pour les connexions NNTP"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Ne pas utiliser SSL (mais utiliser STARTTLS si nécessaire)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Utiliser SSL pour les connexions SMTP"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Certificats client"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Certificat pour la réception"
 
-#: src/prefs_account.c:2520 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2544
+#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
+#: src/prefs_account.c:2550
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Fichier certificat client tel qu'un fichier PKCS12 ou PEM"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Certificat pour l'envoi"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Accepter automatiquement les certificats SSL valides"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Utiliser la communication SSL non bloquante"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "À désactiver en cas de problèmes de connexion SSL"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "Port POP3"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "Port IMAP4"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Nom de domaine"
 
-#: src/prefs_account.c:2743
+#: src/prefs_account.c:2756
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15420,112 +15415,112 @@ msgstr ""
 "Le nom de domaine sera utilisé dans la partie droite des identifiants de "
 "messages générés (Message-ID) et lors de la connexion aux serveurs SMTP."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Utiliser une commande externe pour communiquer avec le serveur"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marquer les articles croisés comme lus et les colorier en"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Sauvegarder les messages envoyés dans "
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Sauvegarder les messages à envoyer (file d'attente) dans "
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Sauvegarder les brouillons dans "
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Sauvegarder les messages supprimés dans "
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Le nom du compte est non spécifié."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "L'adresse email est non spécifiée."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "Le serveur d'envoi (SMTP) est non spécifié."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Le nom d'utilisateur est non spécifié."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "Le serveur POP3 est non spécifié."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Le dossier de réception par défaut n'existe pas."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "Le serveur IMAP4 est non spécifié."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "Le serveur NNTP est non spécifié."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "Le fichier local mbox est non spécifié."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "La commande externe d'envoi est non spécifiée."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account.c:3346 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modèles"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Configuration du nouveau compte"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Configuration du compte"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Échec (adresse incorrecte)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Sélection du fichier signature"
 
-#: src/prefs_account.c:4019 src/prefs_account.c:4036 src/wizard.c:1066
+#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Choisir le fichier de certificat"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (module non chargé)"
@@ -15647,21 +15642,20 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Voulez-vous vraiment supprimer toutes les actions ?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
-#: src/prefs_template.c:572 src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
+#: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Règle non ajoutée"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573
-#: src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 
 #: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
-#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Poursuivre l'édition"
 
@@ -15800,15 +15794,15 @@ msgstr "Actions enregistrées"
 msgid "Action string is not valid."
 msgstr "La syntaxe de l'action est incorrecte."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Bonjour,\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Le %d,\\n%f a écrit :\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:306 src/prefs_quote.c:85
+#: src/prefs_common.c:307 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15816,7 +15810,7 @@ msgstr ""
 "\\n\\n----- Message Transféré -----\\n\\n?d{Date: %d\\n}?f{De: %f\\n}?t{À: %t"
 "\\n}?c{Cc: %c\\n}?n{Groupe de discussion: %n\\n}?s{Sujet: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%a %x %H:%M"
 
@@ -16230,8 +16224,9 @@ msgid ""
 "program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"L'action de filtrage « Exécuter » permet à l'utilisateur d'envoyer un message "
-"ou élément d'en-tête de message à un programme ou un script auxiliaire.\n"
+"L'action de filtrage « Exécuter » permet à l'utilisateur d'envoyer un "
+"message ou élément d'en-tête de message à un programme ou un script "
+"auxiliaire.\n"
 "Il est possible d'utiliser les symboles suivants :"
 
 #: src/prefs_filtering_action.c:1422
@@ -16988,8 +16983,8 @@ msgstr "l'(les) adresse(s) de l'en-tête '%s'"
 msgid ""
 "Book/folder path is not set.\n"
 "\n"
-"If you want to match %s against the whole address book, you have to select '%"
-"s' from the book/folder drop-down list."
+"If you want to match %s against the whole address book, you have to select "
+"'%s' from the book/folder drop-down list."
 msgstr ""
 "Le chemin vers un carnet d'adresses/dossier n'est pas renseigné.\n"
 "\n"
@@ -17090,9 +17085,9 @@ msgid ""
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"La condition de filtrage « Test » permet à l'utilisateur de faire un test sur "
-"un message ou élément d'en-tête de message en utilisant un programme ou un "
-"script auxiliaire. Le programme doit retourner 0 ou 1 (0 étant la valeur "
+"La condition de filtrage « Test » permet à l'utilisateur de faire un test "
+"sur un message ou élément d'en-tête de message en utilisant un programme ou "
+"un script auxiliaire. Le programme doit retourner 0 ou 1 (0 étant la valeur "
 "validant la condition de filtrage).\n"
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
@@ -18065,8 +18060,8 @@ msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr ""
-"L'affichage des en-têtes courants (comme « From: », « Subject: ») sera traduit "
-"dans le language présentement utilisé."
+"L'affichage des en-têtes courants (comme « From: », « Subject: ») sera "
+"traduit dans le language présentement utilisé."
 
 #: src/prefs_summaries.c:732
 msgid "Summaries"
@@ -20284,11 +20279,11 @@ msgstr ""
 #~ "span>"
 
 #~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and %"
-#~ "d errors</span>"
+#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
+#~ "%d errors</span>"
 #~ msgstr ""
-#~ "<span color=\"red\">Utilisation de %s dans %d fichiers, %d répertoires, %"
-#~ "d autres et %d erreurs</span>"
+#~ "<span color=\"red\">Utilisation de %s dans %d fichiers, %d répertoires, "
+#~ "%d autres et %d erreurs</span>"
 
 #~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
 #~ msgstr ""
@@ -20327,8 +20322,8 @@ msgstr ""
 #~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
 #~ msgstr ""
 #~ "<b>Intervalle de mise à jour, en minutes :</b>\n"
-#~ "<small>(Saisissez 0 pour désactiver la mise à jour automatique de ce flux)"
-#~ "</small>"
+#~ "<small>(Saisissez 0 pour désactiver la mise à jour automatique de ce "
+#~ "flux)</small>"
 
 #~ msgid "<b>If an item changes, do not mark it as new:</b>"
 #~ msgstr "<b>Si un article change, ne pas le marquer comme non lu :</b>"
diff --git a/po/he.po b/po/he.po
index d94115f..3e8f9b1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-12-14 11:20+0000\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2015-07-12 18:57+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan at gmx.ca>\n"
 "Language-Team: Rahut <translators at lists.claws-mail.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Language: he\n"
 "X-Source-Language: en\n"
 
-#: src/account.c:392 src/account.c:459
+#: src/account.c:396 src/account.c:463
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -28,16 +28,16 @@ msgstr ""
 "ישנם כמה חלונות הלחנה פתוחים.\n"
 "עליך לסגור כל חלון הלחנה בטרם עריכת חשבונות."
 
-#: src/account.c:437
+#: src/account.c:441
 msgid "Can't create folder."
 msgstr "אין אפשרות ליצור תיקייה."
 
-#: src/account.c:724
+#: src/account.c:728
 msgid "Edit accounts"
 msgstr "עריכת חשבונות"
 
 # מחווינה
-#: src/account.c:741
+#: src/account.c:745
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -46,79 +46,79 @@ msgstr ""
 "באמצעות 'השג דואר' תאחזרו הודעות מתוך חשבונות בסדר נתון, תיבת הסימון\n"
 "מתווה אילו חשבונות יכללו. טקסט בולט מעיד על החשבון השגרתי."
 
-#: src/account.c:812
+#: src/account.c:816
 msgid " _Set as default account "
 msgstr " קבע בתור חשבון ש_גרתי "
 
-#: src/account.c:904
+#: src/account.c:908
 msgid "Accounts with remote folders cannot be copied."
 msgstr "חשבונות עם תיקיות מרוחקות לא ניתנות להעתקה."
 
-#: src/account.c:911
+#: src/account.c:915
 #, c-format
 msgid "Copy of %s"
 msgstr "עותק של %s"
 
-#: src/account.c:1071
+#: src/account.c:1075
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את החשבון '%s'?"
 
-#: src/account.c:1073
+#: src/account.c:1077
 msgid "(Untitled)"
 msgstr "(ללא כותרת)"
 
-#: src/account.c:1074
+#: src/account.c:1078
 msgid "Delete account"
 msgstr "מחיקת חשבון"
 
-#: src/account.c:1554
+#: src/account.c:1562
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "ק"
 
-#: src/account.c:1560
+#: src/account.c:1568
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'השג דואר' מאחזרת דואר מתוך החשבונות הנבחרים"
 
-#: src/account.c:1567 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7233 src/editaddress.c:1265
-#: src/editaddress.c:1322 src/editaddress.c:1342
+#: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
+#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
+#: src/editaddress.c:1321 src/editaddress.c:1341
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:427
+#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
 #: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1807
-#: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
+#: src/plugins/pdf_viewer/poppler_viewer.c:1803
+#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
 msgstr "שם"
 
-#: src/account.c:1575 src/prefs_account.c:1101 src/prefs_account.c:4061
+#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: src/account.c:1583 src/ssl_manager.c:102
+#: src/account.c:1591 src/ssl_manager.c:100
 msgid "Server"
 msgstr "שרת"
 
-#: src/action.c:383
+#: src/action.c:382
 #, c-format
 msgid "Could not get message file %d"
 msgstr "לא היתה אפשרות לקבל קובץ הודעה %d"
 
-#: src/action.c:420
+#: src/action.c:419
 msgid "Could not get message part."
 msgstr "לא היתה אפשרות לקבל אזור הודעה."
 
 # multipartite
-#: src/action.c:437
+#: src/action.c:436
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "אין אפשרות להשיג חלק בתוך הודעה מרובת חלקים: %s"
 
-#: src/action.c:609
+#: src/action.c:608
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -127,12 +127,12 @@ msgstr ""
 "הפעולה הנבחרת לא היתה ניתנת לשימוש בחלון ההלחנה\n"
 "מכיוון שזו מכילה %%f, %%F, %%as או %%p."
 
-#: src/action.c:721
+#: src/action.c:720
 msgid "There is no filtering action set"
 msgstr "אין פעולת סינון מוגדרת"
 
 # singular
-#: src/action.c:723
+#: src/action.c:722
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -141,7 +141,7 @@ msgstr ""
 "פעולת סינון שגויה:\n"
 "%s"
 
-#: src/action.c:988
+#: src/action.c:987
 #, fuzzy, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -152,34 +152,34 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:990 src/ldaputil.c:324 src/plugins/bogofilter/bogofilter.c:884
+#: src/action.c:989 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
-#: src/plugins/vcalendar/vcal_folder.c:1806
-#: src/plugins/vcalendar/vcal_folder.c:1810
 #: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1824 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1836
+#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
 msgid "Unknown error"
 msgstr "שגיאה לא מוכרת"
 
-#: src/action.c:1208 src/action.c:1373
+#: src/action.c:1207 src/action.c:1372
 msgid "Completed"
 msgstr "הושלמה"
 
-#: src/action.c:1244
+#: src/action.c:1243
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- מופעלת: %s\n"
 
-#: src/action.c:1248
+#: src/action.c:1247
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- הסתיימה: %s\n"
 
-#: src/action.c:1281
+#: src/action.c:1280
 msgid "Action's input/output"
 msgstr "קלט/פלט של פעולה"
 
-#: src/action.c:1609
+#: src/action.c:1608
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -190,11 +190,11 @@ msgstr ""
 "‏('‎%%h' יוחלף עם הארגומנט)\n"
 "  %s"
 
-#: src/action.c:1614
+#: src/action.c:1613
 msgid "Action's hidden user argument"
 msgstr "ארגומנט משתמש נסתר של פעולה"
 
-#: src/action.c:1618
+#: src/action.c:1617
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -205,7 +205,7 @@ msgstr ""
 "‏('‎%%u' יוחלף עם הארגומנט)\n"
 "  %s"
 
-#: src/action.c:1623
+#: src/action.c:1622
 msgid "Action's user argument"
 msgstr "ארגומנט משתמש של פעולה"
 
@@ -221,7 +221,7 @@ msgstr "אין אפשרות להעתיק פנקס כתובות אל עצמו."
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "אין אפשרות להעביר תיקייה לתוך עצמה או לתוך אחד מצאצאיה."
 
-#: src/addr_compl.c:689 src/addressbook.c:4947
+#: src/addr_compl.c:689 src/addressbook.c:4946
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "קבוצה"
@@ -359,7 +359,7 @@ msgid "Duplicate email addresses"
 msgstr "כתובות דוא״ל כפולות"
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:397 src/toolbar.c:434
+#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:434
 msgid "Address"
 msgstr "כתובת"
 
@@ -392,8 +392,8 @@ msgid "Contact"
 msgstr "איש קשר"
 
 # להבחין
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1057
-#: src/editaddress.c:1132 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1056
+#: src/editaddress.c:1131 src/editgroup.c:290
 msgid "Remarks"
 msgstr "הערה"
 
@@ -401,16 +401,16 @@ msgstr "הערה"
 msgid "Select Address Book Folder"
 msgstr "בחירת תיקיית פנקס כתובות"
 
-#: src/addressadd.c:535 src/addressbook.c:3217 src/addressbook.c:3268
+#: src/addressadd.c:534 src/addressbook.c:3216 src/addressbook.c:3267
 msgid "Add address(es)"
 msgstr "הוסף כתובות"
 
-#: src/addressadd.c:536
+#: src/addressadd.c:535
 msgid "Can't add the specified address"
 msgstr "אין אפשרות להוסיף את הכתובת שצוינה"
 
-#: src/addressbook.c:126 src/addressbook.c:4935 src/editaddress.c:1054
-#: src/editaddress.c:1115 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/addressbook.c:126 src/addressbook.c:4934 src/editaddress.c:1053
+#: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
 #: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
 msgid "Email Address"
 msgstr "כתובת דוא״ל"
@@ -420,18 +420,18 @@ msgid "_Book"
 msgstr "פנק_ס"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:587 src/mainwindow.c:508
-#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:482 src/compose.c:586 src/mainwindow.c:512
+#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#: src/addressbook.c:407 src/compose.c:592 src/mainwindow.c:511
-#: src/messageview.c:213
+#: src/addressbook.c:407 src/compose.c:591 src/mainwindow.c:515
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "_כלים"
 
-#: src/addressbook.c:408 src/compose.c:593 src/mainwindow.c:513
-#: src/messageview.c:214
+#: src/addressbook.c:408 src/compose.c:592 src/mainwindow.c:517
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_עזרה"
 
@@ -463,20 +463,20 @@ msgstr "_ערוך ספר"
 msgid "_Delete book"
 msgstr "_מחק ספר"
 
-#: src/addressbook.c:427 src/compose.c:604
+#: src/addressbook.c:427 src/compose.c:603
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:433
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Save"
 msgstr "ש_מור"
 
-#: src/addressbook.c:428 src/compose.c:608 src/messageview.c:223
+#: src/addressbook.c:428 src/compose.c:607 src/messageview.c:222
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
 msgstr "_סגור"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:227
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
 msgid "_Select all"
 msgstr "_בחר הכל"
 
@@ -485,13 +485,13 @@ msgid "C_ut"
 msgstr "_גזור"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:616 src/mainwindow.c:542 src/messageview.c:226
+#: src/compose.c:615 src/mainwindow.c:546 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "ה_עתק"
 
 #: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:617 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:616 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "ה_דבק"
 
@@ -535,8 +535,8 @@ msgstr "מצא כפילויות..."
 msgid "Edit custom attributes..."
 msgstr "ערוך אפיונים מותאמים..."
 
-#: src/addressbook.c:458 src/compose.c:696 src/mainwindow.c:806
-#: src/messageview.c:339
+#: src/addressbook.c:458 src/compose.c:695 src/mainwindow.c:813
+#: src/messageview.c:338
 msgid "_About"
 msgstr "_אודות"
 
@@ -547,10 +547,10 @@ msgstr "_עיין רשומה"
 
 # תקפות: לא מוכר
 #: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:139
-#: src/plugins/pgpcore/sgpgme.c:167 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:683
-#: src/prefs_themes.c:715 src/prefs_themes.c:716
+#: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:143
+#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
+#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:682
+#: src/prefs_themes.c:714 src/prefs_themes.c:715
 msgid "Unknown"
 msgstr "לא ידועה"
 
@@ -655,12 +655,12 @@ msgstr "אימות חזק (יותר) נדרש"
 msgid "Sources"
 msgstr "מקורות"
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:474
+#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
 msgstr "פנקס כתובות"
 
-#: src/addressbook.c:1112 src/editldap.c:779
+#: src/addressbook.c:1112 src/editldap.c:780
 msgid "Search"
 msgstr "חיפוש"
 
@@ -684,18 +684,18 @@ msgstr "אין אפשרות להעתיק. פנקס כתובות יעד מוגד
 msgid "Cannot paste into an address group."
 msgstr "אין אפשרות להדביק לתוך קבוצת כתובת."
 
-#: src/addressbook.c:2914
+#: src/addressbook.c:2913
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "האם ברצונך למחוק את תוצאות השאילתא וגם את הכתובות בתוך '%s'?"
 
-#: src/addressbook.c:2917 src/addressbook.c:2943 src/addressbook.c:2950
+#: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
 #: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
 #: src/toolbar.c:415
 msgid "Delete"
 msgstr "מחק"
 
-#: src/addressbook.c:2926
+#: src/addressbook.c:2925
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -704,21 +704,21 @@ msgstr ""
 "האם ברצונך למחוק את '%s'? אם תמחק את התיקייה בלבד, הכתובות שזו מכילה יועברו "
 "לתוך התיקיית הורה."
 
-#: src/addressbook.c:2929 src/imap_gtk.c:362 src/mh_gtk.c:205
+#: src/addressbook.c:2928 src/imap_gtk.c:360 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1969
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Delete folder"
 msgstr "מחיקת תיקייה"
 
-#: src/addressbook.c:2930
+#: src/addressbook.c:2929
 msgid "Delete _folder only"
 msgstr "מחק _תיקייה בלבד"
 
-#: src/addressbook.c:2930
+#: src/addressbook.c:2929
 msgid "Delete folder and _addresses"
 msgstr "מחיקת תיקיות וגם _כתובות"
 
-#: src/addressbook.c:2941
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -727,7 +727,7 @@ msgstr ""
 "האם ברצונך למחוק את '%s'?\n"
 "הכתובות המוכלות בתוכו לא יאבדו."
 
-#: src/addressbook.c:2948
+#: src/addressbook.c:2947
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -736,28 +736,28 @@ msgstr ""
 "האם ברצונך למחוק את '%s'?\n"
 "הכתובות המוכלות בתוכו יאבדו."
 
-#: src/addressbook.c:3062
+#: src/addressbook.c:3061
 #, c-format
 msgid "Search '%s'"
 msgstr "חיפוש '%s'"
 
-#: src/addressbook.c:3200 src/addressbook.c:3249
+#: src/addressbook.c:3199 src/addressbook.c:3248
 msgid "New Contacts"
 msgstr "אנשי קשר חדשים"
 
-#: src/addressbook.c:4088
+#: src/addressbook.c:4087
 msgid "New user, could not save index file."
 msgstr "משתמש חדש, לא היתה אפשרות לשמור קובץ מפתח."
 
-#: src/addressbook.c:4092
+#: src/addressbook.c:4091
 msgid "New user, could not save address book files."
 msgstr "משתמש חדש, לא היתה אפשרות לשמור קבצי פנקס כתובות."
 
-#: src/addressbook.c:4102
+#: src/addressbook.c:4101
 msgid "Old address book converted successfully."
 msgstr "פנקס כתובות ישן הומר בהצלחה."
 
-#: src/addressbook.c:4107
+#: src/addressbook.c:4106
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -765,7 +765,7 @@ msgstr ""
 "פנקס כתובות ישן הומר,\n"
 "לא היתה אפשרות לשמור קובץ מפתח כתובות חדש."
 
-#: src/addressbook.c:4120
+#: src/addressbook.c:4119
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -773,7 +773,7 @@ msgstr ""
 "לא היתה אפשרות להמיר פנקס כתובות,\n"
 "אך נוצרו קבצי פנקס כתובות חדשים ריקים."
 
-#: src/addressbook.c:4126
+#: src/addressbook.c:4125
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -781,7 +781,7 @@ msgstr ""
 "לא היתה אפשרות להמיר פנקס כתובות,\n"
 "לא היתה אפשרות לשמור קובץ מפתח כתובות חדש."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4130
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -789,60 +789,65 @@ msgstr ""
 "לא היתה אפשרות להמיר פנקס כתובות\n"
 "ולא היתה אפשרות ליצור קבצי פנקס כתובות חדשים."
 
-#: src/addressbook.c:4138 src/addressbook.c:4144
+#: src/addressbook.c:4137 src/addressbook.c:4143
 msgid "Addressbook conversion error"
 msgstr "שגיאת המרת פנקס כתובות"
 
-#: src/addressbook.c:4258
+#: src/addressbook.c:4257
 msgid "Addressbook Error"
 msgstr "שגיאת פנקס כתובות"
 
-#: src/addressbook.c:4259
+#: src/addressbook.c:4258
 msgid "Could not read address index"
 msgstr "לא היתה אפשרות לקרוא מפתח כתובות"
 
-#: src/addressbook.c:4590
+#: src/addressbook.c:4589
 msgid "Busy searching..."
 msgstr "כעת עסוק בחיפוש..."
 
-#: src/addressbook.c:4899
+#: src/addressbook.c:4898 src/prefs_send.c:188
 msgid "Interface"
 msgstr "ממשק"
 
-#: src/addressbook.c:4911 src/addressbook_foldersel.c:182 src/exphtmldlg.c:371
-#: src/expldifdlg.c:388 src/exporthtml.c:984 src/importldif.c:657
-msgid "Address Book"
+#: src/addressbook.c:4910
+#, fuzzy
+msgid "Address Books"
 msgstr "פנקס כתובות"
 
-#: src/addressbook.c:4923
+#: src/addressbook.c:4922
 msgid "Person"
 msgstr "אישיות"
 
-#: src/addressbook.c:4959 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
+#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "תיקייה"
 
-#: src/addressbook.c:4971
+#: src/addressbook.c:4970
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4983 src/addressbook.c:4995
+#: src/addressbook.c:4982 src/addressbook.c:4994
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5007
+#: src/addressbook.c:5006
 msgid "LDAP servers"
 msgstr "שרתי LDAP"
 
-#: src/addressbook.c:5019
+#: src/addressbook.c:5018
 msgid "LDAP Query"
 msgstr "שאילתת LDAP"
 
+#: src/addressbook_foldersel.c:182 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/exporthtml.c:984 src/importldif.c:657
+msgid "Address Book"
+msgstr "פנקס כתובות"
+
 # בכלל
 # תקורה = נקבה
 # פנקס כתובות = זכר
-#: src/addressbook_foldersel.c:388 src/plugins/bogofilter/bogofilter.c:107
+#: src/addressbook_foldersel.c:387 src/plugins/bogofilter/bogofilter.c:107
 #: src/plugins/bogofilter/bogofilter_gtk.c:274
 #: src/plugins/bogofilter/bogofilter_gtk.c:347
 #: src/plugins/bogofilter/bogofilter_gtk.c:424
@@ -935,43 +940,43 @@ msgstr "איסוף כתובות דוא״ל בתוך הודעות נבחרות"
 msgid "Collect email addresses from folder"
 msgstr "איסוף כתובות דוא״ל בתוך תיקייה"
 
-#: src/addrindex.c:123
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "כתובות כלליות"
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "כתובות אישיות"
 
-#: src/addrindex.c:130
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "כתובת כללית"
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "כתובת אישית"
 
-#: src/addrindex.c:1827
+#: src/addrindex.c:1830
 msgid "Address(es) update"
 msgstr "כתובות עודכנו"
 
-#: src/addrindex.c:1828
+#: src/addrindex.c:1831
 msgid "Update failed. Changes not written to Directory."
 msgstr "עדכון נכשל. שינויים לא נכתבו למדור."
 
-#: src/alertpanel.c:146 src/compose.c:9482
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "התראה"
 
-#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
-#: src/compose.c:11917 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:750
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4892
+#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
+#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
 msgid "Warning"
 msgstr "אזהרה"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:669
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:280
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
+#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "שגיאה"
 
@@ -1004,88 +1009,88 @@ msgstr "שם LDAP"
 msgid "Attribute Value"
 msgstr "ערך אפיון"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "כלום"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "צופה"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "מנתח MIME‏"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "תיקיות"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "סינון"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "ממשק פרטיות"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "מתריע"
 
 # typo: an > a
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "כלי עזר"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "דברים"
 
-#: src/common/plugin.c:332
+#: src/common/plugin.c:334
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "תוסף זה מספק %s ‏(%s), שכבר מסופק על ידי התוסף %s."
 
-#: src/common/plugin.c:434
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "תוסף כבר טעון"
 
-#: src/common/plugin.c:445
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "כשל בהקצאת זיכרון עבור תוסף"
 
-#: src/common/plugin.c:479
+#: src/common/plugin.c:482
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "מודול זה אינו רשוי תחת GPL v3 או רשיון יותר מאוחר תואם."
 
-#: src/common/plugin.c:488
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "מודול זה מיועד עבור Claws Mail GTK1."
 
-#: src/common/plugin.c:770
+#: src/common/plugin.c:769
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr "הגרסא של Claws Mail שברשותך חדשה יותר מן הגרסא שהתוסף '%s' נבנה עמה."
 
-#: src/common/plugin.c:773
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "הגרסא של Claws Mail שברשותך חדשה יותר מן הגרסא שהתוסף נבנה עמה."
 
-#: src/common/plugin.c:782
+#: src/common/plugin.c:781
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "הגרסא של Claws Mail שברשותך הינה ישנה מדי עבור התוסף '%s'."
 
-#: src/common/plugin.c:784
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "הגרסא של Claws Mail שברשותך הינה ישנה מדי עבור התוסף."
 
-#: src/common/session.c:183 src/imap.c:1189
+#: src/common/session.c:183 src/imap.c:1213
 msgid "SSL handshake failed\n"
 msgstr "לחיצת יד SSL נכשלה\n"
 
@@ -1097,24 +1102,24 @@ msgstr "אין שיטת SMTP AUTH זמינה\n"
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "שיטת SMTP AUTH נבחרת לא זמינה\n"
 
-#: src/common/smtp.c:505 src/common/smtp.c:559
+#: src/common/smtp.c:501 src/common/smtp.c:555
 msgid "bad SMTP response\n"
 msgstr "היענות SMTP רעה\n"
 
-#: src/common/smtp.c:530 src/common/smtp.c:548 src/common/smtp.c:662
+#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
 msgid "error occurred on SMTP session\n"
 msgstr "אירעה שגיאה בסשן SMTP\n"
 
-#: src/common/smtp.c:539 src/pop.c:905
+#: src/common/smtp.c:535 src/pop.c:905
 msgid "error occurred on authentication\n"
 msgstr "אירעה שגיאה באימות\n"
 
-#: src/common/smtp.c:589
+#: src/common/smtp.c:585
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "ההודעה הינה גדולה מדי (גודל מרבי הינו %s)\n"
 
-#: src/common/smtp.c:621 src/pop.c:898
+#: src/common/smtp.c:617 src/pop.c:898
 msgid "couldn't start TLS session\n"
 msgstr "לא היתה אפשרות להתחיל סשן TLS\n"
 
@@ -1146,83 +1151,83 @@ msgstr "‏%s:%s: חיפוש מארח נכשל (%s).\n"
 msgid "write on fd%d: %s\n"
 msgstr "רשום על fd%d:‏ %s\n"
 
-#: src/common/ssl_certificate.c:328
+#: src/common/ssl_certificate.c:326
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "אין אפשרות להתחיל קובץ P12 ‏(%s)\n"
 
-#: src/common/ssl_certificate.c:336
+#: src/common/ssl_certificate.c:334
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "אין אפשרות לקרוא קובץ P12 ‏(%s)\n"
 
-#: src/common/ssl_certificate.c:345
+#: src/common/ssl_certificate.c:343
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "אין אפשרות לייבא קובץ P12 ‏(%s)\n"
 
-#: src/common/ssl_certificate.c:630
+#: src/common/ssl_certificate.c:628
 msgid "Internal error"
 msgstr "שגיאה פנימית"
 
 # לא נתון לבדיקה
-#: src/common/ssl_certificate.c:635
+#: src/common/ssl_certificate.c:633
 msgid "Uncheckable"
 msgstr "לא נתון לסימון"
 
-#: src/common/ssl_certificate.c:639
+#: src/common/ssl_certificate.c:637
 msgid "Self-signed certificate"
 msgstr "תעודה חתומה באופן עצמי"
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:640
 msgid "Revoked certificate"
 msgstr "תעודה פסולה"
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:642
 msgid "No certificate issuer found"
 msgstr "לא נמצא מנפיק תעודה"
 
-#: src/common/ssl_certificate.c:646
+#: src/common/ssl_certificate.c:644
 msgid "Certificate issuer is not a CA"
 msgstr "מנפיק תעודה אינו CA"
 
-#: src/common/ssl_certificate.c:871
+#: src/common/ssl_certificate.c:869
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "אין אפשרות לפתוח קובץ תעודה %s: ‏%s\n"
 
-#: src/common/ssl_certificate.c:875
+#: src/common/ssl_certificate.c:873
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "קובץ תעודה %s חסר (%s)\n"
 
-#: src/common/ssl_certificate.c:894
+#: src/common/ssl_certificate.c:892
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "אין אפשרות לפתוח קובץ מפתח %s ‏(%s)\n"
 
-#: src/common/ssl_certificate.c:898
+#: src/common/ssl_certificate.c:896
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "קובץ מפתח %s חסר (%s)\n"
 
-#: src/common/ssl_certificate.c:1046
+#: src/common/ssl_certificate.c:1044
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "כשל בקריאת קובץ תעודה P12 ‏%s\n"
 
-#: src/common/ssl_certificate.c:1049
+#: src/common/ssl_certificate.c:1047
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "אין אפשרות לפתוח קובץ תעודה P12 ‏%s ‏(%s)\n"
 
 # נעדר
-#: src/common/ssl_certificate.c:1053
+#: src/common/ssl_certificate.c:1051
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "קובץ תעודהP12 %s חסר (%s)\n"
 
-#: src/common/ssl_certificate.c:1078 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1076 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
 #: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
@@ -1234,648 +1239,649 @@ msgstr "<לא בתעודה>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(נושא טוהר באמצעות RegExp)"
 
-#: src/common/utils.c:257
+#: src/common/utils.c:259
 #, c-format
 msgid "%dB"
 msgstr "%d בתים"
 
-#: src/common/utils.c:258
+#: src/common/utils.c:260
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d ק״ב"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:261
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d מ״ב"
 
-#: src/common/utils.c:260
+#: src/common/utils.c:262
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f ג״ב"
 
-#: src/common/utils.c:4806
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "ראשון"
 
-#: src/common/utils.c:4807
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "שני"
 
-#: src/common/utils.c:4808
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "שלישי"
 
-#: src/common/utils.c:4809
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "רביעי"
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "חמישי"
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "שישי"
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "שבת"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "ינואר"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "פברואר"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "מרץ"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "אפריל"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "מאי"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "יוני"
 
-#: src/common/utils.c:4820
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "יולי"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "אוגוסט"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "ספטמבר"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "אוקטובר"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "נובמבר"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "דצמבר"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "א׳"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "ב׳"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "ג׳"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "ד׳"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "ה׳"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "ו׳"
 
-#: src/common/utils.c:4833
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "ש׳"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "ינו"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "פבר"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "מרץ"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "אפר"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "מאי"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "יונ"
 
-#: src/common/utils.c:4841
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "יול"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "אוג"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "ספט"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "אוק"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "נוב"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "דצמ"
 
-#: src/common/utils.c:4857
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "בבוקר"
 
-#: src/common/utils.c:4858
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "אחה״צ"
 
-#: src/common/utils.c:4859
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "בבוקר"
 
-#: src/common/utils.c:4860
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "אחה״צ"
 
-#: src/compose.c:576
+#: src/compose.c:575
 msgid "_Add..."
 msgstr "הו_סף..."
 
-#: src/compose.c:577 src/mh_gtk.c:368 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:318
+#: src/compose.c:576 src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:316
 msgid "_Remove"
 msgstr "הס_ר"
 
-#: src/compose.c:579 src/folderview.c:241
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_מאפיינים..."
 
-#: src/compose.c:586 src/mainwindow.c:510 src/messageview.c:212
+#: src/compose.c:585 src/mainwindow.c:514 src/messageview.c:211
 msgid "_Message"
 msgstr "_הודעה"
 
-#: src/compose.c:589
+#: src/compose.c:588
 msgid "_Spelling"
 msgstr "_איות"
 
-#: src/compose.c:591 src/compose.c:658
+#: src/compose.c:590 src/compose.c:657
 msgid "_Options"
 msgstr "א_פשרויות"
 
-#: src/compose.c:595
+#: src/compose.c:594
 msgid "S_end"
 msgstr "_שלח"
 
-#: src/compose.c:596
+#: src/compose.c:595
 msgid "Send _later"
 msgstr "שלח _אח״כ"
 
-#: src/compose.c:599
+#: src/compose.c:598
 msgid "_Attach file"
 msgstr "ס_פח קובץ"
 
-#: src/compose.c:600
+#: src/compose.c:599
 msgid "_Insert file"
 msgstr "ש_בץ קובץ"
 
-#: src/compose.c:601
+#: src/compose.c:600
 msgid "Insert si_gnature"
 msgstr "שבץ _חתימה"
 
-#: src/compose.c:602
+#: src/compose.c:601
 msgid "_Replace signature"
 msgstr "החלף ח_תימה"
 
-#: src/compose.c:606
+#: src/compose.c:605
 msgid "_Print"
 msgstr "הד_פס"
 
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:610 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "בט_ל"
 
-#: src/compose.c:612 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "ב_צע שוב"
 
-#: src/compose.c:615 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:614 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_גזור"
 
-#: src/compose.c:619
+#: src/compose.c:618
 msgid "_Special paste"
 msgstr "הדבקה מיו_חדת"
 
-#: src/compose.c:620
+#: src/compose.c:619
 msgid "As _quotation"
 msgstr "בתור _ציטטה"
 
 # _כרוך
-#: src/compose.c:621
+#: src/compose.c:620
 msgid "_Wrapped"
 msgstr "_כרוכה"
 
 # בטל כריכה
-#: src/compose.c:622
+#: src/compose.c:621
 msgid "_Unwrapped"
 msgstr "_לא כרוכה"
 
-#: src/compose.c:624 src/mainwindow.c:543
+#: src/compose.c:623 src/mainwindow.c:547
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "בחר ה_כל"
 
-#: src/compose.c:626
+#: src/compose.c:625
 msgid "A_dvanced"
 msgstr "מ_תקדם"
 
-#: src/compose.c:627
+#: src/compose.c:626
 msgid "Move a character backward"
 msgstr "הזז תו לאחור"
 
-#: src/compose.c:628
+#: src/compose.c:627
 msgid "Move a character forward"
 msgstr "הזז תו לפנים"
 
-#: src/compose.c:629
+#: src/compose.c:628
 msgid "Move a word backward"
 msgstr "הזז מילה לאחור"
 
-#: src/compose.c:630
+#: src/compose.c:629
 msgid "Move a word forward"
 msgstr "הזז מילה לפנים"
 
-#: src/compose.c:631
+#: src/compose.c:630
 msgid "Move to beginning of line"
 msgstr "הזז לתחילת שורה"
 
-#: src/compose.c:632
+#: src/compose.c:631
 msgid "Move to end of line"
 msgstr "הזז לסוף שורה"
 
-#: src/compose.c:633
+#: src/compose.c:632
 msgid "Move to previous line"
 msgstr "הזז לשורה קודמת"
 
-#: src/compose.c:634
+#: src/compose.c:633
 msgid "Move to next line"
 msgstr "הזז לשורה הבאה"
 
-#: src/compose.c:635
+#: src/compose.c:634
 msgid "Delete a character backward"
 msgstr "מחק תו לאחור"
 
-#: src/compose.c:636
+#: src/compose.c:635
 msgid "Delete a character forward"
 msgstr "מחק תו לפנים"
 
-#: src/compose.c:637
+#: src/compose.c:636
 msgid "Delete a word backward"
 msgstr "מחק מילה לאחור"
 
-#: src/compose.c:638
+#: src/compose.c:637
 msgid "Delete a word forward"
 msgstr "מחק מילה לפנים"
 
-#: src/compose.c:639
+#: src/compose.c:638
 msgid "Delete line"
 msgstr "מחק שורה"
 
-#: src/compose.c:640
+#: src/compose.c:639
 msgid "Delete to end of line"
 msgstr "מחק עד סוף שורה"
 
-#: src/compose.c:643 src/messageview.c:229
+#: src/compose.c:642 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_מצא"
 
-#: src/compose.c:646
+#: src/compose.c:645
 msgid "_Wrap current paragraph"
 msgstr "_כרוך פסקה נוכחית"
 
-#: src/compose.c:647
+#: src/compose.c:646
 msgid "Wrap all long _lines"
 msgstr "כרוך _שורות ארוכות"
 
-#: src/compose.c:649
+#: src/compose.c:648
 msgid "Edit with e_xternal editor"
 msgstr "ערוך בעזרת עורך חי_צוני"
 
-#: src/compose.c:652
+#: src/compose.c:651
 msgid "_Check all or check selection"
 msgstr "_בדוק הכל או בדוק בחירה"
 
-#: src/compose.c:653
+#: src/compose.c:652
 msgid "_Highlight all misspelled words"
 msgstr "_הדגש את כל המילים אשר אויתו באופן שגוי"
 
-#: src/compose.c:654
+#: src/compose.c:653
 msgid "Check _backwards misspelled word"
 msgstr "ב_דוק אחורנית עבור מילים אשר אויתו באופן שגוי"
 
-#: src/compose.c:655
+#: src/compose.c:654
 msgid "_Forward to next misspelled word"
 msgstr "_עבור הלאה למילה הבאה אשר אויתה באופן שגוי"
 
-#: src/compose.c:663
+#: src/compose.c:662
 msgid "Reply _mode"
 msgstr "_צורת מענה"
 
-#: src/compose.c:665
+#: src/compose.c:664
 msgid "Privacy _System"
 msgstr "מערכת _פרטיות"
 
-#: src/compose.c:670
+#: src/compose.c:669
 msgid "_Priority"
 msgstr "_עדיפות"
 
-#: src/compose.c:672 src/mainwindow.c:606 src/messageview.c:265
+#: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_קידוד תווים"
 
-#: src/compose.c:677 src/mainwindow.c:611 src/messageview.c:270
+#: src/compose.c:676 src/mainwindow.c:615 src/messageview.c:269
 msgid "Western European"
 msgstr "מערב אירופאי"
 
-#: src/compose.c:678 src/mainwindow.c:612 src/messageview.c:271
+#: src/compose.c:677 src/mainwindow.c:616 src/messageview.c:270
 msgid "Baltic"
 msgstr "בלטי"
 
-#: src/compose.c:679 src/mainwindow.c:613 src/messageview.c:272
+#: src/compose.c:678 src/mainwindow.c:617 src/messageview.c:271
 msgid "Hebrew"
 msgstr "עברי"
 
-#: src/compose.c:680 src/mainwindow.c:614 src/messageview.c:273
+#: src/compose.c:679 src/mainwindow.c:618 src/messageview.c:272
 msgid "Arabic"
 msgstr "ערבי"
 
-#: src/compose.c:681 src/mainwindow.c:615 src/messageview.c:274
+#: src/compose.c:680 src/mainwindow.c:619 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "קירילי"
 
-#: src/compose.c:682 src/mainwindow.c:616 src/messageview.c:275
+#: src/compose.c:681 src/mainwindow.c:620 src/messageview.c:274
 msgid "Japanese"
 msgstr "יפני"
 
-#: src/compose.c:683 src/mainwindow.c:617 src/messageview.c:276
+#: src/compose.c:682 src/mainwindow.c:621 src/messageview.c:275
 msgid "Chinese"
 msgstr "סיני"
 
-#: src/compose.c:684 src/mainwindow.c:618 src/messageview.c:277
+#: src/compose.c:683 src/mainwindow.c:622 src/messageview.c:276
 msgid "Korean"
 msgstr "קוריאני"
 
-#: src/compose.c:685 src/mainwindow.c:619 src/messageview.c:278
+#: src/compose.c:684 src/mainwindow.c:623 src/messageview.c:277
 msgid "Thai"
 msgstr "תאילנדי"
 
-#: src/compose.c:688 src/mainwindow.c:728 src/messageview.c:314
+#: src/compose.c:687 src/mainwindow.c:732 src/messageview.c:313
 msgid "_Address book"
 msgstr "_פנקס כתובות"
 
-#: src/compose.c:690
+#: src/compose.c:689
 msgid "_Template"
 msgstr "_תבנית"
 
-#: src/compose.c:692 src/mainwindow.c:756 src/messageview.c:335
+#: src/compose.c:691 src/mainwindow.c:760 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "פ_עולות"
 
-#: src/compose.c:701
+#: src/compose.c:700
 msgid "Aut_o wrapping"
 msgstr "כרוך _אוטומטית"
 
-#: src/compose.c:702
+#: src/compose.c:701
 msgid "Auto _indent"
 msgstr "ה_זח אוטומטית"
 
-#: src/compose.c:703
+#: src/compose.c:702
 msgid "Si_gn"
 msgstr "_חתימה"
 
-#: src/compose.c:704
+#: src/compose.c:703
 msgid "_Encrypt"
 msgstr "_הצפן"
 
-#: src/compose.c:705
+#: src/compose.c:704
 msgid "_Request Return Receipt"
 msgstr "_בקש קבלת מסירה"
 
-#: src/compose.c:706
+#: src/compose.c:705
 msgid "Remo_ve references"
 msgstr "הסר _מראי מקום"
 
-#: src/compose.c:707
+#: src/compose.c:706
 msgid "Show _ruler"
 msgstr "_הצג סרגל"
 
-#: src/compose.c:712 src/compose.c:722
+#: src/compose.c:711 src/compose.c:721
 msgid "_Normal"
 msgstr "_רגילה"
 
-#: src/compose.c:713 src/mainwindow.c:660 src/messageview.c:303
+#: src/compose.c:712 src/mainwindow.c:664 src/messageview.c:302
 msgid "_All"
 msgstr "_כולם"
 
-#: src/compose.c:714 src/mainwindow.c:661 src/messageview.c:304
+#: src/compose.c:713 src/mainwindow.c:665 src/messageview.c:303
 msgid "_Sender"
 msgstr "_ממען"
 
-#: src/compose.c:715
+#: src/compose.c:714
 msgid "_Mailing-list"
 msgstr "_רשימת-דיוור"
 
-#: src/compose.c:720
+#: src/compose.c:719
 msgid "_Highest"
 msgstr "_גבוהה ביותר"
 
-#: src/compose.c:721
+#: src/compose.c:720
 msgid "Hi_gh"
 msgstr "ג_בוהה"
 
-#: src/compose.c:723
+#: src/compose.c:722
 msgid "Lo_w"
 msgstr "_נמוכה"
 
-#: src/compose.c:724
+#: src/compose.c:723
 msgid "_Lowest"
 msgstr "נ_מוכה ביותר"
 
-#: src/compose.c:729 src/mainwindow.c:871 src/messageview.c:352
+#: src/compose.c:728 src/mainwindow.c:878 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_אוטומטי"
 
-#: src/compose.c:730 src/mainwindow.c:872 src/messageview.c:353
+#: src/compose.c:729 src/mainwindow.c:879 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "‏7bit ASCII ‏(US-ASC_II)"
 
-#: src/compose.c:731 src/mainwindow.c:873 src/messageview.c:354
+#: src/compose.c:730 src/mainwindow.c:880 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "קידוד אוניברסלי (_UTF-8)"
 
-#: src/compose.c:735 src/mainwindow.c:877 src/messageview.c:358
+#: src/compose.c:734 src/mainwindow.c:884 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "מרכז אירופאי (ISO-8859-_2)"
 
-#: src/compose.c:738 src/mainwindow.c:880 src/messageview.c:361
+#: src/compose.c:737 src/mainwindow.c:887 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "יווני (ISO-8859-_7)"
 
-#: src/compose.c:743 src/mainwindow.c:885 src/messageview.c:366
+#: src/compose.c:742 src/mainwindow.c:892 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "טורקי (ISO-8859-_9)"
 
-#: src/compose.c:1072
+#: src/compose.c:1071
 msgid "New message From format error."
 msgstr "שגיאת פורמט From של הודעה חדשה."
 
-#: src/compose.c:1164
+#: src/compose.c:1163
 msgid "New message subject format error."
 msgstr "שגיאת פורמט נושא של הודעה חדשה."
 
-#: src/compose.c:1195 src/quote_fmt.c:569
+#: src/compose.c:1194 src/quote_fmt.c:569
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "לגוף של התבנית \"הודעה חדשה\" יש שגיאה בשורה %d."
 
-#: src/compose.c:1456
+#: src/compose.c:1455
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "אין אפשרות לענות. הדוא״ל המקורי כפי הנראה לא קיים."
 
-#: src/compose.c:1639 src/quote_fmt.c:586
+#: src/compose.c:1638 src/quote_fmt.c:586
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "השדה \"From\" של התבנית \"Reply\" מכיל כתובת דוא״ל שגויה."
 
-#: src/compose.c:1687 src/quote_fmt.c:589
+#: src/compose.c:1686 src/quote_fmt.c:589
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "לגוף של התבנית \"מענה\" יש שגיאה בשורה %d."
 
-#: src/compose.c:1823 src/compose.c:2015 src/quote_fmt.c:606
+#: src/compose.c:1822 src/compose.c:2014 src/quote_fmt.c:606
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "השדה \"From\" של התבנית \"Forward\" מכיל כתובת דוא״ל שגויה."
 
-#: src/compose.c:1883 src/quote_fmt.c:609
+#: src/compose.c:1882 src/quote_fmt.c:609
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "לגוף של התבנית \"קידום\" יש שגיאה בשורה %d."
 
-#: src/compose.c:2057
+#: src/compose.c:2056
 msgid "Fw: multiple emails"
 msgstr "Fw: הודעות דואר מרובות"
 
-#: src/compose.c:2537
+#: src/compose.c:2539
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "לגוף של התבנית \"הכוונה מחדש\" יש שגיאה בשורה %d."
 
-#: src/compose.c:2604 src/gtk/headers.h:14
+#: src/compose.c:2606 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "עותק:"
 
-#: src/compose.c:2607 src/gtk/headers.h:15
+#: src/compose.c:2609 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "עותק סמוי:"
 
-#: src/compose.c:2610 src/gtk/headers.h:12
+#: src/compose.c:2612 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "מענה-אל:"
 
-#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946 src/gtk/headers.h:33
+#: src/compose.c:2615 src/compose.c:4946 src/compose.c:4948
+#: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "קבוצות דיונים:"
 
-#: src/compose.c:2616 src/gtk/headers.h:34
+#: src/compose.c:2618 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "המשך-אל:"
 
-#: src/compose.c:2619 src/gtk/headers.h:17
+#: src/compose.c:2621 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "ב-מענה-אל:"
 
-#: src/compose.c:2623 src/compose.c:4941 src/compose.c:4949
+#: src/compose.c:2625 src/compose.c:4943 src/compose.c:4951
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "לכבוד:"
 
 # הימור
-#: src/compose.c:2832
+#: src/compose.c:2834
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "לא היתה אפשרות לספח קובץ (המרת מערך תווים נכשלה)."
 
-#: src/compose.c:2838
+#: src/compose.c:2840
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1890,16 +1896,16 @@ msgstr[1] ""
 "הקבצים הבאים סופחו: \n"
 "%s"
 
-#: src/compose.c:3111
+#: src/compose.c:3113
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"סימן מרכאות\" של התבנית הינו שגוי."
 
-#: src/compose.c:3611
+#: src/compose.c:3613
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "לא היתה אפשרות להשיג גודל של קובץ '%s'."
 
-#: src/compose.c:3622
+#: src/compose.c:3624
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1907,57 +1913,57 @@ msgid ""
 msgstr ""
 "בחרת לשבץ קובץ של %s בתוך גוף ההודעה. האם אתה בטוח כי ברצונך לעשות זאת?"
 
-#: src/compose.c:3625
+#: src/compose.c:3627
 msgid "Are you sure?"
 msgstr "האם אתה בטוח?"
 
-#: src/compose.c:3626 src/compose.c:10538 src/compose.c:11399
+#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
 msgid "_Insert"
 msgstr "_שבץ"
 
-#: src/compose.c:3750
+#: src/compose.c:3752
 #, c-format
 msgid "File %s is empty."
 msgstr "קובץ %s הינו ריק."
 
-#: src/compose.c:3751
+#: src/compose.c:3753
 msgid "Empty file"
 msgstr "קובץ ריק"
 
-#: src/compose.c:3752
+#: src/compose.c:3754
 msgid "_Attach anyway"
 msgstr "_ספח למרות זאת"
 
-#: src/compose.c:3761
+#: src/compose.c:3763
 #, c-format
 msgid "Can't read %s."
 msgstr "אין אפשרות לקרוא %s."
 
-#: src/compose.c:3788
+#: src/compose.c:3790
 #, c-format
 msgid "Message: %s"
 msgstr "הודעה: %s"
 
-#: src/compose.c:4781 src/plugins/managesieve/sieve_editor.c:694
-#: src/plugins/python/composewindowtype.c:421
+#: src/compose.c:4783 src/plugins/managesieve/sieve_editor.c:694
+#: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [ערוכה]"
 
-#: src/compose.c:4788 src/plugins/python/composewindowtype.c:424
+#: src/compose.c:4790 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "‏%s - הלחנת הודעה%s"
 
-#: src/compose.c:4791 src/plugins/python/composewindowtype.c:427
+#: src/compose.c:4793 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[אין נושא] - הלחנת הודעה%s"
 
-#: src/compose.c:4793 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4795 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "הלחנת הודעה"
 
-#: src/compose.c:4820 src/messageview.c:890
+#: src/compose.c:4822 src/messageview.c:889
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1965,52 +1971,52 @@ msgstr ""
 "חשבון לשליחת דואר אינו מצוין.\n"
 "אנא בחר חשבון דואר לפני שליחה."
 
-#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5114
-#: src/prefs_account.c:3270 src/toolbar.c:406 src/toolbar.c:424
+#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
+#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "שלח"
 
-#: src/compose.c:5041
+#: src/compose.c:5043
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "הנמען היחיד הינו כתובת CC ברירת מחדל. לשלוח למרות זאת?"
 
-#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5107 src/compose.c:5631
-#: src/folderview.c:2438 src/messageview.c:856 src/messageview.c:873
+#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
+#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_שלח"
 
-#: src/compose.c:5073
+#: src/compose.c:5075
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "הנמען היחיד הינו כתובת BCC ברירת מחדל. לשלוח למרות זאת?"
 
-#: src/compose.c:5090
+#: src/compose.c:5092
 msgid "Recipient is not specified."
 msgstr "נמען אינו מצוין."
 
-#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_תור"
 
-#: src/compose.c:5110
+#: src/compose.c:5112
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "הנושא הינו ריק. %s"
 
-#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "לשלוח למרות זאת?"
 
 # להעמיד בתור
-#: src/compose.c:5112 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5114 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "להשים בתור למרות זאת?"
 
-#: src/compose.c:5114 src/toolbar.c:425
+#: src/compose.c:5116 src/toolbar.c:425
 msgid "Send later"
 msgstr "שלח אח״כ"
 
-#: src/compose.c:5167 src/compose.c:10002
+#: src/compose.c:5169 src/compose.c:9999
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2020,7 +2026,7 @@ msgstr ""
 "\n"
 "המרת מערך תווים נכשלה."
 
-#: src/compose.c:5170 src/compose.c:10005
+#: src/compose.c:5172 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2030,7 +2036,7 @@ msgstr ""
 "\n"
 "לא היתה אפשרות להשיג מפתח הצפנה של נמען."
 
-#: src/compose.c:5176 src/compose.c:9999
+#: src/compose.c:5178 src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2041,7 +2047,7 @@ msgstr ""
 "\n"
 "חתימה נכשלה: %s"
 
-#: src/compose.c:5179
+#: src/compose.c:5181
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2052,11 +2058,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5181
+#: src/compose.c:5183
 msgid "Could not queue message for sending."
 msgstr "לא היתה אפשרות להשים הודעה בתור לשליחה."
 
-#: src/compose.c:5196 src/compose.c:5256
+#: src/compose.c:5198 src/compose.c:5258
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2065,7 +2071,7 @@ msgstr ""
 "נסה את \"שלח הודעות בהמתנה\" מתוך התפריט הראשי ונסה שוב."
 
 # נצל
-#: src/compose.c:5252
+#: src/compose.c:5254
 #, c-format
 msgid ""
 "%s\n"
@@ -2074,7 +2080,7 @@ msgstr ""
 "%s\n"
 "נסה את \"שלח הודעות בהמתנה\" מתוך התפריט הראשי ונסה שוב."
 
-#: src/compose.c:5627
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2085,7 +2091,7 @@ msgstr ""
 "אל מערך התווים %s המצוין.\n"
 "שלח זאת בתור הודעה %s?"
 
-#: src/compose.c:5685
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2098,73 +2104,73 @@ msgstr ""
 "\n"
 "לשלוח למרות זאת?"
 
-#: src/compose.c:5796
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "לא היתה אפשרות להצפין את הדוא״ל: %s"
 
-#: src/compose.c:5917
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "אזהרת הצפנה"
 
-#: src/compose.c:5918
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "ה_משך"
 
-#: src/compose.c:5967
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "אין חשבון זמין לצורך שליחת דואר!"
 
-#: src/compose.c:5976
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "חשבון נבחר אינו NNTP: פרסום הינו בלתי אפשרי."
 
-#: src/compose.c:6211
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "תצריף %s לא קיים כבר. להתעלם?"
 
-#: src/compose.c:6212 src/mainwindow.c:651 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "בטל שליחה"
 
 # check
-#: src/compose.c:6212
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "התעלם מן תצריף"
 
-#: src/compose.c:6252
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "אזור %s מקורי"
 
-#: src/compose.c:6834
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "הוסף לפנק_ס כתובות"
 
-#: src/compose.c:6995
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "מחק תכולות רשומה"
 
-#: src/compose.c:6999 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "באפשרותך להקיש על <tab> להשלמה אוטומטית מתוך פנקס כתובות"
 
-#: src/compose.c:7221
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "טיפוס Mime"
 
-#: src/compose.c:7227 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:444
 msgid "Size"
 msgstr "גודל"
 
-#: src/compose.c:7290
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "שמור הודעה אל "
 
-#: src/compose.c:7327 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
 #: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2175,23 +2181,23 @@ msgstr "שמור הודעה אל "
 msgid "_Browse"
 msgstr "   _עיון   "
 
-#: src/compose.c:7800
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "_תקורה"
 
-#: src/compose.c:7805
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "ת_צריפים"
 
-#: src/compose.c:7819
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "א_חרים"
 
-#: src/compose.c:7834
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "_נושא:"
 
-#: src/compose.c:8058
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2200,19 +2206,19 @@ msgstr ""
 "בודק איות לא יכול היה להתחיל.\n"
 "%s"
 
-#: src/compose.c:8197
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_מאת‎:"
 
-#: src/compose.c:8214
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "חשבון לשימוש עבור דוא״ל זה"
 
-#: src/compose.c:8216
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "כתובת ממען לשימוש"
 
-#: src/compose.c:8382
+#: src/compose.c:8379
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2221,68 +2227,68 @@ msgstr ""
 "מערכת הפרטיות '%s' לא היתה ניתנת להיטען. לא תהא נתונה לך אפשרות לחתום או "
 "להצפין את הודעה זו."
 
-#: src/compose.c:8483 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_ללא"
 
-#: src/compose.c:8584 src/prefs_template.c:760
+#: src/compose.c:8581 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "גוף התבנית מכיל שגיאה בשורה %d."
 
-#: src/compose.c:8700
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "שגיאת פורמט From של תבנית."
 
-#: src/compose.c:8718
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "שגיאת פורמט To של תבנית."
 
-#: src/compose.c:8736
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "שגיאת פורמט Cc של תבנית."
 
-#: src/compose.c:8754
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "שגיאת פורמט Bcc של תבנית."
 
-#: src/compose.c:8772
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "שגיאת פורמט Reply-To של תבנית."
 
-#: src/compose.c:8791
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "שגיאת פורמט נושא של תבנית."
 
-#: src/compose.c:9060
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "טיפוס MIME שגוי."
 
-#: src/compose.c:9075
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "קובץ לא קיים או שהינו ריק."
 
-#: src/compose.c:9149
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: src/compose.c:9166
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "טיפוס MIME"
 
-#: src/compose.c:9207
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "קידוד"
 
-#: src/compose.c:9227
+#: src/compose.c:9224
 msgid "Path"
 msgstr "נתיב"
 
-#: src/compose.c:9228
+#: src/compose.c:9225
 msgid "File name"
 msgstr "שם קובץ"
 
-#: src/compose.c:9479
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2293,15 +2299,15 @@ msgstr ""
 "לכפות את סיום התהליך?\n"
 "process group id: %d"
 
-#: src/compose.c:9968 src/messageview.c:1097
+#: src/compose.c:9965 src/messageview.c:1096
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לשלוח את דוא״ל זה."
 
-#: src/compose.c:9994
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "לא היתה אפשרות להשים הודעה בתור."
 
-#: src/compose.c:9996
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2312,15 +2318,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10174
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "לא היתה אפשרות לשמור טיוטה."
 
-#: src/compose.c:10178
+#: src/compose.c:10175
 msgid "Could not sav