[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 save draft"
 msgstr "לא היתה אפשרות לשמור טיוטה"
 
-#: src/compose.c:10179
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2328,24 +2334,24 @@ msgstr ""
 "לא היתה אפשרות לשמור טיוטה.\n"
 "האם ברצונך לבטל יציאה או לסלק את דואר זה?"
 
-#: src/compose.c:10181
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_ביטול יציאה"
 
-#: src/compose.c:10181
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_סלק דואר"
 
-#: src/compose.c:10341 src/compose.c:10355
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "בחירת קובץ"
 
-#: src/compose.c:10369
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "קובץ '%s' לא היה יכול להיקרא."
 
-#: src/compose.c:10371
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2354,71 +2360,71 @@ msgstr ""
 "קובץ '%s' מכיל תווים שגויים\n"
 "עבור הקידוד הנוכחי, שיבוץ עשוי להיות לא מדויק."
 
-#: src/compose.c:10458
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "סילוק הודעה"
 
 # עברה שינוי. האם לסלקה
-#: src/compose.c:10459
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "הודעה זו שונתה. לסלק אותה?"
 
-#: src/compose.c:10460 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_סלק"
 
-#: src/compose.c:10460 src/compose.c:10464
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "_שמור לטיוטות"
 
-#: src/compose.c:10462 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:10463
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "הודעה זו שונתה. לשמור שינויים אחרונים?"
 
-#: src/compose.c:10464
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_אל תשמור"
 
-#: src/compose.c:10535
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "האם ברצונך להחיל את התבנית '%s'?"
 
-#: src/compose.c:10537
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "החלת תבנית"
 
-#: src/compose.c:10538 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:11396
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "לשבץ או לספח?"
 
-#: src/compose.c:11397
+#: 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:11399
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_ספח"
 
-#: src/compose.c:11616
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "שגיאת פורמט ציטטה בשורה %d."
 
-#: src/compose.c:11911
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2466,11 +2472,11 @@ msgstr "צור דו״ח bug"
 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"
@@ -2496,7 +2502,7 @@ msgstr ""
 "הקלק אישור כדי להמשיך לערוך את איש קשר זה.\n"
 "הקלק על ביטול כדי לסגור בלי לשמור."
 
-#: 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"
@@ -2518,35 +2524,35 @@ msgstr ""
 "הקלק אישור כדי להמשיך לערוך את איש קשר זה.\n"
 "הקלק על ביטול כדי לסגור בלי לשמור."
 
-#: 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"
@@ -2555,58 +2561,58 @@ msgstr ""
 "כשל בייבוא תמונה: \n"
 "%s"
 
-#: 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"
@@ -2636,8 +2642,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 "קובץ"
 
@@ -2685,12 +2691,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 "הזן את השם של תיקייה חדשה:"
@@ -2719,16 +2725,16 @@ msgstr "הוספת רשומת JPilot חדשה"
 msgid "Edit LDAP - Select Search Base"
 msgstr "עריכת LDAP - בחירת בסיס חיפוש"
 
-#: 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 "בסיס חיפוש"
 
@@ -2740,37 +2746,37 @@ 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 "ישנו צורך כי לפחות אפיון חיפוש LDAP אחד יסופק."
 
 # Connected to server successfully
 # חובר לשרת בהצלחה
-#: 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 "ערוך שרת LDAP"
 
-#: 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 "
@@ -2781,15 +2787,15 @@ msgstr ""
 "הארגון \"mydomain.com\". כתובת IP גם כן ניתנת לשימוש. באפשרותך לציין "
 "\"localhost\" אם שרת LDAP מורץ על אותו מחשב בו Claws Mail עליו מורץ."
 
-#: src/editldap.c:469
+#: src/editldap.c:470
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3343
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
-#: 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 "
@@ -2798,7 +2804,7 @@ msgstr ""
 "אפשר חיבור מאובטח לשרת LDAP מבעד אל TLS. אם חיבור נכשל, היה בטוח לבדוק את "
 "התצורה המדויקת בתוך ldap.conf (שדות TLS_CACERTDIR וגם TLS_REQCERT)."
 
-#: 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 "
@@ -2807,19 +2813,19 @@ msgstr ""
 "אפשר חיבור מאובטח לשרת LDAP מבעד אל SSL. אם חיבור נכשל, היה בטוח לבדוק את "
 "התצורה המדויקת בתוך ldap.conf (שדות TLS_CACERTDIR וגם TLS_REQCERT)."
 
-#: src/editldap.c:490
+#: src/editldap.c:491
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "מספר הפורט שהשרת מאזין עליו. הפורט 389 הוא פורט ברירת מחדל."
 
-#: 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"
@@ -2832,27 +2838,27 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=שם ארגון,c=ארץ\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 "רשימה של שמות אפיון LDAP אשר צריך לחפשם כאשר מנסים למצוא שם או כתובת."
 
-#: 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."
@@ -2860,11 +2866,11 @@ 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 "
@@ -2885,11 +2891,11 @@ 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."
@@ -2897,29 +2903,28 @@ 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\" search; this type of search usually takes longer to complete. "
-"Note that for performance reasons, address completion uses \"begins-with\" "
-"for all searches against other address interfaces."
+"Searches for names and addresses can be performed either using \"begins-with"
+"\" or \"contains\" search term. Check this option to perform a \"contains\" "
+"search; this type of search usually takes longer to complete. Note that for "
+"performance reasons, address completion uses \"begins-with\" for all "
+"searches against other address interfaces."
 msgstr ""
-"חיפושים עבור שמות וכתובות ניתנים להתבצע בין באמצעות מונח חיפוש "
-"\"begins-with\" או באמצעות \"contains\". סמן את אפשרות זו כדי לקיים חיפוש "
-"\"contains\"; טיפוס חיפוש זה לוקח לרוב יותר זמן להשלמה. שים לב שמשום טעמים "
-"של ביצוע, השלמת כתובת משתמשת במונח \"begins-with\" עבור כל החיפושים לנגד "
-"ממשקי כתובות אחרים."
+"חיפושים עבור שמות וכתובות ניתנים להתבצע בין באמצעות מונח חיפוש \"begins-with"
+"\" או באמצעות \"contains\". סמן את אפשרות זו כדי לקיים חיפוש \"contains\"; "
+"טיפוס חיפוש זה לוקח לרוב יותר זמן להשלמה. שים לב שמשום טעמים של ביצוע, השלמת "
+"כתובת משתמשת במונח \"begins-with\" עבור כל החיפושים לנגד ממשקי כתובות אחרים."
 
-#: src/editldap.c:700
+#: src/editldap.c:701
 msgid "Bind DN"
 msgstr "‏DN קשור"
 
-#: 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 "
@@ -2930,40 +2935,40 @@ msgstr ""
 "מוגנים. באופן אופייני שם זה מעוצב כך: \"cn=user,dc=claws-mail,dc=org\". זה "
 "נשאר לרוב ריק בעת ביצוע חיפוש."
 
-#: 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 "הסיסמה לשימוש בעת התחברות בתור משתמש \"DN קשור\"."
 
-#: 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 "הוספת שרת LDAP חדש"
 
@@ -3089,20 +3094,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 "מלא"
 
@@ -3327,7 +3332,7 @@ msgstr "ייצוא פנקס כתובות לקובץ LDIF"
 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 "ייצוא לקובץ mbox"
 
@@ -3468,8 +3473,8 @@ msgstr "כלל הינו מבוסס-חשבון, מדלג על בקשת משתמש
 #: 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 ""
 "כלל הינו מבוסס-חשבון [id=%d, name='%s'], אינו תואם חשבון נוכחי [id=%d, "
 "name='%s']\n"
@@ -3567,149 +3572,154 @@ msgid ""
 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 "אשפה"
 
-#: 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 "כעת מעבד (%s)...\n"
 
-#: src/folder.c:3256
+#: src/folder.c:3257
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "כעת מעתיק את %s אל %s...\n"
 
-#: src/folder.c:3256
+#: src/folder.c:3257
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "כעת מעביר את %s אל %s...\n"
 
-#: src/folder.c:3564
+#: src/folder.c:3563
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "כעת מעדכן מטמון עבור %s..."
 
-#: 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 "כעת מסנכרן את %s עבור שימוש לא־מקוון...\n"
 
-#: src/folder.c:4820
+#: src/folder.c:4816
 msgid "A folder name cannot begin or end with a dot."
 msgstr "שם תיקייה לא יכול להתחיל או להסתיים עם נקודה."
 
+#: src/folder.c:4820
+#, fuzzy
+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 "‏'%c' לא יכול להיכלל בשם תיקייה."
 
-#: 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 "התיקייה '%s' כבר קיימת."
 
-#: 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 "אין אפשרות ליצור את התיקייה '%s'."
 
-#: 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 "רוקן _אשפה..."
 
-#: 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 "מס׳"
 
-#: 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?"
@@ -3717,98 +3727,98 @@ 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
-#, c-format
-msgid "Scanning folder %s%c%s..."
+#: src/folderview.c:1027 src/imap.c:4639
+#, fuzzy, c-format
+msgid "Scanning folder %s/%s..."
 msgstr "כעת סורק תיקייה %s%c%s..."
 
-#: 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 "כעת סורק תיקייה %s..."
 
-#: 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 "לא היתה אפשרות לסרוק תיקייה %s\n"
 
-#: 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 "כעת סוגר תיקייה %s..."
 
-#: src/folderview.c:2219
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "כעת פותח תיקייה %s..."
 
-#: 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 "ריקון אשפה"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "מחיקת כל ההודעות באשפה?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_רוקן אשפה"
 
-#: 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"
@@ -3817,64 +3827,64 @@ msgstr ""
 "אירעו שגיאות מסוימות במהלך שליחת הודעות בהמתנה:\n"
 "%s"
 
-#: src/folderview.c:2524
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "האם אתה בטוח כי ברצונך להעתיק את תיקייה '%s' בתוך '%s'?"
 
-#: src/folderview.c:2525
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "האם אתה בטוח כי ברצונך להפוך את תיקייה '%s' לתיקיית משנה של '%s'?"
 
-#: 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 "כעת מעתיק את %s אל %s..."
 
-#: src/folderview.c:2538
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "כעת מעביר את %s אל %s..."
 
-#: 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 "תצורת עיבוד עבור תיקייה %s"
 
-#: 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 "תיקיית היעד ניתנת לשימוש רק לאחסון תיקיות משנה."
 
@@ -3898,7 +3908,7 @@ msgstr " חיפוש "
 msgid "Newsgroup name"
 msgstr "שם קבוצת דיונים"
 
-#: src/grouplistdialog.c:205
+#: src/grouplistdialog.c:205 src/prefs_send.c:171
 msgid "Messages"
 msgstr "הודעות"
 
@@ -3924,7 +3934,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 "סיים."
 
@@ -3963,8 +3973,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"‏Claws Mail הינו תוכנה חופשית המשוחרר תחת הרשיון GPL. אם ברצונך לתרום "
-"לפרויקט Claws Mail באפשרותך לעשות כן בכתובת:\n"
+"‏Claws Mail הינו תוכנה חופשית המשוחרר תחת הרשיון GPL. אם ברצונך לתרום לפרויקט "
+"Claws Mail באפשרותך לעשות כן בכתובת:\n"
 
 #: src/gtk/about.c:158
 msgid ""
@@ -4017,7 +4027,7 @@ msgstr ""
 "מקומיות: %s (מערך תווים: %s)\n"
 "מערכת הפעלה: לא ידועה"
 
-#: 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 "‪נבחרת ‫Claws Mail"
 
@@ -4134,44 +4144,44 @@ msgstr ""
 "תוכנית זו אמורה להיות מלווה בעותק של הרשיון GNU General Public License; אם "
 "לא, ראה ‭"
 
-#: src/gtk/about.c:698 src/main.c:2541
+#: src/gtk/about.c:698 src/main.c:2567
 msgid "Session statistics\n"
 msgstr "סטטיסטיקות סשן\n"
 
-#: 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 "אותחל: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2560
+#: src/gtk/about.c:718 src/main.c:2586
 msgid "Incoming traffic\n"
 msgstr "תעבורה נכנסת\n"
 
-#: 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 "הודעות אשר נתקבלו: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2569
+#: src/gtk/about.c:728 src/main.c:2595
 msgid "Outgoing traffic\n"
 msgstr "תעבורה יוצאת\n"
 
-#: 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 "הודעות חדשות/שכוונו מחדש: %d\n"
 
-#: 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 "הודעות אשר נענו: %d\n"
 
-#: 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 "הודעות אשר קודמו: %d\n"
 
-#: 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 "סך כל הודעות יוצאות: %d\n"
@@ -4214,63 +4224,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 "ארגמן"
 
@@ -4454,7 +4464,8 @@ msgid "To"
 msgstr "‎לכבוד"
 
 #: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164 src/quote_fmt.c:58
+#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
+#: src/quote_fmt.c:58
 msgid "Cc"
 msgstr "‎עותק‎"
 
@@ -4496,7 +4507,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 "‎הערות‎"
 
@@ -4614,11 +4625,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 "מצב:"
 
@@ -4687,7 +4698,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 "‎ארגון‎"
 
@@ -4926,7 +4937,8 @@ msgstr "קלט סיסמה עבור %s:"
 msgid "Input password:"
 msgstr "קלט סיסמה:"
 
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "קלט סיסמה"
 
@@ -4999,9 +5011,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
@@ -5010,10 +5022,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 "תוספים"
 
@@ -5050,14 +5062,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"
@@ -5337,7 +5349,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 "שם: "
 
@@ -5464,21 +5476,21 @@ msgstr "תעודת SSL שונתה והינה חסרת תוקף"
 msgid "SSL certificate changed"
 msgstr "תעודת SSL שונתה"
 
-#: 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 "(אין נושא)"
 
@@ -5519,176 +5531,216 @@ msgid "IMAP error on %s:"
 msgstr "שגיאת IMAP אצל %s:"
 
 #: src/imap.c:621
-msgid " authenticated\n"
+#, fuzzy
+msgid "authenticated"
 msgstr " מאומת\n"
 
 #: src/imap.c:624
-msgid " not authenticated\n"
+#, fuzzy
+msgid "not authenticated"
 msgstr " לא מאומת\n"
 
 #: src/imap.c:627
-msgid " bad state\n"
+#, fuzzy
+msgid "bad state"
 msgstr " מצב רע\n"
 
 #: src/imap.c:630
-msgid " stream error\n"
+#, fuzzy
+msgid "stream error"
 msgstr " שגיאת זרם\n"
 
 #: src/imap.c:633
 #, fuzzy
-msgid " parse error (very probably non-RFC compliance from the server)\n"
+msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "שגיאת IMAP אצל %s: שגיאת ניתוח (קרוב לוודאי אי תאימות RFC מתוך השרת)\n"
 
 #: src/imap.c:637
-msgid " connection refused\n"
+#, fuzzy
+msgid "connection refused"
 msgstr " חיבור סורב\n"
 
 #: src/imap.c:640
-msgid " memory error\n"
+#, fuzzy
+msgid "memory error"
 msgstr " שגיאת זיכרון\n"
 
 #: src/imap.c:643
-msgid " fatal error\n"
+#, fuzzy
+msgid "fatal error"
 msgstr " שגיאה פטאלית\n"
 
 #: src/imap.c:646
-msgid " protocol error (very probably non-RFC compliance from the server)\n"
+#, fuzzy
+msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr " שגיאת פרוטוקול (קרוב לוודאי אי תאימות RFC מתוך השרת)\n"
 
 #: src/imap.c:650
-msgid " connection not accepted\n"
+#, fuzzy
+msgid "connection not accepted"
 msgstr " חיבור לא קביל\n"
 
 #: src/imap.c:653
-msgid " APPEND error\n"
+#, fuzzy
+msgid "APPEND error"
 msgstr " שגיאת APPEND\n"
 
 #: src/imap.c:656
-msgid " NOOP error\n"
+#, fuzzy
+msgid "NOOP error"
 msgstr " שגיאת NOOP\n"
 
 #: src/imap.c:659
-msgid " LOGOUT error\n"
+#, fuzzy
+msgid "LOGOUT error"
 msgstr " שגיאת LOGOUT\n"
 
 #: src/imap.c:662
-msgid " CAPABILITY error\n"
+#, fuzzy
+msgid "CAPABILITY error"
 msgstr " שגיאת CAPABILITY\n"
 
 #: src/imap.c:665
-msgid " CHECK error\n"
+#, fuzzy
+msgid "CHECK error"
 msgstr " שגיאת CHECK\n"
 
 #: src/imap.c:668
-msgid " CLOSE error\n"
+#, fuzzy
+msgid "CLOSE error"
 msgstr " שגיאת CLOSE\n"
 
 #: src/imap.c:671
-msgid " EXPUNGE error\n"
+#, fuzzy
+msgid "EXPUNGE error"
 msgstr " שגיאת EXPUNGE\n"
 
 #: src/imap.c:674
-msgid " COPY error\n"
+#, fuzzy
+msgid "COPY error"
 msgstr " שגיאת COPY\n"
 
 #: src/imap.c:677
-msgid " UID COPY error\n"
+#, fuzzy
+msgid "UID COPY error"
 msgstr " שגיאת UID COPY\n"
 
 #: src/imap.c:680
-msgid " CREATE error\n"
+#, fuzzy
+msgid "CREATE error"
 msgstr " שגיאת CREATE\n"
 
 #: src/imap.c:683
-msgid " DELETE error\n"
+#, fuzzy
+msgid "DELETE error"
 msgstr " שגיאת DELETE\n"
 
 #: src/imap.c:686
-msgid " EXAMINE error\n"
+#, fuzzy
+msgid "EXAMINE error"
 msgstr " שגיאת EXAMINE\n"
 
 #: src/imap.c:689
-msgid " FETCH error\n"
+#, fuzzy
+msgid "FETCH error"
 msgstr " שגיאת FETCH\n"
 
 #: src/imap.c:692
-msgid " UID FETCH error\n"
+#, fuzzy
+msgid "UID FETCH error"
 msgstr " שגיאת UID FETCH\n"
 
 #: src/imap.c:695
-msgid " LIST error\n"
+#, fuzzy
+msgid "LIST error"
 msgstr " שגיאת LIST\n"
 
 #: src/imap.c:698
-msgid " LOGIN error\n"
+#, fuzzy
+msgid "LOGIN error"
 msgstr " שגיאת LOGIN\n"
 
 #: src/imap.c:701
-msgid " LSUB error\n"
+#, fuzzy
+msgid "LSUB error"
 msgstr " שגיאת LSUB\n"
 
 #: src/imap.c:704
-msgid " RENAME error\n"
+#, fuzzy
+msgid "RENAME error"
 msgstr " שגיאת RENAME\n"
 
 #: src/imap.c:707
-msgid " SEARCH error\n"
+#, fuzzy
+msgid "SEARCH error"
 msgstr " שגיאת SEARCH\n"
 
 #: src/imap.c:710
-msgid " UID SEARCH error\n"
+#, fuzzy
+msgid "UID SEARCH error"
 msgstr " שגיאת UID SEARCH\n"
 
 #: src/imap.c:713
-msgid " SELECT error\n"
+#, fuzzy
+msgid "SELECT error"
 msgstr " שגיאת SELECT\n"
 
 #: src/imap.c:716
-msgid " STATUS error\n"
+#, fuzzy
+msgid "STATUS error"
 msgstr " שגיאת STATUS\n"
 
 #: src/imap.c:719
-msgid " STORE error\n"
+#, fuzzy
+msgid "STORE error"
 msgstr " שגיאת STORE\n"
 
 #: src/imap.c:722
-msgid " UID STORE error\n"
+#, fuzzy
+msgid "UID STORE error"
 msgstr " שגיאת UID STORE\n"
 
 #: src/imap.c:725
-msgid " SUBSCRIBE error\n"
+#, fuzzy
+msgid "SUBSCRIBE error"
 msgstr " שגיאת SUBSCRIBE\n"
 
 #: src/imap.c:728
-msgid " UNSUBSCRIBE error\n"
+#, fuzzy
+msgid "UNSUBSCRIBE error"
 msgstr " שגיאת UNSUBSCRIBE\n"
 
 #: src/imap.c:731
-msgid " STARTTLS error\n"
+#, fuzzy
+msgid "STARTTLS error"
 msgstr " שגיאת STARTTLS\n"
 
 #: src/imap.c:734
-msgid " INVAL error\n"
+#, fuzzy
+msgid "INVAL error"
 msgstr " שגיאת INVAL\n"
 
 #: src/imap.c:737
-msgid " EXTENSION error\n"
+#, fuzzy
+msgid "EXTENSION error"
 msgstr " שגיאת EXTENSION\n"
 
 #: src/imap.c:740
-msgid " SASL error\n"
+#, fuzzy
+msgid "SASL error"
 msgstr " שגיאת SASL\n"
 
 #: src/imap.c:744
-msgid " SSL error\n"
+#, fuzzy
+msgid "SSL error"
 msgstr " שגיאת SSL\n"
 
 #: src/imap.c:748
-#, c-format
-msgid " Unknown error [%d]\n"
+#, fuzzy, c-format
+msgid "Unknown error [%d]"
 msgstr " שגיאה לא מוכרת [%d]\n"
 
-#: src/imap.c:940
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5700,7 +5752,7 @@ msgstr ""
 "התחברויות CRAM-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף CRAM-MD5 "
 "SASL הינו מותקן."
 
-#: src/imap.c:946
+#: src/imap.c:958
 msgid ""
 "\n"
 "\n"
@@ -5709,10 +5761,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"התחברויות DIGEST-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף "
-"DIGEST-MD5 SASL הינו מותקן."
+"התחברויות DIGEST-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף DIGEST-"
+"MD5 SASL הינו מותקן."
 
-#: src/imap.c:952
+#: src/imap.c:964
 msgid ""
 "\n"
 "\n"
@@ -5724,37 +5776,63 @@ msgstr ""
 "התחברויות SCRAM-SHA-1 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף SCRAM "
 "SASL הינו מותקן."
 
-#: src/imap.c:959
+#: src/imap.c:970
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"PLAIN logins only work if libetpan has been compiled with SASL support and "
+"the PLAIN SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"התחברויות CRAM-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף CRAM-MD5 "
+"SASL הינו מותקן."
+
+#: src/imap.c:976
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"LOGIN logins only work if libetpan has been compiled with SASL support and "
+"the LOGIN SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"התחברויות DIGEST-MD5 עובדות רק אם libetpan הודר עם תמיכת SASL והתוסף DIGEST-"
+"MD5 SASL הינו מותקן."
+
+#: src/imap.c:983
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "חיבור %s נכשל: התחברות סורבה.%s"
 
-#: src/imap.c:963
+#: src/imap.c:987
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "חיבור %s נכשל: התחברות סורבה.%s\n"
 
-#: src/imap.c:981
+#: src/imap.c:1005
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "התחברות אל %s נכשלה"
 
 # מחדש חיבור כעת
-#: 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 "חיבור IMAP4 אל %s התנתק. כעת מחדש חיבור...\n"
 
-#: 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 "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לגשת לשרת IMAP."
 
-#: 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"
@@ -5767,128 +5845,128 @@ msgstr ""
 "\n"
 "האם יש ברצונך להמשיך להתחבר לשרת זה? ההתקשרות לא תהא מאובטחת."
 
-#: 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 "חשבון '%s': כעת מתחבר לשרת IMAP4: ‏%s:%d..."
 
-#: src/imap.c:1195
+#: src/imap.c:1219
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "אין אפשרות לקשר לשרת IMAP4: ‏%s:%d"
 
-#: src/imap.c:1198
+#: src/imap.c:1222
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "אין אפשרות לקשר לשרת IMAP4: ‏%s:%d\n"
 
-#: src/imap.c:1231 src/imap.c:4073
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr "אין אפשרות להתחיל סשן TLS.\n"
 
-#: src/imap.c:1294
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "לא היתה אפשרות להתחבר לשרת IMAP ‏%s.\n"
 
-#: src/imap.c:1297
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "לא היתה אפשרות להתחבר לשרת IMAP ‏%s."
 
-#: 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 "אין אפשרות לקבוע דגלים של מחיקה\n"
 
-#: src/imap.c:2520 src/imap.c:5028
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "אין אפשרות להסיר באופן מוחלט\n"
 
-#: src/imap.c:2871
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "כעת מחפש עבור תיקיות לא רשומות אצל %s..."
 
-#: src/imap.c:2874
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "כעת מחפש עבור תיקיות משנה של %s..."
 
-#: src/imap.c:3192
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "אין אפשרות ליצור תיבת דואר: LIST נכשל\n"
 
-#: src/imap.c:3207
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "אין אפשרות ליצור תיבת דואר\n"
 
-#: src/imap.c:3338
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "אין אפשרות לשנות תיבת דואר: %s אל %s\n"
 
-#: src/imap.c:3451
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "אין אפשרות למחוק תיבת דואר\n"
 
-#: src/imap.c:3730
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST נכשל\n"
 
-#: 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 "אין אפשרות לבחור תיקייה: %s\n"
 
-#: src/imap.c:4070
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "שרת מצריך TLS כדי להתחבר.\n"
 
-#: src/imap.c:4080
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "אין אפשרות לרענן יכולות.\n"
 
-#: 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 "חיבור אל %s נכשל: שרת מצריך TLS, אך Claws Mail הודר בלי תמיכת TLS.\n"
 
-#: src/imap.c:4093
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "התחברויות שרת הינן מנוטרלות.\n"
 
-#: 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 "אין אפשרות לקבוע דגלים של מחיקה: %d\n"
 
-#: src/imap.c:6056
+#: src/imap.c:6089
+#, fuzzy
 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 ""
@@ -5935,7 +6013,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 "_בטל הרשמה..."
 
@@ -5956,7 +6034,7 @@ 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"
@@ -5966,26 +6044,26 @@ msgstr ""
 "(אם ברצונך ליצור תיקייה כדי ליצור תיקיות משנה\n"
 "בלבד וללא דואר, הוסף '/' לשם התיקייה)"
 
-#: 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 "הזן שם חדש עבור '%s':"
 
-#: 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."
@@ -5993,7 +6071,7 @@ msgstr ""
 "שם תיקייה לא היה ניתן לשינוי.\n"
 "שם תיקייה חדשה אינו מותר."
 
-#: 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 "
@@ -6005,45 +6083,45 @@ msgstr ""
 "\n"
 "האם אתה בטוח כי ברצונך למחוק?"
 
-#: 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 "אין אפשרות להסיר את התיקייה '%s'."
 
 # תחת
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:498
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "האם ברצונך לחפש עבור תיקיות משנה לא רשומות של '%s'?"
 
-#: 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 "בחר תיקיית משנה של %s להירשם אל: "
 
-#: 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"
@@ -6055,29 +6133,29 @@ msgstr ""
 "כאשר קיימות תיקיות חדשות, שנוצרו ונרשמו אל מתוך לקוח אחר, ניתן לעשות שימוש "
 "בפעולה \"בדוק עבור תיקיות חדשות\" בתיקיית השורש של תיבת דואר."
 
-#: src/imap_gtk.c:565
+#: src/imap_gtk.c:557
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "האם ברצונך %s את התיקייה '%s'?"
 
-#: 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 "_בטל הרשמה"
 
@@ -6262,143 +6340,143 @@ msgstr "בחירת קובץ Pine"
 msgid "Import Pine file into Address Book"
 msgstr "ייבוא קובץ Pine לתוך פנקס כתובות"
 
-#: 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 "‏Claws Mail זקוק לגישת רשת תקשורת על מנת להשיג דואר."
 
-#: src/inc.c:344
+#: src/inc.c:343
 #, c-format
 msgid "%s failed\n"
 msgstr "‏%s נכשלה\n"
 
-#: src/inc.c:417
+#: src/inc.c:416
 msgid "Retrieving new messages"
 msgstr "מאחזר כעת הודעות חדשות"
 
-#: src/inc.c:478
+#: src/inc.c:474
 #, fuzzy
 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] "סיים (הודעה %d ‏(%s) התקבלה)"
 msgstr[1] "סיים (%d הודעות (%s) התקבלו)"
 
-#: 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] "הוגמר (הודעה חדשה %d)"
 msgstr[1] "הוגמר (%d הודעות חדשות)"
 
-#: 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 "‏%s: מאחזר כעת הודעות חדשות"
 
-#: src/inc.c:832
+#: src/inc.c:825
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "חשבון '%s': כעת מתחבר לשרת POP3: ‏%s:%d..."
 
-#: src/inc.c:850
+#: src/inc.c:843
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "אין אפשרות להתחבר לשרת POP3: ‏%s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:847
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "אין אפשרות להתחבר לשרת POP3: ‏%s:%d\n"
 
-#: 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 "כעת מאחזר הודעות מתוך %s ‏(%s)..."
 
-#: src/inc.c:942
+#: src/inc.c:935
 msgid "Getting the number of new messages (STAT)..."
 msgstr "כעת משיג את המספר של הודעות חדשות (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:939
 msgid "Getting the number of new messages (LAST)..."
 msgstr "כעת משיג את המספר של הודעות חדשות (LAST)..."
 
-#: src/inc.c:950
+#: src/inc.c:943
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "כעת משיג את המספר של הודעות חדשות (UIDL)..."
 
-#: src/inc.c:954
+#: src/inc.c:947
 msgid "Getting the size of messages (LIST)..."
 msgstr "כעת משיג את הגודל הודעות (LIST)..."
 
-#: 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 "כעת מאחזר הודעה (%d / %d) ‏(%s / %s)"
 
-#: 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] "כעת מאחזר (הודעה %d ‏(%s) התקבלה)"
 msgstr[1] "כעת מאחזר (%d הודעות (%s) התקבלו)"
 
-#: src/inc.c:1158
+#: src/inc.c:1151
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "חיבור אל %s:%d נכשל."
 
-#: 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"
@@ -6408,37 +6486,37 @@ msgstr ""
 "%s"
 
 # נותר
-#: 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 "שגיאת Socket."
 
-#: src/inc.c:1188
+#: src/inc.c:1181
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "שגיאת Socket בעת התחברות אל %s:%d."
 
-#: 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 "חיבור אל %s:%d נסגר על ידי מארח מרוחק."
 
-#: 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"
@@ -6447,11 +6525,11 @@ msgstr ""
 "תיבת דואר הינה נעולה:\n"
 "%s"
 
-#: 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"
@@ -6461,7 +6539,7 @@ msgstr ""
 "%s"
 
 # הינך עשוי להשיב
-#: 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."
@@ -6469,26 +6547,26 @@ msgstr ""
 "זמן סשן פקע. ניתן אולי להשיב על ידי הגברת ערך תפוגת זמן בתוך "
 "העדפות/אחרות/שונות."
 
-#: src/inc.c:1227
+#: src/inc.c:1220
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "זמן התחברות אל %s:%d פקע."
 
-#: src/inc.c:1265
+#: src/inc.c:1258
 msgid "Incorporation cancelled\n"
 msgstr "איחוד בוטל\n"
 
-#: src/inc.c:1530
+#: src/inc.c:1523
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sאתה עובד במצב מקוון. לעקוף למשך %d דקות?"
 
-#: src/inc.c:1536
+#: src/inc.c:1529
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sאתה עובד במצב מקוון. לעקוף?"
 
-#: src/inc.c:1543
+#: src/inc.c:1536
 msgid "On_ly once"
 msgstr "_רק פעם אחת"
 
@@ -6500,7 +6578,7 @@ msgstr "‏SN מסוים"
 msgid "Nick Name"
 msgstr "שם כינוי"
 
-#: src/main.c:242
+#: src/main.c:244
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6510,7 +6588,7 @@ msgstr ""
 "אין אפשרות ליצור תיקייה."
 
 # להגר
-#: src/main.c:363
+#: src/main.c:365
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6519,7 +6597,7 @@ msgstr ""
 "תצורה עבור %s נמצאה.\n"
 "האם ברצונך למזג את תצורה זו?"
 
-#: src/main.c:365
+#: src/main.c:367
 #, c-format
 msgid ""
 "\n"
@@ -6532,11 +6610,11 @@ msgstr ""
 "ניתן להמיר כללי סינון Sylpheed עם\n"
 "תסריט אשר זמין אצל %s."
 
-#: 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 "
@@ -6545,31 +6623,31 @@ msgstr ""
 "שמירת גיבוי תתיר לך לחזור לגרסא ישנה יותר, אך זו עשויה לקחת פרק זמן מסוים אם "
 "יש לך IMAP מוטמן או נתונים של News, וייקח מקום נוסף מסוים בכונן שלך."
 
-#: 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 "‏g_thread אינו נתמך על ידי glib.\n"
 
-#: 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 "
@@ -6586,7 +6664,7 @@ msgstr[1] ""
 "התוספות הבאות כשלו מלהיטען. בדוק את תצורת התוספות למידע נוסף:\n"
 "%s"
 
-#: 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 "
@@ -6596,7 +6674,7 @@ msgstr ""
 "IMAP נכשל. השתמש באפשרות \"בנה מחדש עץ תיקייה\" בתפריט ההקשר של תיקיית הורה "
 "בתיבת הדואר כדי לתקנה."
 
-#: 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 "
@@ -6605,37 +6683,37 @@ msgstr ""
 "‏Claws Mail איתר תיבת דואר מוגדרת, אך לא יכל לטעונה. ייתכן כי זו מסופקת על "
 "ידי תוסף חיצוני מיושן. אנא התקן מחדש את התוסף ונסה שוב."
 
-#: src/main.c:1729
+#: src/main.c:1750
 msgid "Missing filename\n"
 msgstr "שם קובץ חסר\n"
 
 # filename or file?
-#: src/main.c:1736
+#: src/main.c:1757
 msgid "Cannot open filename for reading\n"
 msgstr "אין אפשרות לפתוח שם קובץ לקריאה\n"
 
-#: src/main.c:1747
+#: src/main.c:1768
 msgid "Malformed header\n"
 msgstr "תקורה פגומה\n"
 
-#: src/main.c:1754
+#: src/main.c:1775
 msgid "Duplicated 'To:' header\n"
 msgstr "תקורת 'To:' כפולה\n"
 
-#: src/main.c:1765
+#: src/main.c:1786
 msgid "Missing required 'To:' header\n"
 msgstr "תקורת 'To:' נדרשת חסרה\n"
 
-#: src/main.c:1908
+#: src/main.c:1929
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "‭שומיש: %s [תורשפא]...\n"
 
-#: src/main.c:1910
+#: src/main.c:1931
 msgid "  --compose [address]    open composition window"
 msgstr "‭  --compose [תבותכ]      הנחלה ןולח חתפ"
 
-#: src/main.c:1911
+#: src/main.c:1932
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6651,11 +6729,11 @@ msgstr ""
 "‭                         דע (To: שרדנ) שארב תורוקת :טמרופ ןכות\n"
 "‭                         ץבוק ףוס דע ראוד ףוג זא ,הרוש ףוס."
 
-#: src/main.c:1916
+#: src/main.c:1937
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "‭  --subscribe [uri]      ןתינ רשאכ ןותנ URI לא םשריה"
 
-#: src/main.c:1917
+#: src/main.c:1938
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6665,23 +6743,23 @@ msgstr ""
 "‭                         םיניוצמ םיצבק םע הנחלה ןולח חתפ\n"
 "‭                         םיחפוסמ"
 
-#: src/main.c:1920
+#: src/main.c:1941
 msgid "  --receive              receive new messages"
 msgstr "‭  --receive              תושדח תועדוה גשה"
 
-#: src/main.c:1921
+#: src/main.c:1942
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "‭  --receive-all          תונובשחה לכמ תושדח תועדוה גשה"
 
-#: src/main.c:1922
+#: src/main.c:1943
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "‭  --cancel-receiving     תועדוה תלבק לטב"
 
-#: src/main.c:1923
+#: src/main.c:1944
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "‭  --cancel-sending       תועדוה תחילש לטב"
 
-#: src/main.c:1924
+#: src/main.c:1945
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6692,15 +6770,15 @@ 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 "‭  --send                 תודמועו תיולתה תועדוהה לכ תא חלש"
 
-#: src/main.c:1932
+#: src/main.c:1953
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "‭  --status [הייקית]...   תועדוהה לכ לש ללוכה רפסמה תא גצה"
 
-#: src/main.c:1933
+#: src/main.c:1954
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6708,15 +6786,15 @@ msgstr ""
 "‭  --status-full [הייקית]...\n"
 "‭                         הייקית לכ לש סוטטסה תא גצה"
 
-#: src/main.c:1935
+#: src/main.c:1956
 msgid "  --statistics           show session statistics"
 msgstr "‭  --statistics           ןשס תוקיטסיטטס גצה"
 
-#: src/main.c:1936
+#: src/main.c:1957
 msgid "  --reset-statistics     reset session statistics"
 msgstr "‭  --reset-statistics     ןשס תוקיטסיטטס ספא"
 
-#: 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'"
@@ -6724,45 +6802,45 @@ msgstr ""
 "‭  --select הייקית[/עדה]  תנייוצמ הייקית/העדוה לא ץופק\n"
 "‭                         'folder/sub_folder' ומכ הייקית לש id איה הייקית"
 
-#: src/main.c:1939
+#: src/main.c:1960
 msgid "  --online               switch to online mode"
 msgstr "‭  --online               ןווקמ בצמל ףלחה"
 
-#: src/main.c:1940
+#: src/main.c:1961
 msgid "  --offline              switch to offline mode"
 msgstr "‭  --offline              ןווקמ אל בצמל ףלחה"
 
-#: src/main.c:1941
+#: src/main.c:1962
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "‭  --exit --quit -q       Claws Mail ךותמ אצ"
 
-#: src/main.c:1942
+#: src/main.c:1963
 msgid "  --debug                debug mode"
 msgstr "‭  --debug                גאביד בצמ"
 
-#: src/main.c:1943
+#: src/main.c:1964
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "‭  --toggle-debug         גאביד בצמ ףלחה"
 
-#: src/main.c:1944
+#: src/main.c:1965
 msgid "  --help -h              display this help and exit"
 msgstr "‭  --help -h              אצו וז הרזע תא ספדה"
 
-#: src/main.c:1945
+#: src/main.c:1966
 msgid "  --version -v           output version information and exit"
 msgstr "‭  --version -v           אצו אסריג עדימ טולפ"
 
-#: src/main.c:1946
+#: src/main.c:1967
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
 msgstr "‭  --version-full -V      אצו built-in תונוכתו אסרג עדימ טולפ"
 
-#: src/main.c:1947
+#: src/main.c:1968
 msgid "  --config-dir           output configuration directory"
 msgstr "‭  --config-dir           הרוצת תיירפס טולפ"
 
-#: src/main.c:1948
+#: src/main.c:1969
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6770,856 +6848,868 @@ msgstr ""
 "‭  --alternate-config-dir [רודמ]\n"
 "‭                         תנייוצמ הרוצת תיירפסב שמתשה"
 
-#: 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 "אפשרות לא מוכרת\n"
 
-#: src/main.c:2016
+#: src/main.c:2042
 #, c-format
 msgid "Processing (%s)..."
 msgstr "כעת מעבד (%s)..."
 
-#: 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 "‏NetworkManager: רשת תקשורת הינה מקוונות.\n"
 
-#: src/main.c:2851
+#: src/main.c:2877
 msgid "NetworkManager: network is offline.\n"
 msgstr "‏NetworkManager: רשת תקשורת אינה מקוונות.\n"
 
-#: 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 "‏MH..."
 
-#: 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 "י_בא קובץ mbox..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:528
 msgid "_Export to mbox file..."
 msgstr "יצ_א לקובץ mbox..."
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:529
 msgid "_Export selected to mbox file..."
 msgstr "יצא ה_נבחרות לקובץ mbox..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "Empty all _Trash folders"
 msgstr "רוקן כל תיקיות _אשפה"
 
-#: 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 "הודעה מסוו_גת קודמת"
 
-#: src/mainwindow.c:585 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "הודעה מסווג_ת הבאה"
 
-#: 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..."
-msgstr "תיקייה _אחרת..."
+#: src/mainwindow.c:597 src/messageview.c:253
+#, fuzzy
+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 "העבר ל_אשפה"
 
-#: 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 "העבר שרשור לאש_פה"
 
-#: 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 "צבע _תווית"
 
-#: 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 "לפי _From"
 
 # לכבוד
-#: 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 "לפי _To"
 
 # נושא
-#: 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 "לפי _Subject"
 
-#: 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 "ספור כתובות _URL..."
 
-#: 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 "תעודות _SSL"
 
-#: 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
+#, fuzzy
+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 "שורת _מצב"
 
 # Column bar
-#: 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 "צמצם מן רמה _2"
 
-#: src/mainwindow.c:825 src/messageview.c:347
+#: src/mainwindow.c:832 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "צמצם מן רמה _3"
 
-#: 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 "לפי _צבע תווית"
 
 # BUG: underline is missing
-#: 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 "יומן סינון מאופשר\n"
 
-#: src/mainwindow.c:2033 src/prefs_logging.c:394
+#: src/mainwindow.c:2043 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "יומן סינון מנוטרל\n"
 
-#: 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 "מחיקת כל ההודעות בתיקיות אשפה?"
 
-#: 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"
@@ -7629,18 +7719,18 @@ msgstr ""
 "כאשר תיבת דואר קיימת תצוין, זו\n"
 "תיסרק באופן אוטומטי."
 
-#: 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 "תיבת הדואר '%s' כבר קיימת."
 
-#: 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 "
@@ -7650,76 +7740,81 @@ 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 "ייבוא mbox נכשל."
 
-#: src/mainwindow.c:3986 src/mainwindow.c:3995
+#: src/mainwindow.c:4005 src/mainwindow.c:4014
 msgid "Export to mbox has failed."
 msgstr "ייצוא אל mbox נכשל."
 
-#: 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 "באם ברצונך לצאת מתוך Claws Mail?"
 
-#: 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] "נמחקה הודעה כפולה %d בתיקייה %d.\n"
 msgstr[1] "נמחקו %d הודעות כפולות בתיקייה %d.\n"
 
-#: 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 "‏Claws Mail נרשם בתור לקוח ברירת מחדל."
 
-#: src/mainwindow.c:5160
+#: src/mainwindow.c:5174
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr "אין אפשרות להירשם בתור לקוח ברירת מחדל: בלתי אפשרי לרשום אל registry."
 
-#: src/mainwindow.c:5318
+#: src/mainwindow.c:5188 src/setup.c:91
+#, c-format
+msgid "Scanning folder %s%c%s..."
+msgstr "כעת סורק תיקייה %s%c%s..."
+
+#: src/mainwindow.c:5332
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7800,7 +7895,7 @@ msgstr "כתיבה על קובץ mbox"
 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 "כתיבה על הכתוב"
@@ -7846,19 +7941,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 "‏Claws Mail - תצוגת הודעה"
 
-#: 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"
@@ -7873,11 +7968,11 @@ msgstr ""
 "נתיב חזרה: %s\n"
 "מוטב שלא לשלוח אישור מסירה."
 
-#: 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"
@@ -7889,64 +7984,64 @@ msgstr ""
 "מוּענה אליך באופן רשמי.\n"
 "מוטב שלא לשלוח אישור מסירה."
 
-#: src/messageview.c:1323
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "כעת מושך הודעה (%s)..."
 
-#: src/messageview.c:1359 src/procmime.c:1007
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "לא היתה אפשרות לפענח צופן: %s"
 
-#: 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 "הודעה לא תואמת תקן MIME. זו עשויה להצטייר באופן מוטעה."
 
-#: 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 "לא היתה אפשרות לשמור את הקובץ '%s'."
 
-#: src/messageview.c:1910
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "הצג %s נותרים."
 
-#: 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 "
 "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."
@@ -7954,7 +8049,7 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי,\n"
 "ונמחקה מתוך השרת."
 
-#: src/messageview.c:2002
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7963,15 +8058,15 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי;\n"
 "זו כעת %s."
 
-#: 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"
@@ -7980,12 +8075,12 @@ msgstr ""
 "הודעה זו אוחזרה באופן חלקי;\n"
 "זו כעת %s ותורד בעתיד."
 
-#: 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"
@@ -7995,12 +8090,12 @@ msgstr ""
 "זו כעת %s ותימחק בעתיד."
 
 # התראת קבלת מסירה
-#: 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"
@@ -8010,19 +8105,19 @@ msgstr ""
 "הכתובת אשר אליה נשלחה הודעה זו מצויה בשימוש על ידי כמה מחשבונותיך.\n"
 "אנא בחר באיזה חשבון ברצונך להשתמש לצורך שליחת התראת אישור מסירה:"
 
-#: 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"
@@ -8030,7 +8125,7 @@ msgstr ""
 "\n"
 "  אין הודעות בתיקייה זו"
 
-#: src/messageview.c:2960
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8038,7 +8133,7 @@ msgstr ""
 "\n"
 "  הודעה נמחקה"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8046,16 +8141,16 @@ msgstr ""
 "\n"
 "  הודעה נמחקה או הועברה לתיקייה אחרת"
 
-#: 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 "אירעה שגיאה במהלך למידה.\n"
 
-#: 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 "כעת מוחק הודעות..."
 
@@ -8063,7 +8158,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"
@@ -8075,7 +8170,7 @@ msgstr ""
 "%s."
 
 # לא יימחקו
-#: 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"
@@ -8084,7 +8179,7 @@ msgstr ""
 "באמת להסיר את תיבת הדואר '%s'?\n"
 "(ההודעות אינן נמחקות מתוך הכונן)"
 
-#: 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 "הסרת תיבת דואר"
 
@@ -8156,7 +8251,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 "לא היתה אפשרות לשמור אזור של הודעה מרובת חלקים: %s"
@@ -8226,7 +8321,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 "גודל:"
 
@@ -8236,82 +8331,82 @@ 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 "חיבור NNTP אל %s:%d התנתק.\n"
 
-#: src/news.c:335
+#: src/news.c:336
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "חשבון '%s': כעת מתחבר לשרת NNTP: ‏%s:%d...\n"
 
-#: src/news.c:356
+#: src/news.c:357
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "שגיאה בהתחברות אל %s:%d...\n"
 
-#: 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 "‏Libetpan לא תומכת return code 480 ונכון לעכשיו אנחנו בוחרים להמשיך\n"
 
-#: src/news.c:446
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "קורא מצב נכשל, ממשיך בכל זאת\n"
 
-#: src/news.c:450
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "שגיאה ביצירת סשן עם %s:%d\n"
 
-#: src/news.c:465
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "שגיאה באימות אל %s:%d...\n"
 
-#: src/news.c:490
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לגשת לשרת חדשות."
 
-#: src/news.c:861
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "לא היתה אפשרות לבחור קבוצה: %s\n"
 
-#: 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 "לא היתה אפשרות להגדיר קבוצה: %s\n"
 
 # פריטים
-#: src/news.c:1059
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "טווח מאמרים שגוי: %d - %d\n"
 
-#: 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 "לא היתה אפשרות להשיג xhdr\n"
 
-#: src/news.c:1213
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "כעת משיג xover ‏%d - %d בתוך %s...\n"
 
-#: src/news.c:1228
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "לא היתה אפשרות להשיג xover\n"
 
-#: src/news.c:1243
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "שורת xover שגויה\n"
 
-#: src/news.c:1445
+#: src/news.c:1449
+#, fuzzy
 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 ""
@@ -8328,19 +8423,64 @@ msgstr "_הירשם לקבוצת דיון..."
 msgid "_Unsubscribe newsgroup"
 msgstr "_בטל הרשמת קבוצת דיון"
 
-#: src/news_gtk.c:265
+#: src/news_gtk.c:250
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "באמת לבטל הרשמה לקבוצת דיונים '%s'?"
 
-#: 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
+#, fuzzy
+msgid "Input master passphrase"
+msgstr "תפוס פלט במהלך הזנת מימרת־סיסמה"
+
+#: src/password.c:141
+#, fuzzy
+msgid "Incorrect master passphrase."
+msgstr "אזור שגוי"
+
+#: src/password_gtk.c:67
+#, fuzzy
+msgid "New passphrases do not match, try again."
+msgstr "מימרות סיסמה לא תאמו.\n"
+
+#: 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
+#, fuzzy
+msgid "Old passphrase:"
+msgstr "מימרת־סיסמה רעה.\n"
+
+#: src/password_gtk.c:191
+#, fuzzy
+msgid "New passphrase:"
+msgstr "מימרת סיסמה"
+
+#: src/password_gtk.c:202
+#, fuzzy
+msgid "Confirm passphrase:"
+msgstr "מימרת־סיסמה רעה.\n"
+
 #: src/plugins/acpi_notifier/acpi_notifier.c:51
 msgid "Acpi Notifier"
 msgstr "מתריע Acpi"
@@ -8752,7 +8892,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 "_בחר"
 
@@ -8949,12 +9089,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 "תצריף"
 
@@ -9118,8 +9258,8 @@ msgid ""
 msgstr ""
 "התוסף Bogofilter לא יכל לסנן הודעה. הגורם המסתבר של השגיאה הוא שזה לא למד "
 "מאף דואר.\n"
-"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור "
-"לגיטימית\" בכדי לאמן את Bogofilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
+"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור לגיטימית"
+"\" בכדי לאמן את Bogofilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
 
 #: src/plugins/bogofilter/bogofilter.c:619
 #, c-format
@@ -9134,7 +9274,7 @@ msgid "Bogofilter: learning from message..."
 msgstr "‏Bogofilter: כעת לומד מתוך הודעה..."
 
 #: 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 "למידה מכשלה; `%s` הוחזרה עם מצב %d."
@@ -9181,12 +9321,12 @@ msgstr ""
 "\n"
 "ניתן למצוא אפשרויות בתוך /תצורה/העדפות/תוספים/Bogofilter"
 
-#: 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 "למידת ספאם"
@@ -9211,7 +9351,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 "ק״ב"
 
@@ -9320,16 +9460,16 @@ msgid "Bsfilter"
 msgstr "‏Bsfilter"
 
 # What are bodies?
-#: src/plugins/bsfilter/bsfilter.c:299
+#: src/plugins/bsfilter/bsfilter.c:300
 msgid "Bsfilter: fetching body..."
 msgstr "‏Bsfilter: כעת מושך גופים..."
 
-#: src/plugins/bsfilter/bsfilter.c:308
+#: src/plugins/bsfilter/bsfilter.c:309
 msgid "Bsfilter: filtering message..."
 msgstr "‏Bsfilter: כעת מסנן הודעות..."
 
 # משום דואר
-#: 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"
@@ -9338,23 +9478,23 @@ msgid ""
 msgstr ""
 "התוסף Bsfilter לא יכל לסנן הודעה. הגורם המסתבר של השגיאה הוא שזה לא למד מאף "
 "דואר.\n"
-"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור "
-"לגיטימית\" בכדי לאמן את Bsfilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
+"עליך לעשות שימוש בפעולות \"/סמן/סמן בתור ספאם\" וגם \"/סמן/סמן בתור לגיטימית"
+"\" בכדי לאמן את Bsfilter עם כמה מאות הודעות ספאם והודעות לגיטימיות."
 
-#: 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 "התוסף Bsfilter לא יכל לסנן הודעה. הפקודה `%s` לא היתה ניתנת להרצה."
 
-#: src/plugins/bsfilter/bsfilter.c:501
+#: src/plugins/bsfilter/bsfilter.c:502
 msgid "Bsfilter: learning from message..."
 msgstr "‏Bsfilter: כעת לומד מתוך הודעה..."
 
 # בטרם Bogofilter יוכל
 # התווית כמה מאות
-#: 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 "
@@ -9776,7 +9916,7 @@ msgstr "‏CSS בקובץ זה יוחל לכל חלקי 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: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 "   _עיון   "
@@ -9785,104 +9925,104 @@ 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 "אפשר Javascript"
 
-#: 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 "אפשר Java"
 
-#: 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 "אירעה שגיאה: %d\n"
 
 # הזנה
-#: 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 "‏%s הינו ערוץ פגום או שאינו נתמך"
 
-#: 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 "‏Fancy צופה HTML"
 
-#: 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"
-"By default all remote content is blocked. Options can be found in "
-"/Configuration/Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in /"
+"Configuration/Preferences/Plugins/Fancy"
 msgstr ""
 "תוסף זה מצייר דואר HTML באמצעות הספרייה WebKit %d.%d.%d library.\n"
-"באופן רגיל כל תוכן מרוחק הינו חסום. ניתן למצוא אפשרויות בתוך "
-"/תצורה/העדפות/תוספים/Fancy"
+"באופן רגיל כל תוכן מרוחק הינו חסום. ניתן למצוא אפשרויות "
+"בתוך /תצורה/העדפות/תוספים/Fancy"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:200
@@ -9965,11 +10105,11 @@ msgid ""
 msgstr ""
 "מוסיף את התקורה X-FETCH-TIME עם התאריך ושעה של אחזור הודעה בפורמט RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:126
+#: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid "GData plugin: Authorization required"
 msgstr "תוסף GData: נדרשת הרשאה"
 
-#: 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"
@@ -9986,30 +10126,30 @@ msgstr ""
 "תקבל קוד הרשאה. הזן את הקוד בשדה מטה כדי להעניק עבור Claws Mail גישה לרשימת "
 "אנשי קשר Google שלך."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:143
+#: src/plugins/gdata/cm_gdata_contacts.c:144
 msgid "Step 1:"
 msgstr "צעד 1:"
 
-#: 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 "לחץ כאן כדי לפתוח עמוד אימות Google בתוך דפדפן"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:153
+#: src/plugins/gdata/cm_gdata_contacts.c:154
 msgid "Step 2:"
 msgstr "צעד 2:"
 
-#: 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 "תוסף GData: שגיאה בתחקור עבור אנשי קשר: %s\n"
 
 # improve
 #. 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"
@@ -10017,99 +10157,99 @@ msgstr[0] "הוסף %d של"
 msgstr[1] "הוספו %d של"
 
 #. 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] "איש קשר 1 למטמון"
 msgstr[1] "%d אנשי קשר למטמון"
 
-#: 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 "תוסף GData: מתחיל כעת שאילתת איש קשר async\n"
 
-#: 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 "תוסף GData: שגיאה בתחקור עבור קבוצות: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:411
+#: src/plugins/gdata/cm_gdata_contacts.c:412
 msgid "GData plugin: Groups received\n"
 msgstr "תוסף GData: קבוצות התקבלו\n"
 
-#: 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 "תוסף GData: מתחיל כעת שאילתת קבוצות async\n"
 
-#: 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 "תוסף GData: שגיאת הרשאה: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:450
+#: src/plugins/gdata/cm_gdata_contacts.c:451
 msgid "GData plugin: Authorization successful\n"
 msgstr "תוסף GData: הרשאה צלחה\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:460
+#: src/plugins/gdata/cm_gdata_contacts.c:461
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "תוסף GData: כעת מתחיל הרשאה הדדית\n"
 
-#: 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 "תוסף GData: התקבל קוד הרשאה, כעת מבקש אישור\n"
 
-#: 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 "תוסף GData: שגיאה רענון הרשאה: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:503
+#: src/plugins/gdata/cm_gdata_contacts.c:504
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "תוסף GData: רענון הרשאה צלח\n"
 
-#: 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 "תוסף GData: כעת מנסה לרענן הרשאה\n"
 
-#: 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 "‏GData"
 
-#: 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 "כשל ברישום hook השלמת כתובת בתוסף GData"
 
-#: 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 "כשל ברישום hook מתג לא־מקוון בתוסף GData"
 
-#: 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"
@@ -10128,7 +10268,7 @@ msgstr ""
 "משוב לכבוד <berndth at gmx.de> מקודם בברכה."
 
 # אינטגרציית GeoLocation
-#: src/plugins/gdata/gdata_plugin.c:187
+#: src/plugins/gdata/gdata_plugin.c:196
 msgid "GData integration"
 msgstr "שילוב GData"
 
@@ -10256,8 +10396,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 "שעות"
 
@@ -10347,11 +10487,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 "שניות"
 
@@ -10396,68 +10531,68 @@ msgstr ""
 "תיסרק באופן אוטומטי."
 
 #: src/plugins/mailmbox/plugin_gtk.c:330
-#, c-format
+#, fuzzy, 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 ""
 "כל תיקייה וכל הודעה תחת '%s' תימחק.\n"
 "האם אתה בטוח כי ברצונך למחוק?"
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:435
 msgid "No Sieve auth method available\n"
 msgstr "אין שיטת אימות Sieve זמינה\n"
 
-#: src/plugins/managesieve/managesieve.c:443
+#: src/plugins/managesieve/managesieve.c:439
 msgid "Selected Sieve auth method not available\n"
 msgstr "שיטת אימות Sieve נבחרת לא זמינה\n"
 
-#: 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 "מנותק: %s"
 
-#: 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 "הודעה שלא טופלה בסשן Sieve: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:735
+#: src/plugins/managesieve/managesieve.c:731
 msgid "TLS failed"
 msgstr "‏TLS נכשל"
 
-#: 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 "אירעה שגיאה בסשן SIEVE\n"
 
-#: src/plugins/managesieve/managesieve.c:869
+#: src/plugins/managesieve/managesieve.c:865
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "אירעה שגיאה בסשן Sieve. מידע: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:878
+#: src/plugins/managesieve/managesieve.c:874
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "הודעה שלא טופלה בסשן Sieve: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1135
+#: src/plugins/managesieve/managesieve.c:1131
 msgid "Sieve: retrying auth\n"
 msgstr "‏Sieve: כעת מנסה auth\n"
 
-#: 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 "_סנן"
 
@@ -10514,7 +10649,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - מסנן Sieve %s"
 
 #: 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 "כעת טוען..."
 
@@ -10582,94 +10717,94 @@ msgstr "נהל מסנני Sieve..."
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr "נהל מסנני sieve בשרת באמצעות פרוטוקול ManageSieve."
 
-#: src/plugins/managesieve/sieve_prefs.c:146
+#: src/plugins/managesieve/sieve_prefs.c:149
 msgid "Enable Sieve"
 msgstr "אפשר Sieve"
 
-#: 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 "אין TLS"
 
-#: src/plugins/managesieve/sieve_prefs.c:193
+#: src/plugins/managesieve/sieve_prefs.c:196
 msgid "Use TLS when available"
 msgstr "השתמש בהצפנת TLS כאשר זמינה"
 
-#: src/plugins/managesieve/sieve_prefs.c:195
+#: src/plugins/managesieve/sieve_prefs.c:198
 msgid "Require TLS"
 msgstr "דרוש TLS"
 
-#: 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 "אסור לשרת Sieve להכיל רווחים."
 
-#: src/plugins/managesieve/sieve_prefs.c:385
+#: src/plugins/managesieve/sieve_prefs.c:397
 msgid "Sieve server is not entered."
 msgstr "שרת Sieve אינו מוזן."
 
-#: src/plugins/managesieve/sieve_prefs.c:413
+#: src/plugins/managesieve/sieve_prefs.c:425
 #, fuzzy
 msgid "Sieve"
 msgstr "Sieve"
@@ -10808,7 +10943,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 "הודעת לוח שנה חדשה הגיעה"
 
@@ -10817,7 +10952,7 @@ msgid "New RSS feed article"
 msgstr "מאמר ערוץ RSS חדש"
 
 #: 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 "מאמר חדש בתוך ערוץ RSS הגיעה"
 
@@ -10830,7 +10965,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 "הצג חלון ראשי"
 
@@ -10855,7 +10990,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"
@@ -10893,7 +11028,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 "פקודה"
 
@@ -10954,12 +11089,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 "תמיד"
@@ -10988,8 +11123,7 @@ msgstr "רוחב כרזה"
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr "הגבל גודל כרזה, השתמש בערך 0 לרוחב מסך"
 
-#: 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 "פיקסל(ים)"
 
@@ -11056,6 +11190,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 "הפוך תיבה מוקפצת לדביקה"
@@ -11167,74 +11309,79 @@ msgstr "<alt>N"
 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
+#, fuzzy
+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 "_צא מתוך Claws Mail"
 
-#: 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 "חדשות %d, לא נקראו: %d, סך הכל: %d"
 
-#: 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 "פריט חדש בתוך ערוץ RSS"
 
-#: 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] "הודעת דואר חדשה %d הגיעה"
 msgstr[1] "%d הודעות דואר חדשות הגיעו"
 
-#: 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] "פרסום חדשות חדש %d הגיע"
 msgstr[1] "%d פרסומי חדשות חדשות הגיעו"
 
-#: 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"
@@ -11278,88 +11425,88 @@ msgstr "מיועל:"
 msgid "PDF properties"
 msgstr "מאפייני PDF"
 
-#: 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 "%s מסמך"
 
 # typo: out of
-#: src/plugins/pdf_viewer/poppler_viewer.c:1351
+#: src/plugins/pdf_viewer/poppler_viewer.c:1348
 #, c-format
 msgid "of %d"
 msgstr "מתוך %d"
 
-#: 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 "שרטוט PDF נכשל משום סיבה לא ידועה."
 
-#: 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 "
@@ -11373,13 +11520,13 @@ msgstr ""
 "כל משוב יתקבל בברכה: iwkse at claws-mail.org"
 
 # קורא
-#: 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 "מציג PDF"
 
-#: 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 "
@@ -11402,40 +11549,40 @@ msgstr "ערוך כללי סינון Perl‏ (ext)..."
 msgid "Failed to register PGP address autocompletion hook"
 msgstr "כשל ברישום hook השלמה אוטומטית של כתובת PGP"
 
-#: 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 "מימרות סיסמה לא תאמו.\n"
 
-#: 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 "מימרת־סיסמה רעה.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:121
+#: src/plugins/pgpcore/pgp_viewer.c:173
 msgid "Key import"
 msgstr "ייבוא מפתח"
 
 # טבעת מפתחות key-ring
-#: 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?"
@@ -11443,7 +11590,7 @@ msgstr ""
 "מפתח זה אינו מצוי בתוך מחזיק המפתחות שלך. האם ברצונך מן Claws Mail לנסות "
 "לייבא אותו מתוך שרת מפתחות?"
 
-#: 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 "
@@ -11451,15 +11598,15 @@ msgstr ""
 "\n"
 "  מזהה מפתח "
 
-#: 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 "   מפתח זה אינו מצוי בתוך מחזיק המפתחות שלך.\n"
 
-#: 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 "
@@ -11467,7 +11614,7 @@ msgstr ""
 "בעת תפעול מקוון,\n"
 "   או "
 
-#: src/plugins/pgpcore/pgp_viewer.c:136
+#: src/plugins/pgpcore/pgp_viewer.c:188
 msgid ""
 "with the following command: \n"
 "\n"
@@ -11477,7 +11624,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:143
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid ""
 "\n"
 "  Importing key ID "
@@ -11485,19 +11632,19 @@ msgstr ""
 "\n"
 "  ייבוא מזהה מפתח "
 
-#: 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 "   מפתח זה יובא למחזיק המפתחות שלך.\n"
 
-#: 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 "   מפתח זה לא היה ניתן לייבוא למחזיק המפתחות שלך.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:189
+#: src/plugins/pgpcore/pgp_viewer.c:271
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   שרתי מפתחות הינם איטיים מעת לעת.\n"
 
-#: 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"
@@ -11507,11 +11654,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:195
-msgid "   Key import isn't implemented in Windows.\n"
-msgstr "   ייבוא מפתח אינו מיושם תחת Windows.\n"
-
-#: src/plugins/pgpcore/pgp_viewer.c:204
+#: src/plugins/pgpcore/pgp_viewer.c:282
 msgid "   This key is in your keyring.\n"
 msgstr "   מפתח זה מצוי בתוך מחזיק המפתחות שלך.\n"
 
@@ -11527,8 +11670,8 @@ msgid ""
 "This plugin handles PGP core operations and provides address autocompletion "
 "from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
 "\n"
-"Options can be found in /Configuration/Preferences/Plugins/GPG and "
-"/Configuration/[Account Preferences]/Plugins/GPG\n"
+"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
+"Configuration/[Account Preferences]/Plugins/GPG\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
@@ -11573,10 +11716,11 @@ msgstr "פוקעת לאחר"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "הגדרה אל '0' תאחסן את המימרת סיסמה לכל הסשן"
 
-#: 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)"
-msgstr "דקה(ות)"
+#: 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
@@ -11601,96 +11745,96 @@ msgstr "אם נשאר ריק, המיקום של קובץ נתון ליישום G
 msgid "Select GnuPG executable"
 msgstr "בחר קובץ נתון ליישום GnuPG"
 
-#: 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 "השתמש במפתח GnuPG שגרתי"
 
-#: 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 "GPG"
 
-#: 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 "אין תיאום מדויק עבור '%s'; אנא בחר את המפתח."
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:97
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "כעת אוסף מידע עבור '%s' ... %c"
 
-#: 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 "הצפן אל %s ‏<%s>"
 
-#: 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"
@@ -11709,183 +11853,178 @@ msgstr ""
 "\n"
 "האם הינך בוטח מספיק במפתח זה כדי להשתמש בו למרות זאת?"
 
-#: 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 "החתימה לא ניתנת לבדיקה - %s"
 
-#: 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 "‏PGP Core: אין אפשרות להשיג מפתח - אין סוכן gpg-agent שמורץ כעת."
 
-#: src/plugins/pgpcore/sgpgme.c:229
-#, c-format
-msgid "The signature can't be checked - %s."
-msgstr "החתימה לא ניתנת לבדיקה - %s."
-
-#: src/plugins/pgpcore/sgpgme.c:241
+#: src/plugins/pgpcore/sgpgme.c:269
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "חתימה טובה מאת \"%s\" [סוםית]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:272
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "חתימה טובה מאת \"%s\" [מלאה]"
 
-#: src/plugins/pgpcore/sgpgme.c:247
+#: src/plugins/pgpcore/sgpgme.c:275
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "חתימה טובה מאת \"%s\" [שולית]"
 
-#: src/plugins/pgpcore/sgpgme.c:253
+#: src/plugins/pgpcore/sgpgme.c:282
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "חתימה טובה מאת \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:258
+#: 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 "מפתח 0x%s לא זמין כדי לאמת את חתימה זו"
+
+#: src/plugins/pgpcore/sgpgme.c:292
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "חתימה פקועה מאת \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:261
+#: src/plugins/pgpcore/sgpgme.c:295
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "חתימה טובה מאת %s, אך המפתח פקע"
 
-#: src/plugins/pgpcore/sgpgme.c:264
+#: src/plugins/pgpcore/sgpgme.c:298
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "חתימה טובה מאת %s, אך המפתח נשלל"
 
-#: src/plugins/pgpcore/sgpgme.c:267
+#: src/plugins/pgpcore/sgpgme.c:301
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "חתימה רעה מאת \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:271
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "מפתח 0x%s לא זמין כדי לאמת את חתימה זו"
-
-#: src/plugins/pgpcore/sgpgme.c:276
+#: src/plugins/pgpcore/sgpgme.c:310
 msgid "The signature has not been checked"
 msgstr "החתימה לא נבדקה"
 
-#: src/plugins/pgpcore/sgpgme.c:295
+#: src/plugins/pgpcore/sgpgme.c:329
 msgid "Error checking signature: no status\n"
 msgstr "שגיאה בבדיקת חתימה: אין מצב\n"
 
-#: src/plugins/pgpcore/sgpgme.c:313
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "שגיאה בבדיקת חתימה: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:331
+#: src/plugins/pgpcore/sgpgme.c:365
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "חתימה נוצרה ביום %s באמצעות %s מזהה מפתח %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:337
+#: src/plugins/pgpcore/sgpgme.c:371
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "חתימה טובה מאת מזהה משתמש (uid) ‏\"%s\" (תקפות: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:342
+#: src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "מפתח מזהה משתמש (uid) פקוע \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:381
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "חתימה פקועה מאת מזהה משתמש (uid) ‏\"%s\" (תקפות: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:352
+#: src/plugins/pgpcore/sgpgme.c:386
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "מפתח מזהה משתמש (uid) פסול \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:357
+#: src/plugins/pgpcore/sgpgme.c:391
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "חתימה רעה מאת \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:370
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "‏uid ‏\"%s\" (תקפות: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:372
+#: src/plugins/pgpcore/sgpgme.c:406
 msgid "Revoked"
 msgstr "פסולה"
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:411
 #, fuzzy, c-format
 msgid "Owner Trust: %s\n"
 msgstr "נאמנות בעלים: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:378
+#: src/plugins/pgpcore/sgpgme.c:412
 msgid "No key!"
 msgstr "אין מפתח!"
 
-#: src/plugins/pgpcore/sgpgme.c:380
+#: src/plugins/pgpcore/sgpgme.c:414
 msgid "Primary key fingerprint:"
 msgstr "טביעת אצבע של מפתח עיקרי:"
 
-#: src/plugins/pgpcore/sgpgme.c:398
+#: src/plugins/pgpcore/sgpgme.c:432
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "אזהרה: כתובת חותם \"%s\" לא תואמת רשומת DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:404
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "כתובת חותם מאומת הינה \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:438
+#: src/plugins/pgpcore/sgpgme.c:472
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "לא היתה אפשרות לקבל מידע מתוך הודעה, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:454
+#: src/plugins/pgpcore/sgpgme.c:488
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "לא היתה אפשרות לאתחל נתונים, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:609
+#: src/plugins/pgpcore/sgpgme.c:643
 msgid "Secret key specification is ambiguous"
 msgstr "מפרט מפתח סודי הינו מעורפל"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:653
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "מפתח סודי לא נמצא (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:632
+#: src/plugins/pgpcore/sgpgme.c:666
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "שגיאה בהגדרת מפתח סודי: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:721
+#: src/plugins/pgpcore/sgpgme.c:759
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "פרוטוקול Gpgme ‏'%s' אינו שמיש: מנוע '%s' אינו מותקן כיאות."
 
-#: src/plugins/pgpcore/sgpgme.c:727
+#: src/plugins/pgpcore/sgpgme.c:765
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11894,12 +12033,12 @@ msgstr ""
 "פרוטוקול Gpgme ‏'%s' אינו שמיש: מנוע '%s' גרסא %s אכן מותקן, אולם גרסא %s "
 "נדרשת.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:735
+#: src/plugins/pgpcore/sgpgme.c:773
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "פרוטוקול Gpgme ‏'%s' אינו שמיש (בעיה לא מוכרת)"
 
-#: src/plugins/pgpcore/sgpgme.c:751
+#: src/plugins/pgpcore/sgpgme.c:789
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11907,7 +12046,7 @@ msgstr ""
 "‏GnuPG אינו מותקן כיאות, או שזה צריך שדרוג.\n"
 "תמיכת OpenPGP מנוטרלת."
 
-#: src/plugins/pgpcore/sgpgme.c:785
+#: 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"
@@ -11915,11 +12054,11 @@ msgstr ""
 "עליך לשמור מידע חשבון בעזרת \"אישור\" לפני שתעמוד לרשותך אפשרות להלחין "
 "מפתח.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:790
+#: src/plugins/pgpcore/sgpgme.c:871
 msgid "No PGP key found"
 msgstr "לא נמצא מפתח PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:791
+#: 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"
@@ -11929,12 +12068,12 @@ msgstr ""
 "דואר או לקבל הודעות דואר מוצפנות.\n"
 "האם ברצונך ליצור כעת צמד מפתחות חדש?"
 
-#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
+#: src/plugins/pgpcore/sgpgme.c:961 src/plugins/pgpcore/sgpgme.c:983
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "לא היתה אפשרות לחולל צמד מפתחות חדש: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:868
+#: src/plugins/pgpcore/sgpgme.c:971
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -11942,11 +12081,11 @@ msgstr ""
 "כעת מחולל את צמד המפתחות החדש שלך... אנא הזז את העכבר סביב כדי לסייע לחולל "
 "אנטרופיה..."
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:989
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "לא היתה אפשרות לחולל צמד מפתחות חדש: שגיאה לא מוכרת"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:993
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11959,22 +12098,18 @@ msgstr ""
 "\n"
 "האם ברצונך לייצאו לשרת מפתחות?"
 
-#: src/plugins/pgpcore/sgpgme.c:891
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid "Key generated"
 msgstr "מפתח התחולל"
 
-#: src/plugins/pgpcore/sgpgme.c:930
+#: src/plugins/pgpcore/sgpgme.c:1073
 msgid "Key exported."
 msgstr "מפתח יוצא."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:1075
 msgid "Couldn't export key."
 msgstr "לא היתה אפשרות לייצא מפתח."
 
-#: src/plugins/pgpcore/sgpgme.c:936
-msgid "Key export isn't implemented in Windows."
-msgstr "ייצוא מפתח אינו מיושם תחת Windows."
-
 #: src/plugins/pgpinline/pgpinline.c:155
 msgid "Incorrect part"
 msgstr "אזור שגוי"
@@ -11995,7 +12130,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 "לא היתה אפשרות לאתחל הקשר GPG, ‏%s"
@@ -12130,11 +12265,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 "לא היתה אפשרות לנתח חלקי קובץ מפוענח."
 
@@ -12149,8 +12284,8 @@ msgstr "חתימה דיגיטאלית OpenPGP"
 
 #: src/plugins/pgpmime/pgpmime.c:618
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the "
-"PGP/Mime system."
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
 msgstr ""
 "לצומת לבך: תקורות של דוא״ל, כגון נושא, אינן מוצפנות על ידי המערכת PGP/Mime."
 
@@ -12186,7 +12321,8 @@ msgstr ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/python/python_plugin.c:358 src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "תסריטי Python"
 
@@ -12195,17 +12331,18 @@ msgid "Show Python console..."
 msgstr "הצג מסוף Python..."
 
 #: 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 "   עיין   "
 
-#: src/plugins/python/python_plugin.c:651 src/plugins/python/python_plugin.c:735
+#: src/plugins/python/python_plugin.c:651
+#: src/plugins/python/python_plugin.c:735
 msgid "Python"
 msgstr "Python"
 
@@ -12224,8 +12361,8 @@ msgid ""
 "put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
-"You can provide scripts working on the main window by placing files into "
-"~/.claws-mail/python-scripts/main.\n"
+"You can provide scripts working on the main window by placing files into ~/."
+"claws-mail/python-scripts/main.\n"
 "\n"
 "You can also provide scripts working on an open compose window by placing "
 "files into ~/.claws-mail/python-scripts/compose.\n"
@@ -12346,26 +12483,26 @@ msgstr "הזן כתובת URL של ערוץ החדשות אליו ברצונך 
 msgid "'%c' can't be used in folder name."
 msgstr "‏'%c' לא יכול להיכלל בשם תיקייה."
 
-#: 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] "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לעדכן את הערוץ."
 msgstr[1] "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לעדכן את הערוצים."
 
-#: 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 "באמת להסיר את עץ התיקייה '%s'?\n"
 
-#: 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 "בחירת קובץ OPML"
 
-#: 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 "לא היתה אפשרות ליצור תיקייה לערוץ חדש '%s'."
@@ -12410,104 +12547,106 @@ msgstr "‏RSSyl: אין אפשרות לעבד ערוץ אצל '%s'\n"
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "‏RSSyl: יישום כעצ יוצא, לא היתה אפשרות לסיים עדכון ערוץ בכתובת '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:273
+#: src/plugins/rssyl/rssyl_feed_props.c:270
 msgid "HTTP Basic authentication"
 msgstr "אימות HTTP Basic"
 
-#: 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 "אמת תוקף תעודת SSL"
 
-#: 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 "‏URL מקור"
 
-#: 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 "הגדר אל 1- כדי למשוך את כל התגובות"
 
-#: 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 "הגדר אל 0 כדי לנטרל רענון אוטומטי עבוד ערוץ זה"
 
-#: 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 "הגדרת מאפייני ערוץ"
 
@@ -12560,7 +12699,7 @@ msgstr ""
 "יצירה של עץ תיקייה נכשלה.\n"
 "ייתכן כי חלק מהקבצים כבר קיימים, או שאין לך את ההרשאות לכתוב שם?"
 
-#: src/plugins/rssyl/rssyl.h:17
+#: src/plugins/rssyl/rssyl.h:20
 msgid "My Feeds"
 msgstr "הערוצים שלי"
 
@@ -12620,17 +12759,17 @@ msgid "Updating comments for '%s'..."
 msgstr "כעת מעדכן תגובות עבור '%s'..."
 
 #: 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 "401 (נדרשת הרשאה)"
 
 #: 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 "403 (לא מורשה)"
 
 #: 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 "404 (לא נמצא)"
 
@@ -12667,12 +12806,12 @@ msgstr "ערוץ ללא כותרת"
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "‏RSSyl: ערוץ פגום בספק בלי כותרת בכתובת %s.\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:228
+#: src/plugins/rssyl/rssyl_update_feed.c:231
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "כעת מעדכן ערוץ '%s'..."
 
-#: 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"
@@ -12685,7 +12824,7 @@ msgstr ""
 "\n"
 "אנא צור קשר עם המפתחים, זה לא אמור להתרחש."
 
-#: 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 "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לעדכן את ערוצים שלך."
 
@@ -12698,7 +12837,7 @@ msgstr ""
 "פלט debug מצורף.\n"
 
 #: 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 "‏S/MIME"
 
@@ -12736,45 +12875,45 @@ msgstr ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:423
+#: src/plugins/smime/smime.c:421
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "לא היתה אפשרות להגדיר פרוטוקול GPG, ‏%s"
 
-#: 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."
+"Please note that email headers, like Subject, are not encrypted by the S/"
+"MIME system."
 msgstr ""
 "לצומת לבך: תקורות של דוא״ל, כגון נושא, אינן מוצפנות על ידי המערכת S/MIME."
 
-#: src/plugins/spam_report/spam_report.c: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 "‏SpamReport"
 
-#: 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"
@@ -12790,19 +12929,19 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: 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 "סיסמה:"
 
@@ -12840,8 +12979,9 @@ msgstr ""
 # BUG: from the remote learner? to > from
 # remote learning server
 #: src/plugins/spamassassin/spamassassin.c:429
+#, fuzzy
 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 ""
 "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לספק נתונים לדואר זה לשרת המרוחק "
@@ -13004,11 +13144,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 "שני"
@@ -13098,7 +13233,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 "‏vCalendar"
 
@@ -13316,63 +13451,63 @@ 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 "_הירשם אל webCal..."
 
-#: 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"
@@ -13381,17 +13516,17 @@ msgstr ""
 "\n"
 "אלו האירועים שמתוכננים %s:\n"
 
-#: 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 "פקיעת זמן (%d שניות) בעת התחברות אל %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1608
+#: src/plugins/vcalendar/vcal_folder.c:1623
 #, c-format
 msgid "Error %ld"
 msgstr "שגיאה %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1805
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13404,7 +13539,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1809
+#: src/plugins/vcalendar/vcal_folder.c:1824
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13417,7 +13552,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: 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"
@@ -13428,7 +13563,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: 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"
@@ -13439,42 +13574,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: 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 "לא היתה אפשרות ליצור מדור %s"
 
-#: 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 "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לעדכן ערוץ Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1904
+#: src/plugins/vcalendar/vcal_folder.c:1919
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "כעת מושך לוח שנה עבור %s..."
 
-#: 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 "‏Claws Mail זקוק לגישת רשת תקשורת על מנת לעדכן את ההרשמה."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Subscribe to WebCal"
 msgstr "הרשמה אל WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Enter the WebCal URL:"
 msgstr "הזן כתובת WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1940
+#: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Could not parse the URL."
 msgstr "לא היתה אפשרות לנתח כתובת URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1968
+#: src/plugins/vcalendar/vcal_folder.c:1983
 msgid "Do you really want to unsubscribe?"
 msgstr "האם אתה בטוח כי ברצונך לבטל הרשמה?"
 
@@ -13533,15 +13668,15 @@ 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 "מאושר באופן זמני: "
 
@@ -13562,8 +13697,9 @@ msgid "Add..."
 msgstr "הוסף..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#, fuzzy
 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 ""
 "האישיויות הבאות עסוקות בזמן של מפגשך המתוכנן:\n"
@@ -13848,81 +13984,82 @@ msgstr "לא היתה אפשרות לייצא את המידע חופשי/עסו
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "לא היתה אפשרות לייצא חופשי/עסוק אל '%s'\n"
 
-#: 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 "באפשרותך לייצא לקובץ מקומי או כתובת URL"
 
-#: 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 "ציין קובץ מקומי או כתובת URL ‏(http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:367
+#: src/plugins/vcalendar/vcal_prefs.c:370
 msgid "Include webcal subscriptions in export"
 msgstr "כלול הרשמות webcal בתוך ייצוא"
 
-#: 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 "רשום את לוח שנה Claws בתוך שעון  Orage של XFCE"
 
-#: 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 ""
 "מעניקה היתר עבור Orage (גרסא שהינה מעל 4.4) לראות את לוח שנה Claws Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:421
+#: src/plugins/vcalendar/vcal_prefs.c:424
 msgid "Export as GNOME shell calendar server"
 msgstr "יצא בתור שרת לוח שנה GNOME shell"
 
-#: 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 "ציין קובץ מקומי או כתובת URL ‏(http://server/path/file.ifb)"
 
-#: 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 "
@@ -13931,7 +14068,7 @@ msgstr ""
 "ציין קובץ מקומי או כתובת URL ‏(http://server/path/file.ifb).\n"
 "‏‎%u עבור החלק השמאלי של כתובת הדוא״ל, ‎%d עבור המתחם"
 
-#: src/plugins/vcalendar/vcal_prefs.c:535
+#: src/plugins/vcalendar/vcal_prefs.c:538
 msgid "SSL options"
 msgstr "אפשרויות SSL"
 
@@ -13986,57 +14123,57 @@ msgstr "אירעה שגיאה בסשן POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "פקודת TOP לא נתמכת\n"
 
-#: 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 "POP3"
 
-#: 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 "IMAP4"
 
-#: src/prefs_account.c:338
+#: src/prefs_account.c:336
 msgid "News (NNTP)"
 msgstr "חדשות (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1494
+#: src/prefs_account.c:337 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "קובץ mbox מקומי"
 
-#: src/prefs_account.c:340
+#: src/prefs_account.c:338
 msgid "None (SMTP only)"
 msgstr "ללא (SMTP בלבד)"
 
-#: 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."
@@ -14044,78 +14181,78 @@ msgstr ""
 "אזהרה: גרסא זו של Claws Mail\n"
 "נבנתה בלי תמיכת IMAP וחדשות."
 
-#: 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 "שרת SMTP (שליחה)"
 
-#: src/prefs_account.c:1264
+#: src/prefs_account.c:1259
 msgid "Use mail command rather than SMTP server"
 msgstr "השתמש בפקודת דואר במקום שרת SMTP"
 
-#: 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 "חשבון%d"
 
-#: 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 "השתמש באימות מאובטח (APOP)"
 
 # בעת במועד קבלה
-#: 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 "0 ימים וגם 0 שעות : הסרה מידית"
 
-#: 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."
@@ -14123,80 +14260,85 @@ msgstr ""
 "הודעות מעל לגודל זה יאוחזרו באופן חלקי. בעת בחירה תעמוד לך האפשרות להורידן "
 "במלואן או למוחקן."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2464
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr "NNTP"
 
 # פריטים
-#: 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 "בלי הגבלה אם 0 מצוין"
 
-#: src/prefs_account.c:1592
+#: src/prefs_account.c:1585
+#, fuzzy
+msgid "Plain text"
+msgstr "מצא טקסט:"
+
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "מדור שרת IMAP"
 
-#: 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 "הלחן Message-ID"
 
-#: src/prefs_account.c:1723
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "שלח כתובת דואר של חשבון בתוך Message-ID"
 
-#: 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 "אימות SMTP ‏(SMTP AUTH)"
 
-#: 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."
@@ -14204,305 +14346,289 @@ msgstr ""
 "כאשר ערכים אלו יישארו ריקים, ייעשה שימוש באותו מזהה משתמש ובאותה סיסמה אשר "
 "משמשים לצורך קבלה."
 
-#: src/prefs_account.c:1844
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "אמת עם POP3 טרם שליחה"
 
-#: src/prefs_account.c:1859
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "פקיעת זמן אימות POP: "
 
-#: 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 "אל תשתמש בהצפנת SSL"
 
-#: src/prefs_account.c:2441
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור POP3"
 
-#: 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 "השתמש בפקודת STARTTLS כדי להתחיל סשן SSL"
 
-#: src/prefs_account.c:2456
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור IMAP4"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור NNTP"
 
-#: src/prefs_account.c:2480
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "שליחה (SMTP)"
 
-#: src/prefs_account.c:2484
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "אל תשתמש בהצפנת SSL (אולם, במידת וקיים הצורך, תתעל את STARTTLS)"
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור SMTP"
 
-#: 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 "קובץ תעודת לקוח כקובץ PKCS12 או PEM"
 
-#: 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 "קבל אוטומטית תעודות SSL תקינות"
 
-#: src/prefs_account.c:2561
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "נצל SSL שאינו חוסם (non-blocking)"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "כבה את העדפה זו אם קיימות אצלך בעיות התחברות אשר קשורות אל SSL"
 
-#: src/prefs_account.c:2691
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "פורט SMTP"
 
-#: src/prefs_account.c:2698
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "פורט POP3"
 
-#: src/prefs_account.c:2705
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "פורט IMAP4"
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "פורט NNTP"
 
-#: 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 "שם המתחם ינוצל בתוך Message-ID המולחנת, ובעת התקשרות עם שרתי SMTP."
 
-#: 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 "העבר דואר מחוק לאשפה והסירו לחלוטין לאלתר"
-
-#: src/prefs_account.c:2745
-msgid ""
-"Moves deleted mails to trash instead of using the \\Deleted flag without "
-"expunging."
-msgstr ""
-"העבר דואר מחוק לאשפה במקום לעשות שימוש בדגל ‪\\Deleted‬ ללא הסרה מוחלטת."
-
-#: src/prefs_account.c:2749
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "סמן הודעות פרסום-צולב ככאלה שנקראו וצבע:"
 
 # השמת
-#: 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 "שרת SMTP אינו מוזן."
 
-#: 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 "שרתPOP3 אינו מוזן."
 
-#: 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 "שרת IMAP4 אינו מוזן."
 
-#: src/prefs_account.c:2923
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "שרת NNTP אינו מוזן."
 
-#: 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 "‏%s - העדפות חשבון"
 
-#: 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 "%s (תוסף לא טעון)"
@@ -14737,7 +14863,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 "פעולות"
 
@@ -14749,7 +14875,8 @@ msgstr ""
 "תכונת הפעולות הינה דרך עבור המשתמש לשגר פקודות חיצוניות כדי לעבד קובץ הודעה "
 "שלמה או רק חלק אחד מאזוריה."
 
-#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695 src/prefs_template.c:1121
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
+#: src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "כ_פילות"
 
@@ -14762,26 +14889,25 @@ 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 "שלום,\\n"
 
 # ביום %d נכתב\\n
 # ע״י %f כדלקמן:\\n
-#: src/prefs_common.c:298
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "ביום %d\\nנכתב על ידי %f כדלקמן:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:304 src/prefs_quote.c:85
-#, qt-format
+#: 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"
+"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
+"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
-"\\n\\nמתחיל הודעה מקודמת:\\n\\n?d{תאריך: %d\\n}?f{מאת: %f\\n}?t{אל: "
-"%t\\n}?c{עותק: %c\\n}?n{קבוצות דיונים: %n\\n}?s{נושא: %s\\n}\\n\\n%M"
+"\\n\\nמתחיל הודעה מקודמת:\\n\\n?d{תאריך: %d\\n}?f{מאת: %f\\n}?t{אל: %t\\n}?"
+"c{עותק: %c\\n}?n{קבוצות דיונים: %n\\n}?s{נושא: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:448
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr ""
 
@@ -15011,7 +15137,8 @@ msgstr ""
 "אפשרות זו מתירה לחלקי MIME להיות מוצגים בתוך תצוגת הודעה מבעד לתסריט כאשר "
 "משתמשים בפריט התפריט ההקשרי 'הצג בתור טקסט'"
 
-#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138 src/prefs_message.c:354
+#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
+#: src/prefs_message.c:354
 msgid "Message View"
 msgstr "תצוגת הודעה"
 
@@ -15039,7 +15166,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 "סמן"
 
@@ -15080,7 +15207,8 @@ msgstr "הכוון מחדש"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
 #: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87 src/summaryview.c:446
+#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87
+#: src/summaryview.c:446
 msgid "Score"
 msgstr "ניקוד"
 
@@ -15165,7 +15293,8 @@ msgstr "שם תגית הינו ריק."
 msgid "No action was defined."
 msgstr "אף פעולה לא הוגדרה."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160 src/quote_fmt.c:79
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
+#: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "% מילולי"
 
@@ -15173,7 +15302,8 @@ msgstr "% מילולי"
 msgid "filename (should not be modified)"
 msgstr "שם קובץ (לא אמור להיות נתון לשינוי)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170 src/quote_fmt.c:87
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
+#: src/quote_fmt.c:87
 msgid "new line"
 msgstr "שורה חדשה"
 
@@ -15223,7 +15353,8 @@ msgstr "רשימת פעולה נוכחית"
 msgid "Filtering/Processing configuration"
 msgstr "תצורת סינון/עיבוד"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:867 src/prefs_filtering.c:981
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "כולם"
@@ -15543,7 +15674,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 "העדפות"
 
@@ -15686,7 +15817,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 "אחרות"
 
@@ -15764,11 +15895,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 "מחוקה"
 
@@ -15776,12 +15907,12 @@ 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 "ספאם"
@@ -15790,7 +15921,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 "חתומה"
 
@@ -16051,8 +16182,8 @@ msgid ""
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"‏'Test' מתיר לך לבחון הודעה או אלמנט של הודעה באמצעות תכנית חיצונית או "
-"תסריט. התוכנית תחזיר 0 או 1.\n"
+"‏'Test' מתיר לך לבחון הודעה או אלמנט של הודעה באמצעות תכנית חיצונית או תסריט. "
+"התוכנית תחזיר 0 או 1.\n"
 "\n"
 "הסמלים הבאים ניתנים לשימוש:"
 
@@ -16101,6 +16232,11 @@ msgstr "בחר אזור HTML של הודעות חלופיות או מרובות
 msgid "Line space"
 msgstr "ריווח שורה"
 
+#: src/prefs_message.c:189 src/prefs_message.c:223
+#, fuzzy
+msgid "pixels"
+msgstr "פיקסל(ים)"
+
 #: src/prefs_message.c:195
 msgid "Scroll"
 msgstr "גלילה"
@@ -16137,6 +16273,24 @@ 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
+#, fuzzy
+msgid "Configuration warning"
+msgstr "תצורה הושלמה"
+
 #: src/prefs_msg_colors.c:147
 msgid "Message view"
 msgstr "תצוגת הודעה"
@@ -16323,15 +16477,15 @@ msgstr "קטוף צבע עבור תיקייה"
 msgid "Colors"
 msgstr "צבעים"
 
-#: 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."
@@ -16339,37 +16493,37 @@ msgstr ""
 "באפשרותך גם להתאים כל קיצור דרך תפריט על ידי לחיצה\n"
 "על כל מקש(ים) בעת מיקוד סמן העכבר על הפריט."
 
-#: 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 "רוקן אשפה בעת יציאה"
 
 # קיימות
-#: 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"
@@ -16379,15 +16533,15 @@ msgstr ""
 "על ידי התמקדות על פירטי תפריט ולחיצה על צירוף מקשים.\n"
 "אל תסמן את אפשרות זו אם ברצונך לנעול את כל קיצורי דרך מקלדת הקיימים."
 
-#: 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 "ניהול Metadata"
 
-#: 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."
@@ -16395,31 +16549,31 @@ msgstr ""
 "מצב בטוח יותר שואל את מערכת ההפעלה לרשום מידע-מוצמד ישירות\n"
 "אל הכונן; זה נמנע מאיבוד מידע לאחר קריסות אך לוקח זמן מה."
 
-#: 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 "פקיעת זמן Socket I/O"
 
-#: src/prefs_other.c:566
+#: src/prefs_other.c:584
 msgid "Ask before emptying trash"
 msgstr "שאל לפני ריקון אשפה"
 
-#: 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)"
@@ -16427,7 +16581,7 @@ msgstr ""
 "השתמש במחיקת קובץ מאובטחת במידת האפשר\n"
 "(התוכנית 'shred' אינה זמינה)"
 
-#: 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."
@@ -16435,11 +16589,32 @@ msgstr ""
 "השתמש בתוכנית 'shred' כדי להחליף קבצים עם נתונים אקראיים לפני מחיקתם. זה מאט "
 "מחיקה. היה בטוח לעיין בעמוד man shred לאזהרות."
 
-#: 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
+#, fuzzy
+msgid "Master passphrase"
+msgstr "מימרת־סיסמה רעה.\n"
+
+#: src/prefs_other.c:610
+#, fuzzy
+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
+#, fuzzy
+msgid "Change master passphrase"
+msgstr "אנא הזן מימרת סיסמה עבור:"
+
+#: src/prefs_other.c:778
 msgid "Miscellaneous"
 msgstr "שונות"
 
@@ -16449,73 +16624,73 @@ msgstr "שונות"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "ביום %d\\nנכתב על ידי %f כדלקמן:\\n\\n%q"
 
-#: 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 "דו שיח"
 
-#: src/prefs_receive.c:172
+#: src/prefs_receive.c:220
 msgid "Show receive dialog"
 msgstr "הצג דו שיח קבלה"
 
-#: 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 "סגור דו שיח קבלה בעת סיום"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:244
 msgid "Don't popup error dialog on receive error"
 msgstr "אל תקפיץ דו שיח שגיאה בעת שגיאת קבלה"
 
-#: 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"
@@ -16525,181 +16700,177 @@ msgstr ""
 "(השתמש במשתנה ‎%d בתור מספר של דואר חדש)"
 
 # טיפול בדואר
-#: 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"
-msgstr "ודא טרם שליחת הודעות בהמתנה"
-
-#: src/prefs_send.c:167
+#: src/prefs_send.c:162
 msgid "Never send Return Receipts"
 msgstr "אל תשלח אף פעם קבלת מסירה"
 
-#: src/prefs_send.c:170
+#: src/prefs_send.c:180
+msgid "Confirm before sending queued messages"
+msgstr "ודא טרם שליחת הודעות בהמתנה"
+
+#: src/prefs_send.c:183
 msgid "Show send dialog"
 msgstr "הצג דו שיח שליחה"
 
-#: src/prefs_send.c:172
+#: src/prefs_send.c:186
 msgid "Warn when Subject is empty"
 msgstr "הזהר כאשר Subject (נושא) הינו ריק"
 
-#: 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 "‏7bit ASCII ‏(US-ASCII)"
 
-#: src/prefs_send.c:223
+#: src/prefs_send.c:236
 msgid "Unicode (UTF-8)"
 msgstr "קידוד אוניברסלי (UTF-8)"
 
-#: src/prefs_send.c:225
+#: src/prefs_send.c:238
 msgid "Western European (ISO-8859-1)"
 msgstr "מערב אירופאי (ISO-8859-1)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:239
 msgid "Western European (ISO-8859-15)"
 msgstr "מערב אירופאי (ISO-8859-15)"
 
-#: src/prefs_send.c:228
+#: src/prefs_send.c:241
 msgid "Central European (ISO-8859-2)"
 msgstr "מרכז אירופאי (ISO-8859-2)"
 
-#: src/prefs_send.c:230
+#: src/prefs_send.c:243
 msgid "Baltic (ISO-8859-13)"
 msgstr "בלטי (ISO-8859-13)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:244
 msgid "Baltic (ISO-8859-4)"
 msgstr "בלטי (ISO-8859-4)"
 
-#: src/prefs_send.c:233
+#: src/prefs_send.c:246
 msgid "Greek (ISO-8859-7)"
 msgstr "יווני (ISO-8859-7)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:248
 msgid "Hebrew (ISO-8859-8)"
 msgstr "עברי (ISO-8859-8)"
 
-#: src/prefs_send.c:236
+#: src/prefs_send.c:249
 msgid "Hebrew (Windows-1255)"
 msgstr "עברי (Windows-1255)"
 
-#: src/prefs_send.c:238
+#: src/prefs_send.c:251
 msgid "Arabic (ISO-8859-6)"
 msgstr "ערבי (ISO-8859-6)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:252
 msgid "Arabic (Windows-1256)"
 msgstr "ערבי (Windows-1256)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:254
 msgid "Turkish (ISO-8859-9)"
 msgstr "טורקי (ISO-8859-9)"
 
-#: src/prefs_send.c:243
+#: src/prefs_send.c:256
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "קירילי (ISO-8859-5)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:257
 msgid "Cyrillic (KOI8-R)"
 msgstr "קירילי (KOI8-R)"
 
-#: src/prefs_send.c:245
+#: src/prefs_send.c:258
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "קירילי (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:259
 msgid "Cyrillic (KOI8-U)"
 msgstr "קירילי (KOI8-U)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:260
 msgid "Cyrillic (Windows-1251)"
 msgstr "קירילי (Windows-1251)"
 
-#: src/prefs_send.c:249
+#: src/prefs_send.c:262
 msgid "Japanese (ISO-2022-JP)"
 msgstr "יפני (ISO-2022-JP)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:264
 msgid "Japanese (EUC-JP)"
 msgstr "יפני (EUC-JP)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:265
 msgid "Japanese (Shift_JIS)"
 msgstr "יפני (Shift_JIS)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:268
 msgid "Simplified Chinese (GB18030)"
 msgstr "סינית מפושטת (GB18030)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:269
 msgid "Simplified Chinese (GB2312)"
 msgstr "סינית מפושטת (GB2312)"
 
-#: src/prefs_send.c:257
+#: src/prefs_send.c:270
 msgid "Simplified Chinese (GBK)"
 msgstr "סינית מפושטת (GBK)"
 
-#: src/prefs_send.c:258
+#: src/prefs_send.c:271
 msgid "Traditional Chinese (Big5)"
 msgstr "סינית מסורתית (Big5)"
 
-#: src/prefs_send.c:260
+#: src/prefs_send.c:273
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "סינית מסורתית (EUC-TW)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:274
 msgid "Chinese (ISO-2022-CN)"
 msgstr "סיני (ISO-2022-CN)"
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:277
 msgid "Korean (EUC-KR)"
 msgstr "קוריאני (EUC-KR)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:279
 msgid "Thai (TIS-620)"
 msgstr "תאי (TIS-620)"
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:280
 msgid "Thai (Windows-874)"
 msgstr "תאי (Windows-874)"
 
-#: 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 "ציין קידוד-העברת-תוכן בשימוש כאשר גוף הודעה מכיל תווים שאינם ASCII"
 
 # שולח כעת
-#: 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 "שליחה"
 
@@ -16829,7 +17000,8 @@ msgstr "השנה בתור מספר עשרוני"
 msgid "the time zone or name or abbreviation"
 msgstr "אזור הזמן או קיצור"
 
-#: src/prefs_summaries.c:192 src/prefs_summaries.c:240 src/prefs_summaries.c:561
+#: src/prefs_summaries.c:192 src/prefs_summaries.c:240
+#: src/prefs_summaries.c:561
 msgid "Date format"
 msgstr "פורמט תאריך"
 
@@ -16922,8 +17094,8 @@ msgstr "יישום מיידי בעת העברה או מחיקה של הודעו
 
 #: src/prefs_summaries.c:518
 msgid ""
-"Defers moving, copying and deleting of messages until you choose "
-"'Tools/Execute'"
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
 msgstr "עיכוב העברה, העתקה ומחיקה של הודעות עד שתבחר 'כלים/בצע'"
 
 #: src/prefs_summaries.c:521
@@ -17126,7 +17298,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 "מוטיב פנימי שגרתי"
 
@@ -17233,54 +17405,54 @@ msgstr ""
 "קובץ %s נכשל\n"
 "במהלך התקנת מוטיב."
 
-#: src/prefs_themes.c:667
+#: src/prefs_themes.c:666
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d מוטיבים זמינים (%d משתמש, %d מערכת, 1 פנימי)"
 
-#: src/prefs_themes.c:708
+#: src/prefs_themes.c:707
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "מוטיב פנימי מונה %d סמלים"
 
-#: 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 "%d קבצים (%d סמלים), גודל: %s"
 
-#: 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 "‏URL:"
 
-#: src/prefs_themes.c:895
+#: src/prefs_themes.c:894
 msgid "Preview"
 msgstr "הצגה מוקדמת"
 
@@ -17430,36 +17602,36 @@ 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 "[שגיאה בפענוח BASE64]\n"
 
-#: 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 "לא היתה אפשרות לפתוח קובץ %s."
 
-#: src/procmsg.c:1619
+#: src/procmsg.c:1626
 msgid "Queued message header is broken."
 msgstr "תקורת הודעה בהמתנה הינה רצוצה."
 
 # occur?
 # במשך
-#: src/procmsg.c:1639
+#: src/procmsg.c:1646
 msgid "An error happened during SMTP session."
 msgstr "התרחשה שגיאה במהלך סשן SMTP."
 
-#: 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 "לא נמצא חשבון מסוים לשליחה, והתרחשה שגיאה במהלך סשן SMTP."
 
-#: src/procmsg.c:1661
+#: src/procmsg.c:1668
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17467,20 +17639,20 @@ msgstr ""
 "לא היתה אפשרות לקבוע מידע שליחה. ייתכן כי הדוא״ל לא התחולל באמצעות Claws "
 "Mail."
 
-#: 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 "אירעה שגיאה במהלך פרסום ההודעה אצל %s."
 
-#: src/procmsg.c:2262
+#: src/procmsg.c:2269
 msgid "Filtering messages...\n"
 msgstr "כעת מסנן הודעות...\n"
 
@@ -17642,8 +17814,7 @@ msgid ""
 "to insert"
 msgstr ""
 "שבץ קובץ:\n"
-"‏<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ "
-"לשיבוץ"
+"‏<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ לשיבוץ"
 
 # להשיג את הקלט
 #: src/quote_fmt.c:93
@@ -17674,8 +17845,7 @@ msgid ""
 "to attach"
 msgstr ""
 "ספח קובץ:\n"
-"<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ "
-"לסיפוח"
+"<span style=\"oblique\">‏sub_expr</span> הינו מוערך בתור הנתיב של הקובץ לסיפוח"
 
 #: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -17778,89 +17948,89 @@ msgstr "הזן טקסט להחלפה '%s'"
 msgid "Enter variable"
 msgstr "הזן משתנה"
 
-#: src/send_message.c:152
+#: src/send_message.c:153
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "שולח כעת הודעה באמצעות פקודה: %s\n"
 
-#: src/send_message.c:166
+#: src/send_message.c:167
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "לא היתה אפשרות לבצע פקודה: %s"
 
-#: src/send_message.c:201
+#: src/send_message.c:202
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "אירעה שגיאה במהלך ביצוע פקודה: %s"
 
-#: 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 "מקיים POP לפני SMTP..."
 
-#: src/send_message.c:359
+#: src/send_message.c:358
 msgid "POP before SMTP"
 msgstr "POP לפני SMTP"
 
-#: src/send_message.c:364
+#: src/send_message.c:363
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "חשבון '%s': כעת מתחבר לשרת SMTP: ‏%s:%d..."
 
-#: 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 "כעת שולח HELO..."
 
-#: 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 "כעת שולח EHLO..."
 
-#: src/send_message.c:501
+#: src/send_message.c:500
 msgid "Sending MAIL FROM..."
 msgstr "כעת שולח MAIL FROM..."
 
-#: src/send_message.c:505
+#: src/send_message.c:504
 msgid "Sending RCPT TO..."
 msgstr "כעת שולח RCPT TO..."
 
-#: src/send_message.c:510
+#: src/send_message.c:509
 msgid "Sending DATA..."
 msgstr "כעת שולח DATA..."
 
-#: 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 "כעת שולח הודעה (%d / %d בתים)"
 
-#: 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"
@@ -17895,15 +18065,15 @@ msgstr "מקור של ההודעה"
 msgid "%s - Source"
 msgstr "%s - מקור"
 
-#: src/ssl_manager.c:157
+#: src/ssl_manager.c:156
 msgid "Saved SSL certificates"
 msgstr "תעודות SSL שמורות"
 
-#: 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 "האם אתה בטוח כי ברצונך למחוק את תעודה זו?"
 
@@ -17931,7 +18101,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 "כעת מחפש בתוך %s... \n"
@@ -17956,260 +18126,263 @@ 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 "כעת סורק תיקייה (%s)..."
 
-#: 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 "שגיאה פנימית: ערך לא צפוי עבור prefs_common.next_unread_msg_dialog\n"
 
-#: 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 "אין עוד הודעות מסווגות"
 
-#: src/summaryview.c:2107
+#: src/summaryview.c:2088
 msgid "No labeled message found. Search from the end?"
 msgstr "לא נמצאו הודעות מסווגות. לחפש מן הסוף?"
 
-#: src/summaryview.c:2116 src/summaryview.c:2141
+#: src/summaryview.c:2097 src/summaryview.c:2122
 msgid "No labeled messages."
 msgstr "אין הודעות מסווגות."
 
-#: src/summaryview.c:2132
+#: src/summaryview.c:2113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "לא נמצאו הודעות מסווגות. לחפש מן ההתחלה?"
 
-#: 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 "%d נמחקו"
 
-#: src/summaryview.c:2635
+#: src/summaryview.c:2616
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d הועברו"
 
-#: 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 "%s%d הועתקו"
 
-#: 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 "%d חדשות, %d לא נקראו, %d סך הכל (%s)"
 
-#: 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 "%d/%d נבחרו (%s/%s), %d לא נקראו"
 
-#: 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 "מאת: %s, ביום %s"
 
-#: src/summaryview.c:3431
+#: src/summaryview.c:3412
 #, c-format
 msgid "To: %s, on %s"
 msgstr "לכבוד: %s, ביום %s"
 
-#: src/summaryview.c:4310
+#: src/summaryview.c:4291
 msgid "You're not the author of the article.\n"
 msgstr "אינך המחבר של המאמר.\n"
 
-#: 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] "האם אתה בטוח כי ברצונך למחוק את %d ההודעות הנבחרות?"
 
-#: src/summaryview.c:4406
-msgid "Delete message(s)"
-msgstr "מחיקת הודעה(ות)"
+#: src/summaryview.c:4384
+#, fuzzy
+msgid "Delete message"
+msgid_plural "Delete messages"
+msgstr[0] "מחק הודעה"
+msgstr[1] "מחק הודעה"
 
-#: 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 "בחרת להדפיס %d הודעות, בזו אחר זו. האם ברצונך להמשיך?"
 
-#: 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:"
@@ -18217,55 +18390,55 @@ msgstr ""
 "קיימים כללים מסוימים אשר שייכים לחשבון.\n"
 "אנא בחר מה לעשות עם כללים אלו:"
 
-#: 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"
@@ -18274,11 +18447,11 @@ msgstr ""
 "שגיאת ביטוי רגולרי (regexp):\n"
 "%s"
 
-#: 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 "חזור לרשימת תיקייה"
 
@@ -18742,14 +18915,14 @@ msgstr "אנא בחר כתובת URL לפתיחה."
 msgid "Select All"
 msgstr "בחר הכל"
 
-#: src/wizard.c:520
+#: src/wizard.c:521
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "ברוכים הבאים אל Claws Mail"
 
 # כעת ש
 # ובכן מש
-#: src/wizard.c:543
+#: src/wizard.c:544
 #, c-format
 msgid ""
 "\n"
@@ -18840,128 +19013,128 @@ msgstr ""
 "זאת בכתובת <%s>.\n"
 "\n"
 
-#: 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 "אנא הזן שרת SMTP."
 
-#: src/wizard.c:689
+#: src/wizard.c:690
 msgid "Please enter your SMTP username."
 msgstr "אנא הזן שם משתמש SMTP."
 
-#: 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 "ארגונך:"
 
-#: 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\""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
 msgstr ""
 "באפשרותך גם לציין את הנתיב המוחלט, לדוגמא: \"/home/john/Documents/Mail\""
 
-#: 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\""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
 msgstr "באפשרותך לציין מספר פורט על ידי הוספתו בסוף: \"mail.example.com:25\""
 
-#: src/wizard.c:1106
+#: src/wizard.c:1113
 msgid "SMTP server address:"
 msgstr "כתובת שרת SMTP:"
 
-#: 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 "שם משתמש SMTP:"
 
-#: src/wizard.c:1146
+#: src/wizard.c:1153
 msgid "SMTP password:"
 msgstr "סיסמת SMTP:"
 
-#: src/wizard.c:1159
+#: src/wizard.c:1166
 msgid "Use SSL to connect to SMTP server"
 msgstr "השתמש בהצפנת SSL להתחברות לשרת SMTP"
 
-#: src/wizard.c:1170 src/wizard.c:1590
+#: src/wizard.c:1177 src/wizard.c:1597
 msgid "Use SSL via STARTTLS"
 msgstr "SSL דרך STARTTLS"
 
-#: src/wizard.c:1182 src/wizard.c:1602
+#: src/wizard.c:1189 src/wizard.c:1609
 msgid "Client SSL certificate (optional)"
 msgstr "תעודת לקוח SSL (רשות)"
 
-#: 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 "IMAP"
 
-#: 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\""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
 msgstr ""
 "באפשרותך לציין את מספר הפורט על ידי צירופו בקצה: \"mail.example.com:110\""
 
-#: src/wizard.c:1579
+#: src/wizard.c:1586
 msgid "Use SSL to connect to receiving server"
 msgstr "השתמש בהצפנת SSL כדי להתחבר לשרת קבלה"
 
-#: src/wizard.c:1644
+#: src/wizard.c:1651
 msgid "IMAP server directory:"
 msgstr "מדור שרת IMAP:"
 
-#: 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."
@@ -18969,15 +19142,15 @@ msgstr ""
 "אזהרה: גרסא זו של Claws Mail\n"
 "נבנתה בלי תמיכת IMAP."
 
-#: src/wizard.c:1781
+#: src/wizard.c:1788
 msgid "Claws Mail Setup Wizard"
 msgstr "אשף הבניית Claws Mail"
 
-#: src/wizard.c:1815
+#: src/wizard.c:1822
 msgid "Welcome to Claws Mail"
 msgstr "ברוכים הבאים אל Claws Mail"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1829
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -18990,31 +19163,31 @@ msgstr ""
 "אנחנו נתחיל בהגדרת מידע בסיסי אודותייך ואפשרויות דואר שהכי נפוצות עבורך כדי "
 "שתעמוד לרשותך האפשרות להתחיל את Claws Mail בתוך פחות מחמש דקות."
 
-#: 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."
@@ -19022,6 +19195,40 @@ msgstr ""
 "‏Claws Mail הינו מוכן כעת.\n"
 "להתחלה, לחץ על שמור."
 
+#~ msgid "_Other folder..."
+#~ msgstr "תיקייה _אחרת..."
+
+#~ msgid "   Key import isn't implemented in Windows.\n"
+#~ msgstr "   ייבוא מפתח אינו מיושם תחת Windows.\n"
+
+#~ msgid "minute(s)"
+#~ msgstr "דקה(ות)"
+
+#~ msgid "The signature can't be checked - %s."
+#~ msgstr "החתימה לא ניתנת לבדיקה - %s."
+
+#~ msgid "Key export isn't implemented in Windows."
+#~ msgstr "ייצוא מפתח אינו מיושם תחת Windows."
+
+#~ msgid "day(s)"
+#~ msgstr "ימים"
+
+# מוסר
+#~ msgid "Move deleted mails to trash and expunge immediately"
+#~ msgstr "העבר דואר מחוק לאשפה והסירו לחלוטין לאלתר"
+
+#~ msgid ""
+#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
+#~ "expunging."
+#~ msgstr ""
+#~ "העבר דואר מחוק לאשפה במקום לעשות שימוש בדגל ‪\\Deleted‬ ללא הסרה מוחלטת."
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "אוטומטי (מומלצת)"
+
+#~ msgid "Delete message(s)"
+#~ msgstr "מחיקת הודעה(ות)"
+
 #~ msgid "+_Insert"
 #~ msgstr "+_שבץ"
 
@@ -19098,9 +19305,6 @@ msgstr ""
 #~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
 #~ msgstr "<span color=\"red\">שגיאה בטיהור מטמון סמל.</span>"
 
-#~ msgid "seconds"
-#~ msgstr "שניות"
-
 #~ msgid "mbox (etPan!)..."
 #~ msgstr "‏mbox ‏(!etPan)..."
 
@@ -19108,8 +19312,8 @@ msgstr ""
 #~ msgstr "+_שמור"
 
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase "
-#~ "for:</span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
+#~ "span>\n"
 #~ "\n"
 #~ "%.*s\n"
 #~ msgstr ""
diff --git a/po/hu.po b/po/hu.po
index d2a48b7..7f30960 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,7 +11,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-04 06:36+0200\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-08-06 03:18+0200\n"
 "Last-Translator: rezso <rezso at rezso.net>\n"
 "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -95,7 +95,7 @@ msgstr "A 'Levelek fogadása' minden bejelölt fiókot ellenőriz"
 # src/editjpilot.c:295 src/editldap.c:298 src/editvcard.c:210
 # src/mimeview.c:150 src/prefs_folder_item.c:164 src/select-keys.c:299
 #: 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
@@ -109,7 +109,7 @@ msgid "Name"
 msgstr "Név"
 
 # src/account.c:552 src/prefs_account.c:803
-#: 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"
 
@@ -941,8 +941,8 @@ msgid "Person"
 msgstr "Partner"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
-#: 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 "Mappa"
 
@@ -1105,20 +1105,20 @@ msgid "Update failed. Changes not written to Directory."
 msgstr "A frissítés nem sikerült. A változások nem lettek a címjegyzékbe írva."
 
 # src/alertpanel.c:120 src/compose.c:4590 src/main.c:410
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Megjegyzés"
 
 # src/alertpanel.c:133 src/main.c:245
-#: 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 "Figyelmeztetés"
 
 # src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475
-#: 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 "Hiba"
@@ -1156,69 +1156,69 @@ msgid "Attribute Value"
 msgstr "Tulajdonság érték"
 
 # src/inc.c:807
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Semmi"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "egy megjelenítő"
 
 # src/mimeview.c:148
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "egy MIME parser"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "mappa"
 
 # src/summaryview.c:3150
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "szűrés"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "egy titkosítás-kezelő"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "értesítő"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "egy segédeszköz"
 
 # src/send.c:375
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "egyéb"
 
-#: 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 "A bővítmény %s (%s)-t biztosít, amit a(z) %s bővítmény már telepített."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "A bővítmény már betöltve"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Nem sikerült memóriát lefoglalni a bővítmény számára"
 
-#: 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 "A modul licensze nem kompatíbilis a GPL v3 vagy későbbi verziójával."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Claws Mail GTK1 modul."
 
-#: 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 "
@@ -1226,18 +1226,18 @@ msgid ""
 msgstr ""
 "A Claws Mail verziója újabb, mint amellyel a(z) '%s' bővítmény fordítva lett."
 
-#: 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 "A Claws Mail verziója újabb, mint amellyel a bővítmény fordítva lett."
 
-#: 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 "A Claws Mail verziója túl régi a(z) '%s' bővítményhez."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "A Claws Mail verziója túl régi a bővítményhez."
 
@@ -1427,221 +1427,221 @@ 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 "Vasárnap"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Hétfő"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Péntek"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Szombat"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Január"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Február"
 
 # src/message_search.c:133 src/summary_search.c:199
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Március"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Április"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Május"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Június"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Július"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Augusztus"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Szeptember"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Október"
 
 # src/prefs_summary_column.c:74
-#: 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 "V"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "H"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "K"
 
 # src/colorlabel.c:46
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Sze"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Cs"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "P"
 
 # src/progressdialog.c:53
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Szo"
 
-#: 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 "Febr"
 
 # src/prefs_summary_column.c:67
-#: src/common/utils.c:4844
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Márc"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Ápr"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jún"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Júl"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
 # src/prefs_common.c:1721
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Szept"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
 # src/colorlabel.c:281 src/prefs_folder_item.c:256 src/summaryview.c:3506
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
 # src/compose.c:547
-#: 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 "de."
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "du."
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "de."
 
 # src/mimeview.c:798 src/summaryview.c:2664
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "du."
@@ -1659,7 +1659,7 @@ msgstr "Tö_rlés"
 
 # src/compose.c:445 src/folderview.c:229 src/folderview.c:245
 # src/folderview.c:260
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Tulajdonságok..."
 
@@ -2177,7 +2177,7 @@ msgid "Are you sure?"
 msgstr "Biztos vagy benne?"
 
 # src/compose.c:3946 src/compose.c:5131
-#: 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 "Beszúrás"
 
@@ -2242,7 +2242,7 @@ msgstr ""
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
 #: 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 "Küldés"
 
@@ -2253,8 +2253,8 @@ msgstr ""
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
-#: 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 "_Küldés"
@@ -2293,7 +2293,7 @@ msgid "Send later"
 msgstr "Küldés később"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: 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"
@@ -2304,7 +2304,7 @@ msgstr ""
 "A karakterkészlet átalakítása nem sikerült."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: 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"
@@ -2315,7 +2315,7 @@ msgstr ""
 "A címzett titkosító kulcsa nem hozzáférhető."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: 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"
@@ -2361,7 +2361,7 @@ msgstr ""
 "Próbáld újra a \"Várakozó üzenetek elküldése\" opcióval a főablakban."
 
 # src/compose.c:2497
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2372,7 +2372,7 @@ msgstr ""
 "a megadott %s karakterkészletre.\n"
 "Elküldöd %s kódolással?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2386,82 +2386,82 @@ msgstr ""
 "Elküldöd így?"
 
 # src/editbook.c:120 src/editjpilot.c:192 src/editvcard.c:99
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Az e-mail nem titkosítható: %s"
 
 # src/inc.c:462
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Titkosítási figyelmeztetés"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "F_olytatás"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Nincs elérhető fiók az üzenetküldéshez!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "A kiválasztott fiók nem NNTP: a küldés nem lehetséges."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "%s csatolás már nem létezik. Kihagyás?"
 
-#: 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 "A küldés félbeszakítása"
 
 # src/summaryview.c:349
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Csatolás kihagyása"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Eredeti %s rész"
 
 # src/summaryview.c:369
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Felvétel a _címjegyzékbe"
 
 # src/account.c:672
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Bejegyzés tartalmának törlése"
 
-#: 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 ""
 "Használd a <TAB> billentyűt az automatikus kiegészítéshez a címjegyzékből"
 
 # src/compose.c:3460 src/compose.c:4384
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "MIME típus"
 
 # src/compose.c:3461 src/mimeview.c:149 src/prefs_summary_column.c:73
 # src/select-keys.c:297 src/summaryview.c:401
-#: 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 "Méret"
 
 # src/prefs_common.c:1065
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Elküldött üzenet mentése:"
 
 # src/colorlabel.c:51
-#: 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
@@ -2474,25 +2474,25 @@ msgstr "_Böngészés"
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "_Fejléc"
 
 # src/mimeview.c:196
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Csatolások"
 
 # src/prefs_common.c:826 src/select-keys.c:324
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "_Egyebek"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "_Tárgy:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2501,20 +2501,20 @@ msgstr ""
 "Helyesírás-ellenőrző nem indítható.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_Feladó:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Az e-mailhez használandó fiók"
 
 # src/editaddress.c:460
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "A használt feladó cím."
 
-#: 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 "
@@ -2524,84 +2524,84 @@ msgstr ""
 "titkosítani."
 
 # src/colorlabel.c:281 src/prefs_folder_item.c:256 src/summaryview.c:3506
-#: 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 "_Nincs"
 
 # src/prefs_template.c:438
-#: 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 "Hiba a sablon törzsének %d. sorában."
 
 # src/prefs_template.c:438
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Feladó formátum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Címzett formátum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Másolatot kap formátum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Titkos másolatot kap formátum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Válaszcím formátum hiba a sablonban."
 
 # src/compose.c:1157
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Tárgy formátum hiba a sablonban."
 
 # src/compose.c:4280
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
 # src/compose.c:4298
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
 # src/compose.c:445 src/folderview.c:229 src/folderview.c:245
 # src/folderview.c:260
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Tulajdonságok"
 
 # src/compose.c:3460 src/compose.c:4384
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "MIME típus"
 
 # src/compose.c:4386
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Kódolás"
 
 # src/compose.c:4409 src/prefs_folder_item.c:177
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Elérési út"
 
 # src/compose.c:4410
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Fájlnév"
 
 # src/compose.c:4587
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2612,17 +2612,17 @@ msgstr ""
 "Processz leállítása?\n"
 "Processzcsoport azonosító: %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 "Az e-mail elküldéséhez hálózati kapcsolat kell."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Az üzenet nem tehető sorba a küldéshez."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2634,16 +2634,16 @@ msgstr ""
 "%s."
 
 # src/prefs_actions.c:683
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "A vázlat nem menthető."
 
 # src/prefs_actions.c:683
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "A vázlat nem menthető."
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2664,26 +2664,26 @@ msgstr ""
 # src/prefs_display_header.c:192 src/prefs_summary_column.c:310
 # src/prefs_template.c:259 src/progressdialog.c:77 src/select-keys.c:323
 # src/summaryview.c:588 src/summaryview.c:2671
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Mégsem lép ki"
 
 # src/compose.c:5095
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_E-mail eldobása"
 
 # src/compose.c:5055 src/compose.c:5069
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Fájl kiválasztása"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "'%s' fájl nem olvasható."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2693,62 +2693,62 @@ msgstr ""
 "nem érvényes karaktereket tartalmaz, a beszúrás hibás lehet."
 
 # src/compose.c:5093
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Üzenet eldobása"
 
 # src/compose.c:5094
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Az üzenet megváltozott. Elveted?"
 
 # src/compose.c:5095
-#: 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 "Elvetés"
 
 # src/compose.c:5095
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "Mentés a Vázlatokhoz"
 
 # src/mimeview.c:798 src/summaryview.c:2664
-#: 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 "Módosítások mentése"
 
 # src/compose.c:5094
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Az üzenet megváltozott. Mented az utolsó módosításokat?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Nincs mentés"
 
 # src/compose.c:5128
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Alkalmazni kívánod a(z) '%s' sablont?"
 
 # src/compose.c:5130
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
 # src/compose.c:5131
-#: 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 "Cse_re"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Beszúrás vagy csatolás?"
 
-#: 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?"
@@ -2757,17 +2757,17 @@ msgstr ""
 "szeretnéd elküldeni?"
 
 # src/compose.c:3954
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Csatolás"
 
 # src/compose.c:1145
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Idézet formátum hiba a(z) %d. sorban."
 
-#: 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 "
@@ -3019,7 +3019,7 @@ msgstr " Fájl ellenőrzés"
 
 # src/editbook.c:202 src/editjpilot.c:307 src/editvcard.c:222
 #: 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 "Fájl"
@@ -3196,7 +3196,7 @@ msgid "TLS"
 msgstr "TLS"
 
 # src/prefs_account.c:681
-#: src/editldap.c:471 src/prefs_account.c:3383
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
@@ -3378,7 +3378,7 @@ msgid ""
 msgstr "A keresés eredményeként visszaadott bejegyzések maximális száma."
 
 # src/editldap.c:461 src/prefs_account.c:668
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Egyszerű"
 
@@ -4160,69 +4160,69 @@ msgid "Can't create the folder '%s'."
 msgstr "'%s' mappa nem hozható létre."
 
 # src/summaryview.c:366
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Összes megjelölése _olvasottként"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Összes megjelölése olvasottként rekurzí_van"
 
 # src/summaryview.c:371
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "Feldolgozási _szabályok futtatása"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "Ma_ppa keresése..."
 
 # src/summaryview.c:388
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "_Feldolgozás..."
 
 # src/mainwindow.c:1229
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "_Kuka ürítése..."
 
 # src/send.c:536
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Várakozó üzenetek kül_dése..."
 
 # src/folderview.c:283
-#: 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 "Új"
 
 # src/folderview.c:284 src/prefs_summary_column.c:68
-#: 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 "Olvasatlan"
 
-#: 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 "Összesen"
 
 # src/folderview.c:285
 #. 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:440
-#: src/folderview.c:765
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: 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?"
@@ -4231,113 +4231,113 @@ msgstr ""
 "almappáiban?"
 
 # src/prefs_customheader.c:540
-#: 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 "Biztosan meg akarod jelölni olvasottként a mappa összes üzenetét?"
 
 # src/summaryview.c:364
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Összes megjelölése olvasottként"
 
-#: 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%s mappa átvizsgálása..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: 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 "%s mappa átvizsgálása..."
 
 # src/folderview.c:224 src/folderview.c:240
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Mappafa frissítése"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "A mappafa újraépítése törölni fogja a helyi gyorsítótárakat. Folytatod?"
 
 # src/folderview.c:659
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa frissítése..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Mappafa átvizsgálása..."
 
 # src/compose.c:2898
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "%s mappa nem vizsgálható\n"
 
 # src/folderview.c:749
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Új üzenetek _keresése az összes mappában..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "%s mappa bezárása..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "%s mappa megnyitása..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "A mappa nem volt megnyitható."
 
 # src/mainwindow.c:1229
-#: 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 "Kuka ürítése"
 
 # src/mainwindow.c:1230
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Kuka ürítése"
 
-#: 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 "Kapcsolat nélküli jelzés"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Kapcsolat nélkül dolgozol. Kapcsolódsz?"
 
 # src/mainwindow.c:1822
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Várakozó üzenet(ek) küldése"
 
 # src/mainwindow.c:1822
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Összes várakozó üzenet küldése?"
 
 # src/main.c:623 src/mainwindow.c:2337
-#: 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 "Hiba történt a várakozó üzenetek küldése közben."
 
 # src/main.c:623 src/mainwindow.c:2337
-#: 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"
@@ -4347,72 +4347,72 @@ msgstr ""
 "%s"
 
 # src/prefs_customheader.c:540
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Biztos, hogy '%s' mappát '%s' mappába akarod másolni?"
 
 # src/prefs_customheader.c:540
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Biztos, hogy '%s' mappát '%s' almappájaként akarod létrehozni?"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Mappa másolása"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Mappa áthelyezése"
 
 # src/imap.c:664 src/imap.c:717 src/mh.c:282 src/mh.c:378
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "%s másolása ide: %s..."
 
 # src/imap.c:664 src/imap.c:717 src/mh.c:282 src/mh.c:378
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s áthelyezése %s-ba(be)..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "A forrás és a cél megegyezik."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Egy mappa nem másolható az almappájába."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Egy mappa nem helyezhető át az almappájába."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Mappa áthelyezése csak azonos postafiókon belül lehetséges."
 
 # src/message_search.c:183 src/summary_search.c:300
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Másolás sikertelen!"
 
 # src/message_search.c:183 src/summary_search.c:300
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Áthelyezés sikertelen!"
 
 # src/mainwindow.c:666
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "%s mappa beállításainak feldolgozása"
 
-#: 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 "A célmappa csak almappák tárolására használható."
 
@@ -4774,73 +4774,73 @@ msgid "_Statistics"
 msgstr "_Statisztika"
 
 # src/colorlabel.c:45
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Narancs"
 
 # src/colorlabel.c:46
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Vörös"
 
 # src/colorlabel.c:47
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Rózsaszín"
 
 # src/colorlabel.c:48
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Égszínkék"
 
 # src/colorlabel.c:49
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Kék"
 
 # src/colorlabel.c:50
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Zöld"
 
 # src/colorlabel.c:51
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Barna"
 
 # src/colorlabel.c:50
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Szürke"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Világosbarna"
 
 # src/summaryview.c:364
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Sötétvörös"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Sötét pink"
 
 # src/colorlabel.c:48
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Középkék"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Arany"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Élénk zöld"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5667,7 +5667,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 "Bővítmények"
 
@@ -5715,9 +5715,9 @@ msgstr "_Elrejtés"
 
 # src/mainwindow.c:1906 src/prefs_folder_item.c:240 src/progressdialog.c:52
 #: 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"
@@ -6454,8 +6454,8 @@ msgstr "Kapcsolódás nem sikerült: %s"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s IMAP kapcsolat megszakadt. Újrakapcsolódás...\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 "Az IMAP szerver eléréséhez hálózati kapcsolat kell."
 
@@ -6501,99 +6501,99 @@ msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 szerverhez nem sikerült kapcsódni\n"
 
 # src/imap.c:1685
-#: 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 folyamat nem indítható.\n"
 
 # src/send.c:371
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nem lehet bejelentkezni %s IMAP szerverre.\n"
 
 # src/send.c:371
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nem lehet bejelentkezni %s IMAP szerverre."
 
 # src/send.c:536
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Üzenetek hozzáadása..."
 
 # src/main.c:411
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Üzenetek másolása..."
 
 # src/imap.c:870 src/imap.c:922
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "törölt jelző nem állítható be\n"
 
 # src/imap.c:877 src/imap.c:930 src/imap.c:981
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "nem törölhető\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Nem felírt mappák keresése itt: %s..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "%s almappáinak vizsgálata..."
 
 # src/imap.c:1351
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem tudtam postaládát létrehozni: LIST hiba\n"
 
 # src/imap.c:1372
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "nem tudtam postaládát létehozni\n"
 
 # src/imap.c:1443
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s postaláda nem nevezhető át %s -ra(re)\n"
 
 # src/imap.c:1509
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "nem tudtam törölni a postaládát\n"
 
 # src/send.c:285
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST sikertelen\n"
 
 # src/summaryview.c:2611
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Üzenetek megjelölése..."
 
 # src/imap.c:2202
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappa kiválasztása nem sikerült\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "A szerver TLS-t követel a bejelentkezéshez.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "A lehetőségek nem frissíthetőek.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -6602,22 +6602,22 @@ msgstr ""
 "Kapcsolódás ehhez: %s sikertelen: a szerver TLS-t követel meg, de a Claws "
 "Mail nem tartalmaz TLS támogatást.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Szerverbejelentkezések letiltva.\n"
 
 # src/summaryview.c:2611
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Üzenet vétele..."
 
 # src/imap.c:870 src/imap.c:922
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "törölt jelzés nem állítható be: %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"
@@ -8852,7 +8852,7 @@ msgid "This file already exists. Do you want to overwrite it?"
 msgstr "A fájl már létezik. Felülírod?"
 
 # src/mimeview.c:803 src/summaryview.c:2669
-#: 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 "Felülírás"
@@ -8913,7 +8913,7 @@ msgid "Compose _new message"
 msgstr "Új üze_net írása"
 
 # src/mainwindow.c:1619 src/messageview.c:115
-#: 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 - Üzenetnézet"
 
@@ -8954,68 +8954,68 @@ msgstr ""
 "Nem ajánlott az olvasási visszaigazolás elküldése."
 
 # src/summaryview.c:2611
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Üzenet vétele (%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 "%s nem fejthető vissza"
 
-#: 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 ""
 "Az üzenet nem felel meg a MIME szabványnak, ezért rosszul jelenhet meg."
 
 # src/mimeview.c:798 src/summaryview.c:2664
-#: 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 "Mentés másként"
 
 # src/mimeview.c:804 src/summaryview.c:2670
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Létező fájl felülírása?"
 
 # src/summaryview.c:2677
-#: 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 "'%s' fájl nem menthető el."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Összes %s megjelenítése."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Csak a szöveg első megabájtja jelenik meg."
 
-#: 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 ""
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Az üzenet visszaigazolást kér."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Ez az üzenet visszaigazolást kér."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Visszaigazolás küldése"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -9024,7 +9024,7 @@ msgstr ""
 "és törölve lesz a szerverről."
 
 # src/compose.c:5094
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -9033,15 +9033,15 @@ msgstr ""
 "Az üzenet csak részben érkezett meg.\n"
 "%s"
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Kijelölés letöltésre"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Kjelölés törlésre"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -9052,12 +9052,12 @@ msgstr ""
 
 # src/addressadd.c:203 src/addressbook.c:490 src/editaddress.c:196
 # src/editaddress.c:785 src/editaddress.c:850 src/editgroup.c:256
-#: 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 "Kijelölés visszavonása"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -9066,11 +9066,11 @@ msgstr ""
 "Az üzenet részben lett letöltve,\n"
 "%s - és törölve lesz"
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Visszaigazolás értesítés"
 
-#: 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"
@@ -9093,22 +9093,22 @@ msgstr ""
 # src/prefs_display_header.c:192 src/prefs_summary_column.c:310
 # src/prefs_template.c:259 src/progressdialog.c:77 src/select-keys.c:323
 # src/summaryview.c:588 src/summaryview.c:2671
-#: 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 "_Mégsem"
 
 # src/prefs_account.c:1138
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "Feljegyzés küldése"
 
 # src/compose.c:2362
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nem nyomtatható: az üzenet nem tartalmaz szöveget."
 
 # src/mainwindow.c:1230
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -9117,7 +9117,7 @@ msgstr ""
 "  Nincsenek üzenetek a mappában"
 
 # src/summaryview.c:342
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -9126,7 +9126,7 @@ msgstr ""
 "  Az üzenet törölve"
 
 # src/summaryview.c:342
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -9135,7 +9135,7 @@ msgstr ""
 "  Az üzenet törölve lett, vagy másik mappába került"
 
 # src/news.c:776 src/news.c:801
-#: 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 "Hiba történt a tanulás közben.\n"
@@ -9400,39 +9400,39 @@ msgid "couldn't select group: %s\n"
 msgstr "%s csoportot nem sikerült kiválasztani\n"
 
 # src/news.c:392 src/news.c:704
-#: 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 "%s csoportot nem tudom beállítani\n"
 
 # src/news.c:710
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "érvénytelen cikktartomány: %d - %d\n"
 
 # src/news.c:768 src/news.c:793
-#: 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 nem elérhető\n"
 
 # src/news.c:733
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Hírjegyzék fogadása %d - %d %s-b(ae)...\n"
 
 # src/news.c:736
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "xover nem elérhető\n"
 
 # src/news.c:750
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "érvénytelen hírjegyzék sor\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"
@@ -10450,7 +10450,7 @@ msgstr "Az ennél nagyobb üzenetek nem lesznek ellenőrizve"
 
 #: 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"
 
@@ -11047,7 +11047,7 @@ msgstr "A fájlban szereplő stíluslap lesz alkalmazva minden HTML részre"
 #: 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 "_Böngészés"
@@ -11365,7 +11365,7 @@ msgstr "GData bővítmény: Azonosítás frissítési kísérlet\n"
 
 # src/prefs_account.c:1138
 #: 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 "Azonosítás"
 
@@ -11550,7 +11550,7 @@ msgid "Cache refresh interval"
 msgstr "Gyorsítótár frissítési időköze"
 
 # src/sourcewindow.c:143
-#: 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 "óra"
@@ -11935,7 +11935,7 @@ msgstr ""
 #: 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 "Felhasználó-azonosító"
 
@@ -11944,20 +11944,20 @@ msgstr "Felhasználó-azonosító"
 #: 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 "Jelszó"
 
 # src/prefs_account.c:1161
-#: 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 "Azonosítási eljárás"
 
 # src/prefs_account.c:1171
-#: 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 "Automatikus"
 
@@ -12949,7 +12949,7 @@ msgstr "('0' esetén a jelmondat az egész munkafolyamatra tárolódik)"
 
 # src/prefs_common.c:950
 #: 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 "perc"
@@ -13614,8 +13614,8 @@ msgid "Refresh"
 msgstr "Frissítés"
 
 # src/colorlabel.c:51
-#: 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 "Böngészés"
@@ -13914,7 +13914,7 @@ msgstr "Hozzászólások vétele, ha nem régebbiek, mint"
 # src/prefs_account.c:985
 #: 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 "nap"
 
@@ -14568,7 +14568,7 @@ msgid "Next month"
 msgstr "Következő hónap"
 
 #: 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"
 
@@ -15030,15 +15030,15 @@ msgstr "E héten"
 msgid "Later"
 msgstr "Később"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Elfogadva:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Elutasítva:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Feltételesen elfogadva:"
 
@@ -15523,13 +15523,13 @@ msgid "TOP command unsupported\n"
 msgstr "A TOP parancs nem támogatott\n"
 
 # src/prefs_account.c:957 src/prefs_account.c:1495
-#: 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:817 src/prefs_account.c:1512 src/prefs_account.c:1674
-#: 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"
 
@@ -15646,47 +15646,47 @@ msgid "Account%d"
 msgstr "%d fiók"
 
 # src/prefs_common.c:897
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Helyi"
 
 # src/prefs_account.c:1037
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Alapértelmezett Bejövő"
 
 # src/prefs_account.c:1060
-#: 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 "A szűretlen üzenetek e mappába kerülnek"
 
 # src/prefs_account.c:834
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Biztonságos azonosítás használata (APOP)"
 
 # src/prefs_account.c:965
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Üzenetek törlése a szerverről fogadás után"
 
 # src/prefs_account.c:976
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Törlés"
 
 # src/prefs_account.c:1002
-#: 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 nap és 0 óra: eltávolítás azonnal"
 
 # src/prefs_account.c:1015
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Vételi mérethatár"
 
-#: 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."
@@ -15695,92 +15695,92 @@ msgstr ""
 "Kijelölésükkor teljesen letöltheted, vagy törölheted őket."
 
 # src/prefs_account.c:1529
-#: 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_common.c:971
-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr "Letöltendő cikkek maximális száma"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "0 megadása esetén korlátlan"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Egyszerű szöveg"
 
 # src/prefs_account.c:1685
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "IMAP szerver könyvtár"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(általában üres)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Csak feliratkozott mappák megjelenítése"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Sávszélesség-kímélő mód (a távoli címkék vételének tiltása)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "Kisebb sávszélességet használ, de lassabb lehet, szervertől függően."
 
 # src/prefs_account.c:1029
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Üzenetek szűrése fogadás közben"
 
 # src/prefs_account.c:1029
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Szűrés bővítmények használatával fogadás közben"
 
 # src/prefs_account.c:1067
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'E-mail fogadása' ellenőrzi, van-e új üzenet ezen a címen"
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241
-#: 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 "Fejléc"
 
 # src/summaryview.c:2351
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Üzenet-azonosító generálása"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Fiók e-mail cím elküldése az üzenet-azonosítóban"
 
 # src/prefs_account.c:1126
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "User-Agent fejléc hozzáadása"
 
 # src/prefs_account.c:1126
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Egyéni fejléc hozzáadása"
 
 # src/prefs_account.c:1146
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP azonosítás (SMTP AUTH)"
 
 # src/prefs_account.c:1221
-#: 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."
@@ -15789,57 +15789,57 @@ msgstr ""
 "azonosító és jelszó lesz használva."
 
 # src/prefs_account.c:1230
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Küldés előtt azonosítás POP3-mal"
 
 # src/prefs_account.c:1161
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "POP azonosítás időtúllépés: "
 
 # src/compose.c:3964 src/prefs_common.c:1186
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Aláírás"
 
 # src/prefs_common.c:1782
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Aláírás automatikus beszúrása"
 
 # src/prefs_common.c:1197
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Aláírás elválasztó"
 
 # src/prefs_common.c:883 src/prefs_common.c:1046
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Parancs kimenete"
 
 # src/prefs_account.c:1276
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Az alábbi címek automatikus beállítása"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Helyesírás-ellenőrzés szótárai"
 
-#: 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 "Alapértelmezett szótár"
 
-#: 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 "Alapértelmezett alternatív szótár"
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134
-#: 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
@@ -15847,147 +15847,147 @@ msgid "Compose"
 msgstr "Új üzenet"
 
 # src/mainwindow.c:1840 src/prefs_common.c:1278
-#: 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 "Válasz"
 
 # src/mainwindow.c:1857
-#: 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 "Továbbítás"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Alapértelmezett titkosítás"
 
 # src/grouplistdialog.c:216
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Mindig aláírja az üzeneteket"
 
 # src/prefs_account.c:965
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Mindig titkosítja az üzeneteket"
 
 # src/prefs_account.c:965
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Mindig aláírja az üzeneteket aláírt üzenetekre válaszoláskor"
 
 # src/prefs_account.c:965
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Mindig titkosítja az üzeneteket titkosított üzenetekre válaszoláskor"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Egyúttal az elküldött üzenetek titkosítása a saját kulcsoddal"
 
 # src/prefs_common.c:1065
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Titkosított üzenetek mentése titkosítás nélkül"
 
 # src/prefs_account.c:1503 src/prefs_account.c:1520 src/prefs_account.c:1536
 # src/prefs_account.c:1554
-#: 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 "SSL használatának mellőzése"
 
 # src/prefs_account.c:1506
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "SSL használata POP3 kapcsolathoz"
 
 # src/prefs_account.c:1509 src/prefs_account.c:1526 src/prefs_account.c:1560
-#: 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 "STARTTLS parancs használata SSL kapcsolathoz"
 
 # src/prefs_account.c:1523
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL használata IMAP4 kapcsolathoz"
 
 # src/prefs_account.c:1544
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "SSL használata NNTP kapcsolathoz"
 
 # src/prefs_account.c:1546
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Küldés (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "SSL használatának mellőzése (de szükség esetén STARTTLS használata)"
 
 # src/prefs_account.c:1557
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "SSL használata SMTP kapcsolathoz"
 
 # src/summaryview.c:2677
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Ügyfél-tanúsítványok"
 
 # src/prefs_account.c:879
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Tanúsítvány fogadáshoz"
 
-#: 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 "Ügyfél tanúsítvány fájl PKCS12 vagy PEM fájlként"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Tanúsítvány küldéshez"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Érvényes SSL tanúsítványok automatikus elfogadása"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Nem blokkoló SSL használata"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Kapcsold ki, ha problémák vannak az SSL kapcsolódással"
 
 # src/prefs_account.c:1644
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP port"
 
 # src/prefs_account.c:1650
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "POP3 port"
 
 # src/prefs_account.c:1656
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 
 # src/prefs_account.c:1662
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "NNTP port"
 
 # src/prefs_account.c:1667
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Domain név"
 
-#: 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."
@@ -15995,135 +15995,135 @@ msgstr ""
 "Ez a domain név lesz használva a generált Üzenet-azonosítókban, és az SMTP "
 "szerverekhez kapcsolódáskor."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "A szerverrel történő kommunikációhoz használandó parancs"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Több címre is elküldött üzenetek megjelölése olvasottként és színnel:"
 
 # src/prefs_account.c:1739
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Elküldött üzenetek mentése ide:"
 
 # src/prefs_account.c:1743
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Várakozó üzenetek mentése ide:"
 
 # src/prefs_account.c:1741
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Vázlatok mentése ide:"
 
 # src/prefs_account.c:1743
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Törölt üzenetek ide:"
 
 # src/prefs_account.c:1803
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Fiók neve nincs megadva."
 
 # src/prefs_account.c:1807
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "E-mail cím nincs megadva."
 
 # src/prefs_account.c:1812
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "SMTP szerver nincs megadva."
 
 # src/prefs_account.c:1817
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Felhasználói azonosító nincs megadva."
 
 # src/prefs_account.c:1822
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "POP3 szerver nincs megadva."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Az alapértelmezett 'Bejövő üzenetek' mappa nem létezik."
 
 # src/prefs_account.c:1827
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 szerver nincs megadva."
 
 # src/prefs_account.c:1832
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "NNTP szerver nincs megadva."
 
 # src/prefs_account.c:1803
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "helyi postaláda fájl nincs megadva."
 
 # src/prefs_account.c:1807
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "üzenet parancs nincs megadva."
 
 # src/prefs_account.c:670 src/prefs_common.c:808
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Fogadás"
 
 # src/prefs_template.c:373
-#: 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 "Sablonok"
 
 # src/prefs_account.c:677 src/prefs_common.c:821
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Titkosítás"
 
 # src/prefs_account.c:684
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Haladó"
 
 # src/prefs_account.c:622
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Új fiók beállításai"
 
 # src/prefs_account.c:627
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Fiók beállításai"
 
 # src/prefs_account.c:762
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Sikertelen (hibás cím)"
 
 # src/editjpilot.c:225
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Aláírás fájl kiválasztása"
 
 # src/summaryview.c:2677
-#: 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 "Tanúsítványfájl kiválasztása"
 
 # src/account.c:552 src/prefs_account.c:803
-#: 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 (bővítmény nincs betöltve)"
@@ -16409,15 +16409,15 @@ msgstr "Jelenlegi műveletek"
 msgid "Action string is not valid."
 msgstr "A művelet karaktersorozat nem érvényes."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hello,\\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\\n%f írta:\\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"
@@ -16425,7 +16425,7 @@ msgstr ""
 "\\n\\nTovábbított üzenet:\\n\\n?d{Dátum: %d\\n}?f{Feladó: %f\\n}?t{Címzett: "
 "%t\\n}?c{Másolatot kap: %c\\n}?n{Hírcsoportok: %n\\n}?s{Tárgy: %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/id_ID.po b/po/id_ID.po
index f235b62..69fa09a 100644
--- a/po/id_ID.po
+++ b/po/id_ID.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2014-05-25 12:10+0700\n"
 "Last-Translator: M.Sulchan Darmawan <bleketux at gmail.com>\n"
 "Language-Team: M.Sulchan Darmawan <bleketux at gmail.com>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.6.5\n"
 
-#: src/account.c:392 src/account.c:459
+#: src/account.c:396 src/account.c:463
 #, fuzzy
 msgid ""
 "Some composing windows are open.\n"
@@ -30,15 +30,15 @@ msgstr ""
 "Silahkan tutup semua jendela untuk menulis sebelum melakukan penyuntingan "
 "akun."
 
-#: src/account.c:437
+#: src/account.c:441
 msgid "Can't create folder."
 msgstr "Tidak dapat membuat direktori."
 
-#: src/account.c:724
+#: src/account.c:728
 msgid "Edit accounts"
 msgstr "Sunting akun"
 
-#: 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 "
@@ -48,77 +48,78 @@ msgstr ""
 "urutan, kotak cek menunjukkan akun yang akan diambil. Tulisan tebal "
 "menunjukkan akun standar."
 
-#: src/account.c:812
+#: src/account.c:816
 msgid " _Set as default account "
 msgstr "Pasang _Sebagai akun standar"
 
-#: src/account.c:904
+#: src/account.c:908
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Akun dengan direktori remot tidak dapat di salin."
 
-#: src/account.c:911
+#: src/account.c:915
 #, c-format
 msgid "Copy of %s"
 msgstr "Salinan dari %s"
 
-#: src/account.c:1071
+#: src/account.c:1075
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Anda akan menghapus akun '%s', Yakin ?"
 
-#: src/account.c:1073
+#: src/account.c:1077
 msgid "(Untitled)"
 msgstr "(Tidak ada judul)"
 
-#: src/account.c:1074
+#: src/account.c:1078
 msgid "Delete account"
 msgstr "Hapus akun"
 
-#: src/account.c:1544
+#: src/account.c:1562
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1550
+#: src/account.c:1568
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ambil Surat' mengambil surat dari akun terpilih"
 
-#: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
-#: src/editaddress.c:1320 src/editaddress.c:1340
+#: 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:428
-#: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
-#: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
+#: 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: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 "Nama"
 
-#: src/account.c:1565 src/prefs_account.c:1102 src/prefs_account.c:4060
+#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1573 src/ssl_manager.c:102
+#: src/account.c:1591 src/ssl_manager.c:100
 msgid "Server"
 msgstr "Server"
 
-#: src/action.c:383
+#: src/action.c:382
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Tidak dapat mengambil berkas pesan %d"
 
-#: src/action.c:420
+#: src/action.c:419
 msgid "Could not get message part."
 msgstr "Tidak dapat mengambil bagian pesan."
 
-#: src/action.c:437
+#: src/action.c:436
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Tidak dapat mengambil sebagian dari pesan multibagian: %s"
 
-#: src/action.c:609
+#: src/action.c:608
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -127,11 +128,11 @@ msgstr ""
 "Aksi terpilih tidak dapat digunakan pada jendela untuk menulis\n"
 "karena mengandung %%f, %%F, %%as atau %%p."
 
-#: src/action.c:721
+#: src/action.c:720
 msgid "There is no filtering action set"
 msgstr "Tidak ada aksi saring yang di pasang"
 
-#: src/action.c:723
+#: src/action.c:722
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -140,7 +141,7 @@ msgstr ""
 "Aksi penyaringan salah:\n"
 "%s"
 
-#: src/action.c:988
+#: src/action.c:987
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -151,34 +152,34 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:990 src/ldaputil.c:326 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:1805
-#: src/plugins/vcalendar/vcal_folder.c:1809
-#: src/plugins/vcalendar/vcal_folder.c:1820
-#: src/plugins/vcalendar/vcal_folder.c:1823 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: 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 "Kesalahan tidak diketahui"
 
-#: src/action.c:1208 src/action.c:1373
+#: src/action.c:1207 src/action.c:1372
 msgid "Completed"
 msgstr "Selesai"
 
-#: src/action.c:1244
+#: src/action.c:1243
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Menjalankan: %s\n"
 
-#: src/action.c:1248
+#: src/action.c:1247
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Diakhiri: %s\n"
 
-#: src/action.c:1281
+#: src/action.c:1280
 msgid "Action's input/output"
 msgstr "Aksi masukan/keluaran"
 
-#: src/action.c:1609
+#: src/action.c:1608
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -189,11 +190,11 @@ msgstr ""
 "('%%h' akan diganti dengan argumen)\n"
 " %s"
 
-#: src/action.c:1614
+#: src/action.c:1613
 msgid "Action's hidden user argument"
 msgstr "Aksi menyembunyikan argumen pengguna"
 
-#: src/action.c:1618
+#: src/action.c:1617
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -204,7 +205,7 @@ msgstr ""
 "('%%u' akan diganti dengan argumen)\n"
 " %s"
 
-#: src/action.c:1623
+#: src/action.c:1622
 msgid "Action's user argument"
 msgstr "Aksi argumen pengguna"
 
@@ -223,7 +224,7 @@ msgstr "Tidak dapat ditempelkan. Buku alamat tujuan bermodus readonly"
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "Tidak dapat memindahkan direktori ke salah satu anaknya."
 
-#: src/addr_compl.c:685 src/addressbook.c:4873
+#: src/addr_compl.c:689 src/addressbook.c:4946
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Kelompok"
@@ -294,9 +295,9 @@ msgid ""
 "with the default set?"
 msgstr "Anda akan mengganti semua nama atribut dengan standarnya, yakin ?"
 
-#: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
-#: src/addressbook.c:480 src/edittags.c:272
-#: src/plugins/archive/archiver_gtk.c:1182 src/prefs_actions.c:1090
+#: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
+#: src/addressbook.c:483 src/edittags.c:272
+#: src/plugins/archive/archiver_gtk.c:1186 src/prefs_actions.c:1090
 #: src/prefs_filtering.c:1693 src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_Hapus"
@@ -357,7 +358,7 @@ msgid "Duplicate email addresses"
 msgstr "Duplikasi alamat email"
 
 #: 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 "Alamat"
 
@@ -365,11 +366,11 @@ msgstr "Alamat"
 msgid "Address book path"
 msgstr "Lokasi buku alamat"
 
-#: src/addrduplicates.c:793 src/addressbook.c:1433 src/addressbook.c:1486
+#: src/addrduplicates.c:793 src/addressbook.c:1438 src/addressbook.c:1491
 msgid "Delete address(es)"
 msgstr "Hapus alamat"
 
-#: src/addrduplicates.c:794 src/addressbook.c:1487
+#: src/addrduplicates.c:794 src/addressbook.c:1492
 msgid "Really delete the address(es)?"
 msgstr "Yakin akan menghapus alamat?"
 
@@ -377,7 +378,7 @@ msgstr "Yakin akan menghapus alamat?"
 msgid "Delete address"
 msgstr "Hapus alamat"
 
-#: src/addrduplicates.c:843 src/addressbook.c:1434
+#: src/addrduplicates.c:843 src/addressbook.c:1439
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Data alamat ini bermodus readonly dan tidak dapat dihapus"
 
@@ -389,8 +390,8 @@ msgstr "Tambahkan ke buku alamat"
 msgid "Contact"
 msgstr "Kontak"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
-#: src/editaddress.c:1130 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 "Penanda"
 
@@ -398,276 +399,272 @@ msgstr "Penanda"
 msgid "Select Address Book Folder"
 msgstr "Pilih Direktori Buku Alamat"
 
-#: src/addressadd.c:485 src/editaddress.c:1582 src/headerview.c:280
-#: src/textview.c:2042
-#, c-format
-msgid ""
-"Failed to save image: \n"
-"%s"
-msgstr ""
-"Gagal menyimpan gambar: \n"
-"%s"
-
-#: src/addressadd.c:535 src/addressbook.c:3209 src/addressbook.c:3260
+#: src/addressadd.c:534 src/addressbook.c:3216 src/addressbook.c:3267
 msgid "Add address(es)"
 msgstr "Tambah alamat"
 
-#: src/addressadd.c:536
+#: src/addressadd.c:535
 msgid "Can't add the specified address"
 msgstr "Tidak dapat menambahkan alamat tersebut"
 
-#: src/addressbook.c:126 src/addressbook.c:4861 src/editaddress.c:1052
-#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:518
-#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:763
+#: 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 "Alamat Email"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:405
 msgid "_Book"
 msgstr "_Buku"
 
-#: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
-#: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
+#: 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 "_Sunting"
 
-#: src/addressbook.c:404 src/compose.c:586 src/mainwindow.c:509
-#: src/messageview.c:213
+#: src/addressbook.c:407 src/compose.c:591 src/mainwindow.c:515
+#: src/messageview.c:212
 msgid "_Tools"
 msgstr "_Pengaturan"
 
-#: src/addressbook.c:405 src/compose.c:587 src/mainwindow.c:511
-#: src/messageview.c:214
+#: src/addressbook.c:408 src/compose.c:592 src/mainwindow.c:517
+#: src/messageview.c:213
 msgid "_Help"
 msgstr "_Bantuan"
 
-#: src/addressbook.c:408 src/addressbook.c:465
+#: src/addressbook.c:411 src/addressbook.c:468
 msgid "New _Book"
 msgstr "_Buku Baru"
 
-#: src/addressbook.c:409 src/addressbook.c:466
+#: src/addressbook.c:412 src/addressbook.c:469
 msgid "New _Folder"
 msgstr "_Direktori Baru"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:413
 msgid "New _vCard"
 msgstr "_vCard Baru"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:417
 msgid "New _JPilot"
 msgstr "_JPilot Baru"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 msgid "New LDAP _Server"
 msgstr "_Server LDAP Baru"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:424
 msgid "_Edit book"
 msgstr "_Sunting buku"
 
-#: src/addressbook.c:422
+#: src/addressbook.c:425
 msgid "_Delete book"
 msgstr "_Hapus buku"
 
-#: src/addressbook.c:424 src/compose.c:598
+#: 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 "_Simpan"
 
-#: src/addressbook.c:425 src/compose.c:602 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 "_Tutup"
 
-#: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:227
+#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
 msgid "_Select all"
 msgstr "_Pilih Semua"
 
-#: src/addressbook.c:430 src/addressbook.c:469 src/addressbook.c:485
+#: src/addressbook.c:433 src/addressbook.c:472 src/addressbook.c:488
 msgid "C_ut"
 msgstr "P_otong"
 
-#: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
+#: src/compose.c:615 src/mainwindow.c:546 src/messageview.c:225
+#: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Salin"
 
-#: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:616 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Tempel"
 
-#: src/addressbook.c:437 src/addressbook.c:482
+#: src/addressbook.c:440 src/addressbook.c:485
 msgid "New _Address"
 msgstr "_Alamat Baru"
 
-#: src/addressbook.c:438 src/addressbook.c:467 src/addressbook.c:483
+#: src/addressbook.c:441 src/addressbook.c:470 src/addressbook.c:486
 msgid "New _Group"
 msgstr "_Kelompok Baru"
 
-#: src/addressbook.c:440 src/addressbook.c:489
+#: src/addressbook.c:443 src/addressbook.c:492
 msgid "_Mail To"
 msgstr "_Surat Untuk"
 
-#: src/addressbook.c:444
+#: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr "Impor berkas _LDIF,,,"
 
-#: src/addressbook.c:445
+#: src/addressbook.c:448
 msgid "Import M_utt file..."
 msgstr "Impor berkas M_utt..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:449
 msgid "Import _Pine file..."
 msgstr "Impir berkas _Pine..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:451
 msgid "Export _HTML..."
 msgstr "Ekspor _HTML..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:452
 msgid "Export LDI_F..."
 msgstr "Ekspor LDI_F..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:454
 msgid "Find duplicates..."
 msgstr "Cari duplikasi..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:455
 msgid "Edit custom attributes..."
 msgstr "Sunting atribut buatan..."
 
-#: src/addressbook.c:455 src/compose.c:690 src/mainwindow.c:803
-#: src/messageview.c:339
+#: src/addressbook.c:458 src/compose.c:695 src/mainwindow.c:813
+#: src/messageview.c:338
 msgid "_About"
 msgstr "_Tentang"
 
-#: src/addressbook.c:491
+#: src/addressbook.c:494
 msgid "_Browse Entry"
 msgstr "_Jelajahi entri"
 
-#: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:115
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
-#: src/plugins/pgpcore/sgpgme.c:168 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/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
+#: 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 "Tidak diketahui"
 
-#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:122
+#: src/addressbook.c:514 src/addressbook.c:533 src/importldif.c:121
 msgid "Success"
 msgstr "Berhasil"
 
-#: src/addressbook.c:512 src/importldif.c:123
+#: src/addressbook.c:515 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Argumen buruk"
 
-#: src/addressbook.c:513 src/importldif.c:124
+#: src/addressbook.c:516 src/importldif.c:123
 msgid "File not specified"
 msgstr "Berkas tidak disebutkan"
 
-#: src/addressbook.c:514 src/importldif.c:125
+#: src/addressbook.c:517 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Kesalahan dalam membuka berkas"
 
-#: src/addressbook.c:515 src/importldif.c:126
+#: src/addressbook.c:518 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Kesalahan dalam membaca berkas"
 
-#: src/addressbook.c:516 src/importldif.c:127
+#: src/addressbook.c:519 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Akhir berkas telah dicapai"
 
-#: src/addressbook.c:517 src/importldif.c:128
+#: src/addressbook.c:520 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Kesalahan mengalokasikan memori"
 
-#: src/addressbook.c:518 src/importldif.c:129
+#: src/addressbook.c:521 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Format berkas buruk"
 
-#: src/addressbook.c:519 src/importldif.c:130
+#: src/addressbook.c:522 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Kesalahan dalam menulis ke berkas"
 
-#: src/addressbook.c:520 src/importldif.c:131
+#: src/addressbook.c:523 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Kesalahan dalam membuka direktori"
 
-#: src/addressbook.c:521 src/importldif.c:132
+#: src/addressbook.c:524 src/importldif.c:131
 msgid "No path specified"
 msgstr "Lokasi tidak disebutkan"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:534
 msgid "Error connecting to LDAP server"
 msgstr "Kesalahan dalam menghubungi server LDAP"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:535
 msgid "Error initializing LDAP"
 msgstr "Kesalahan dalam menginisialisasi LDAP"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:536
 msgid "Error binding to LDAP server"
 msgstr "Kesalahan dalam bergabung ke server LDAP"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:537
 msgid "Error searching LDAP database"
 msgstr "Kesalahan dalam mencari basis data LDAP"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:538
 msgid "Timeout performing LDAP operation"
 msgstr "Kehabisan waktu dalam menjalankan perintah LDAP"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:539
 msgid "Error in LDAP search criteria"
 msgstr "Keslahan dalam kriteria pencarian LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:540
 msgid "No LDAP entries found for search criteria"
 msgstr ""
 "Tidak ada unsur LDAP yang ditemukan berdasarkan kriteria pencarian tersebut"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:541
 msgid "LDAP search terminated on request"
 msgstr "Pencarian LDAP dihentikan berdasar permintaan"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:542
 msgid "Error starting TLS connection"
 msgstr "Kesalahan dalam memulai hubungan TLS"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:543
 msgid "Distinguished Name (dn) is missing"
 msgstr "Nama yang berbeda hilang"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:544
 msgid "Missing required information"
 msgstr "Informasi yang dibutuhkan tidak ada"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:545
 msgid "Another contact exists with that key"
 msgstr "Kontak sudah ada untuk kunci tersebut"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:546
 msgid "Strong(er) authentication required"
 msgstr "Dibutuhkan Otentifikasi yang (lebih) kuat"
 
-#: src/addressbook.c:910
+#: src/addressbook.c:913
 msgid "Sources"
 msgstr "Sumber"
 
-#: src/addressbook.c:914 src/prefs_matcher.c:632 src/prefs_other.c:475
+#: 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 "Buku alamat"
 
-#: src/addressbook.c:1109
-msgid "Lookup name:"
-msgstr "Nama pencarian:"
+#: src/addressbook.c:1112 src/editldap.c:780
+msgid "Search"
+msgstr "Pencarian"
 
-#: src/addressbook.c:1478
+#: src/addressbook.c:1483
 msgid "Delete group"
 msgstr "Hapus kelompok"
 
-#: src/addressbook.c:1479
+#: src/addressbook.c:1484
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -675,26 +672,26 @@ msgstr ""
 "Yakin akan menghapus kelompok ini?\n"
 "Alamat yang ada didalamnya tidak akan hilang"
 
-#: src/addressbook.c:2190
+#: src/addressbook.c:2195
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Tidak dapat ditempelkan. Buku alamat tujuan bermodus readonly"
 
-#: src/addressbook.c:2200
+#: src/addressbook.c:2205
 msgid "Cannot paste into an address group."
 msgstr "Tidak dapat ditempelkan ke kelompok alamat"
 
-#: src/addressbook.c:2906
+#: src/addressbook.c:2913
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Apakah anda ingin menghapus hasil permintaan dan alamat di '%s'?"
 
-#: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
+#: 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 "Hapus"
 
-#: src/addressbook.c:2918
+#: src/addressbook.c:2925
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -703,21 +700,22 @@ msgstr ""
 "Apakah anda ingin menghapus '%s'? jika anda menghapus direktorinya saja, "
 "alamat yang ada didalamnya akan dipindahkan ke direktori diatasnya."
 
-#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:157
-#: src/plugins/vcalendar/vcal_folder.c:1968
+#: 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:1984
 msgid "Delete folder"
 msgstr "Hapus direktori"
 
-#: src/addressbook.c:2922
-msgid "+Delete _folder only"
+#: src/addressbook.c:2929
+#, fuzzy
+msgid "Delete _folder only"
 msgstr "+Hapus _direktori saja"
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2929
 msgid "Delete folder and _addresses"
 msgstr "Hapus direktori dan alamatnya"
 
-#: src/addressbook.c:2933
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -726,7 +724,7 @@ msgstr ""
 "Apakah anda akan menghapus '%s'?\n"
 "Alamat yang ada didalamnya tidak akan hilang."
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2947
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -735,28 +733,28 @@ msgstr ""
 "Apakah anda akan menghapus '%s'?\n"
 "Alamat yang ada didalamnya akan hilang."
 
-#: src/addressbook.c:3054
+#: src/addressbook.c:3061
 #, c-format
 msgid "Search '%s'"
 msgstr "Cari '%s'"
 
-#: src/addressbook.c:3192 src/addressbook.c:3241
+#: src/addressbook.c:3199 src/addressbook.c:3248
 msgid "New Contacts"
 msgstr "Kontak Baru"
 
-#: src/addressbook.c:4022
+#: src/addressbook.c:4087
 msgid "New user, could not save index file."
 msgstr "Pengguna baru, tidak dapat menyimpan berkas indeks."
 
-#: src/addressbook.c:4026
+#: src/addressbook.c:4091
 msgid "New user, could not save address book files."
 msgstr "Pengguna baru, tidak dapat menyimpan berkas buku alamat."
 
-#: src/addressbook.c:4036
+#: src/addressbook.c:4101
 msgid "Old address book converted successfully."
 msgstr "Buku alamat lama berhasil di konversi."
 
-#: src/addressbook.c:4041
+#: src/addressbook.c:4106
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -764,7 +762,7 @@ msgstr ""
 "Buku alamat lama telah dikonversi,\n"
 "tidak dapat menyimpan berkas indeks alamat baru."
 
-#: src/addressbook.c:4054
+#: src/addressbook.c:4119
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -772,7 +770,7 @@ msgstr ""
 "Tidak dapat mengkonversi buku alamat,\n"
 "tapi berkas buku alamat baru yang kosong telah dibuat."
 
-#: src/addressbook.c:4060
+#: src/addressbook.c:4125
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -780,7 +778,7 @@ msgstr ""
 "Tidak dapat mengkonversi buku alamat,\n"
 "tidak dapat menyimpan berkas indeks alamat baru."
 
-#: src/addressbook.c:4065
+#: src/addressbook.c:4130
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -788,57 +786,62 @@ msgstr ""
 "Tidak dapat mengkonversi buku alamat\n"
 "dan tidak dapat membuat berkas buku alamat baru."
 
-#: src/addressbook.c:4072 src/addressbook.c:4078
+#: src/addressbook.c:4137 src/addressbook.c:4143
 msgid "Addressbook conversion error"
 msgstr "Kesalahan dalam mengkonversi buku alamat"
 
-#: src/addressbook.c:4192
+#: src/addressbook.c:4257
 msgid "Addressbook Error"
 msgstr "Buku alamat bermasalah"
 
-#: src/addressbook.c:4193
+#: src/addressbook.c:4258
 msgid "Could not read address index"
 msgstr "Tidak dapat membaca indeks alamat"
 
-#: src/addressbook.c:4524
+#: src/addressbook.c:4589
 msgid "Busy searching..."
 msgstr "Sibuk mencari..."
 
-#: src/addressbook.c:4825
+#: src/addressbook.c:4898 src/prefs_send.c:188
 msgid "Interface"
 msgstr "Antarmuka"
 
-#: src/addressbook.c:4837 src/addressbook_foldersel.c:182 src/exphtmldlg.c:372
-#: src/expldifdlg.c:389 src/exporthtml.c:984 src/importldif.c:658
-msgid "Address Book"
+#: src/addressbook.c:4910
+#, fuzzy
+msgid "Address Books"
 msgstr "Buku Alamat"
 
-#: src/addressbook.c:4849
+#: src/addressbook.c:4922
 msgid "Person"
 msgstr "Orang"
 
-#: src/addressbook.c:4885 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 "Direktori"
 
-#: src/addressbook.c:4897
+#: src/addressbook.c:4970
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4909 src/addressbook.c:4921
+#: src/addressbook.c:4982 src/addressbook.c:4994
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4933
+#: src/addressbook.c:5006
 msgid "LDAP servers"
 msgstr "Server LDAP"
 
-#: src/addressbook.c:4945
+#: src/addressbook.c:5018
 msgid "LDAP Query"
 msgstr "Permintaan LDAP"
 
-#: 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 "Buku Alamat"
+
+#: 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
@@ -846,127 +849,126 @@ msgstr "Permintaan LDAP"
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:443
-#: src/plugins/spamassassin/spamassassin_gtk.c:490
-#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1619 src/prefs_matcher.c:1626
-#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1636 src/prefs_matcher.c:2524
-#: src/prefs_matcher.c:2528
+#: src/plugins/spamassassin/spamassassin_gtk.c:442
+#: src/plugins/spamassassin/spamassassin_gtk.c:489
+#: src/plugins/spamassassin/spamassassin_gtk.c:612 src/prefs_matcher.c:675
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1625
+#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1635 src/prefs_matcher.c:2519
+#: src/prefs_matcher.c:2523
 msgid "Any"
 msgstr "Semua"
 
-#: src/addrgather.c:172
+#: src/addrgather.c:173
 msgid "Please specify name for address book."
 msgstr "Mohon cantumkan nama untuk buku alamat."
 
-#: src/addrgather.c:179
+#: src/addrgather.c:180
 msgid "No available address book."
 msgstr "Tidak ada buku alamat yang tersedia."
 
-#: src/addrgather.c:200
+#: src/addrgather.c:201
 msgid "Please select the mail headers to search."
 msgstr "Mohon pilih kepala surat untuk mencari."
 
-#: src/addrgather.c:207
+#: src/addrgather.c:208
 msgid "Collecting addresses..."
 msgstr "Mengumpulkan alamat..."
 
-#: src/addrgather.c:247
+#: src/addrgather.c:248
 msgid "address added by claws-mail"
 msgstr "alamat yang ditambahkan oleh claws-mail"
 
-#: src/addrgather.c:275
+#: src/addrgather.c:276
 msgid "Addresses collected successfully."
 msgstr "Alamat berhasil dikumpulkan."
 
-#: src/addrgather.c:357
+#: src/addrgather.c:351
 msgid "Current folder:"
 msgstr "Direktori aktif:"
 
-#: src/addrgather.c:368
+#: src/addrgather.c:362
 msgid "Address book name:"
 msgstr "Nama buku alamat:"
 
-#: src/addrgather.c:395
+#: src/addrgather.c:389
 msgid "Address book folder size:"
 msgstr "Ukuran direktori buku alamat:"
 
-#: src/addrgather.c:399 src/addrgather.c:409
+#: src/addrgather.c:393 src/addrgather.c:403
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr "Jumah maksimum setiap direktori untuk setiap buku alamat yang dibuat"
 
-#: src/addrgather.c:413
+#: src/addrgather.c:407
 msgid "Process these mail header fields"
 msgstr "Lakukan proses untuk kolom kepala surat"
 
-#: src/addrgather.c:432
+#: src/addrgather.c:426
 msgid "Include subfolders"
 msgstr "Termasuk subdirektori"
 
-#: src/addrgather.c:456 src/prefs_filtering_action.c:1425
+#: src/addrgather.c:450 src/prefs_filtering_action.c:1425
 msgid "Header Name"
 msgstr "Nama Kepala"
 
-#: src/addrgather.c:457
+#: src/addrgather.c:451
 msgid "Address Count"
 msgstr "Hitung Alamat"
 
-#: src/addrgather.c:567
+#: src/addrgather.c:561
 msgid "Header Fields"
 msgstr "Kolom Kepala"
 
-#: src/addrgather.c:568 src/exphtmldlg.c:659 src/expldifdlg.c:723
-#: src/importldif.c:1023
+#: src/addrgather.c:562 src/exphtmldlg.c:658 src/expldifdlg.c:722
+#: src/importldif.c:1022
 msgid "Finish"
 msgstr "Selesai"
 
-#: src/addrgather.c:626
+#: src/addrgather.c:620
 msgid "Collect email addresses from selected messages"
 msgstr "Kumpulkan alamat email dari pesan terpilih"
 
-#: src/addrgather.c:630
+#: src/addrgather.c:624
 msgid "Collect email addresses from folder"
 msgstr "Kumpulkan alamat email dari direktor"
 
-#: src/addrindex.c:123
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Alamat umum"
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Alamat pribadi"
 
-#: src/addrindex.c:130
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Alamat umum"
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Alamat pribadi"
 
-#: src/addrindex.c:1827
+#: src/addrindex.c:1830
 msgid "Address(es) update"
 msgstr "Pemutakhiran alamat"
 
-#: src/addrindex.c:1828
+#: src/addrindex.c:1831
 msgid "Update failed. Changes not written to Directory."
 msgstr "Pemutakhiran gagal. Perubahan tidak dituliskan ke direktori."
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Pemberitahuan"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:868
-#: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4871
+#: 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 "Peringatan"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5615 src/inc.c:669
-#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:270
+#: 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 "Kesalahan"
 
@@ -978,21 +980,18 @@ msgstr "_Lihat Catatan"
 msgid "Show this message next time"
 msgstr "Perlihatkan pesan ini di lain waktu"
 
-#: src/avatars.c:102
-#, fuzzy
-msgid "Failed to register avatars internal rendering hook"
-msgstr "Gagal untuk registrasi kaitan render gambar avatar"
-
 #: src/browseldap.c:218
 msgid "Browse Directory Entry"
 msgstr "Jelajahi Entri Direktori"
 
 #: src/browseldap.c:237
-msgid "Server Name :"
+#, fuzzy
+msgid "Server Name:"
 msgstr "Nama Server :"
 
 #: src/browseldap.c:247
-msgid "Distinguished Name (dn) :"
+#, fuzzy
+msgid "Distinguished Name (dn):"
 msgstr "Nama Lain :"
 
 #: src/browseldap.c:270
@@ -1003,39 +1002,39 @@ msgstr "Nama LDAP"
 msgid "Attribute Value"
 msgstr "Nilai Atribut"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Tidak ada"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "sebuah viewer"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "sebuah parser MIME"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "direktori"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "Penyaringan"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "sebuah antarmuka pibadi"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "sebuah pemberitahu"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "sebuah pengaturan"
 
-#: src/common/plugin.c:73
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "sesuatu"
 
@@ -1046,46 +1045,46 @@ msgid ""
 msgstr ""
 "Pengaya ini menyediakan %s (%s), yang telah disediakan oleh pengaya %s."
 
-#: src/common/plugin.c:436
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Pengaya telah dimuat"
 
-#: src/common/plugin.c:447
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Gagal mengalokasikan memori untuk Pengaya"
 
-#: src/common/plugin.c:481
+#: src/common/plugin.c:482
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Modul ini tidak berlisensi GPL v3 atau lisensi selanjutnya yang kompatibel."
 
-#: src/common/plugin.c:490
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Modul ini digunakan untuk Claws Mail GTK1."
 
-#: src/common/plugin.c:772
+#: 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 "Versi Claws Mail anda lebih baru dibandingkan versi pengaya '%s'."
 
-#: src/common/plugin.c:775
+#: src/common/plugin.c:772
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "Versi Claws Mail anda lebih baru dibandingkan versi pengaya tersebut."
 
-#: src/common/plugin.c:784
+#: src/common/plugin.c:781
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Versi Claws Mail anda terlalu lama untuk pengaya '%s'."
 
-#: src/common/plugin.c:786
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Versi Claws Mail anda terlalu lama untuk pengaya tersebut."
 
-#: src/common/session.c:183 src/imap.c:1189
+#: src/common/session.c:183 src/imap.c:1213
 msgid "SSL handshake failed\n"
 msgstr "Jalinan SSL gagal\n"
 
@@ -1097,736 +1096,728 @@ msgstr "Metode SMTP AUTH tidak tersedia\n"
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Metode SMTP AUTH yang dipilih tidak tersedia\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 "respon SMTP buruk\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 "terjadi kesalahan pada sesi 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 "terjadi kesalahan pada otentifikasi\n"
 
-#: src/common/smtp.c:589
+#: src/common/smtp.c:585
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Pesan terlalu besar (Ukuran maksimum adalah %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 "tidak dapat memulai sesi TLS\n"
 
-#: src/common/socket.c:573
+#: src/common/socket.c:569
 msgid "Socket IO timeout.\n"
 msgstr "Soket I/O mengalami waktuhabis.\n"
 
-#: src/common/socket.c:602
+#: src/common/socket.c:598
 msgid "Connection timed out.\n"
 msgstr "Sambungan habis waktu.\n"
 
-#: src/common/socket.c:630
-#, c-format
-msgid "%s: host lookup timed out.\n"
-msgstr "%s: waktu pencarian host habis.\n"
-
-#: src/common/socket.c:643
-#, c-format
-msgid "%s: unknown host.\n"
-msgstr "%s: host tidak diketahui.\n"
-
-#: src/common/socket.c:831
+#: src/common/socket.c:732
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: sambungan gagal (%s).\n"
 
-#: src/common/socket.c:1071
+#: src/common/socket.c:972
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: host tidak dikenal.\n"
 
-#: src/common/socket.c:1166
+#: src/common/socket.c:1064
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: pencarian host gagal (%s).\n"
 
-#: src/common/socket.c:1515
+#: src/common/socket.c:1368
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "ditulis pada 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 "Tidak dapat mengetahui status berkas sertifikat (%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 "Tidak dapat membaca berkas sertifikat 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 "Tidak dapat mengimpor berkas sertifikat P12 (%s)\n"
 
-#: src/common/ssl_certificate.c:630
+#: src/common/ssl_certificate.c:628
 msgid "Internal error"
 msgstr "Kesalahan internal"
 
-#: src/common/ssl_certificate.c:635
+#: src/common/ssl_certificate.c:633
 msgid "Uncheckable"
 msgstr "Tidak dapat ditandai"
 
-#: src/common/ssl_certificate.c:639
+#: src/common/ssl_certificate.c:637
 msgid "Self-signed certificate"
 msgstr "Sertifikat yang ditandatangani diri sendiri"
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:640
 msgid "Revoked certificate"
 msgstr "Sertifikat di revoke"
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:642
 msgid "No certificate issuer found"
 msgstr "Penerbit sertifikat tidak ditemukan"
 
-#: src/common/ssl_certificate.c:646
+#: src/common/ssl_certificate.c:644
 msgid "Certificate issuer is not a CA"
 msgstr "Penerbit sertifikat bukan CA"
 
-#: src/common/ssl_certificate.c:871
+#: src/common/ssl_certificate.c:869
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "Tidak dapat membuka berkas sertifikat %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 "Berkas sertifikat %s hilang (%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 "Tidak dapat membuka berkas kunci %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 "Berkas kunci %s hilang (%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 "Gagal untuk membaca berkas sertifikat 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 "Tidak dapat membuka berkas sertifikat 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 "Berkas Sertifikat P12 %s hilang (%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
 msgid "<not in certificate>"
 msgstr "<tidak pada sertifikat>"
 
-#: src/common/string_match.c:83
+#: src/common/string_match.c:81
 msgid "(Subject cleared by RegExp)"
 msgstr "(Subyek dibersihkan oleh RegExp)"
 
-#: src/common/utils.c:355
+#: src/common/utils.c:259
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:356
+#: src/common/utils.c:260
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:357
+#: src/common/utils.c:261
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:358
+#: src/common/utils.c:262
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4971
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Minggu"
 
-#: src/common/utils.c:4972
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Senin"
 
-#: src/common/utils.c:4973
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: src/common/utils.c:4974
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: src/common/utils.c:4975
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Kamis"
 
-#: src/common/utils.c:4976
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Jumat"
 
-#: src/common/utils.c:4977
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: src/common/utils.c:4979
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Januari"
 
-#: src/common/utils.c:4980
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Pebruari"
 
-#: src/common/utils.c:4981
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Maret"
 
-#: src/common/utils.c:4982
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "April"
 
-#: src/common/utils.c:4983
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mei"
 
-#: src/common/utils.c:4984
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juni"
 
-#: src/common/utils.c:4985
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juli"
 
-#: src/common/utils.c:4986
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agustus"
 
-#: src/common/utils.c:4987
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4988
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Oktober"
 
-#: src/common/utils.c:4989
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Nopember"
 
-#: src/common/utils.c:4990
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Desember"
 
-#: src/common/utils.c:4992
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Min"
 
-#: src/common/utils.c:4993
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Sen"
 
-#: src/common/utils.c:4994
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Sel"
 
-#: src/common/utils.c:4995
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Rab"
 
-#: src/common/utils.c:4996
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Kam"
 
-#: src/common/utils.c:4997
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Jum"
 
-#: src/common/utils.c:4998
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sab"
 
-#: src/common/utils.c:5000
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:5001
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Peb"
 
-#: src/common/utils.c:5002
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:5003
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:5004
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mei"
 
-#: src/common/utils.c:5005
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:5006
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:5007
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ags"
 
-#: src/common/utils.c:5008
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:5009
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:5010
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nop"
 
-#: src/common/utils.c:5011
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Des"
 
-#: src/common/utils.c:5022
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:5023
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:5024
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:5025
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "_Add..."
 msgstr "_Tambah..."
 
-#: src/compose.c:571 src/mh_gtk.c:369 src/plugins/mailmbox/plugin_gtk.c:302
-#: src/plugins/rssyl/rssyl_cb_menu.c:320
+#: 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 "_Hapus"
 
-#: src/compose.c:573 src/folderview.c:241
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Properti..."
 
-#: src/compose.c:580 src/mainwindow.c:508 src/messageview.c:212
+#: src/compose.c:585 src/mainwindow.c:514 src/messageview.c:211
 msgid "_Message"
 msgstr "_Pesan"
 
-#: src/compose.c:583
+#: src/compose.c:588
 msgid "_Spelling"
 msgstr "_Ejaan"
 
-#: src/compose.c:585 src/compose.c:652
+#: src/compose.c:590 src/compose.c:657
 msgid "_Options"
 msgstr "_Pilihan"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "S_end"
 msgstr "_Kirim"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "Send _later"
 msgstr "Kirim _nanti"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "_Attach file"
 msgstr "_Lampirkan berkas"
 
-#: src/compose.c:594
+#: src/compose.c:599
 msgid "_Insert file"
 msgstr "_Sisipkan berkas"
 
-#: src/compose.c:595
+#: src/compose.c:600
 msgid "Insert si_gnature"
 msgstr "Sisipkan _tanda tangan"
 
-#: src/compose.c:596
+#: src/compose.c:601
 msgid "_Replace signature"
 msgstr "_Ganti tandatangan"
 
-#: src/compose.c:600
+#: src/compose.c:605
 msgid "_Print"
 msgstr "_Cetak"
 
-#: src/compose.c:605
+#: src/compose.c:610 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Batal"
 
-#: src/compose.c:606
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Redo"
 
-#: src/compose.c:609
+#: src/compose.c:614 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Po_tong"
 
-#: src/compose.c:613
+#: src/compose.c:618
 msgid "_Special paste"
 msgstr "_Tempel spesial"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "As _quotation"
 msgstr "Sebagai _kutipan"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "_Wrapped"
 msgstr "_Penggalan"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "_Unwrapped"
 msgstr "_Non penggalan"
 
-#: src/compose.c:618 src/mainwindow.c:541
+#: src/compose.c:623 src/mainwindow.c:547
+#: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Pilih semu_a"
 
-#: src/compose.c:620
+#: src/compose.c:625
 msgid "A_dvanced"
 msgstr "Tingkat _lanjut"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "Move a character backward"
 msgstr "Pindahkan satu karakter ke belakang"
 
-#: src/compose.c:622
+#: src/compose.c:627
 msgid "Move a character forward"
 msgstr "Pindahkan satu karakter ke depan"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "Move a word backward"
 msgstr "Pindahkan satu kata ke belakang"
 
-#: src/compose.c:624
+#: src/compose.c:629
 msgid "Move a word forward"
 msgstr "Pindahkan satu kata ke depan"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "Move to beginning of line"
 msgstr "Pindahkan ke awal baris"
 
-#: src/compose.c:626
+#: src/compose.c:631
 msgid "Move to end of line"
 msgstr "Pindahkan ke akhir baris"
 
-#: src/compose.c:627
+#: src/compose.c:632
 msgid "Move to previous line"
 msgstr "Pindahkan ke baris sebelumnya"
 
-#: src/compose.c:628
+#: src/compose.c:633
 msgid "Move to next line"
 msgstr "Pindahkan ke baris berikutnya"
 
-#: src/compose.c:629
+#: src/compose.c:634
 msgid "Delete a character backward"
 msgstr "Hapus satu karakter ke belakang"
 
-#: src/compose.c:630
+#: src/compose.c:635
 msgid "Delete a character forward"
 msgstr "Hapus satu karakter ke depan"
 
-#: src/compose.c:631
+#: src/compose.c:636
 msgid "Delete a word backward"
 msgstr "Hapus satu kata ke belakang"
 
-#: src/compose.c:632
+#: src/compose.c:637
 msgid "Delete a word forward"
 msgstr "Hapus satu kata ke depan"
 
-#: src/compose.c:633
+#: src/compose.c:638
 msgid "Delete line"
 msgstr "Hapus baris"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "Delete to end of line"
 msgstr "Hapus sampai akhir baris"
 
-#: src/compose.c:637 src/messageview.c:229
+#: src/compose.c:642 src/messageview.c:228
+#: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Cari"
 
-#: src/compose.c:640
+#: src/compose.c:645
 msgid "_Wrap current paragraph"
 msgstr "_Penggal paragraf aktif"
 
-#: src/compose.c:641
+#: src/compose.c:646
 msgid "Wrap all long _lines"
 msgstr "Pengga_l seluruh baris"
 
-#: src/compose.c:643
+#: src/compose.c:648
 msgid "Edit with e_xternal editor"
 msgstr "Sunting dengan penyunting _eksternal"
 
-#: src/compose.c:646
+#: src/compose.c:651
 msgid "_Check all or check selection"
 msgstr "_Tandai semua atau tandai yang dipilih"
 
-#: src/compose.c:647
+#: src/compose.c:652
 msgid "_Highlight all misspelled words"
 msgstr "_Sorot semua kata yang salah eja"
 
-#: src/compose.c:648
+#: src/compose.c:653
 msgid "Check _backwards misspelled word"
 msgstr "Periksa kata yang salah eja secara mundur"
 
-#: src/compose.c:649
+#: src/compose.c:654
 msgid "_Forward to next misspelled word"
 msgstr "_Maju ke kata yang salah eja selanjutnya"
 
-#: src/compose.c:657
+#: src/compose.c:662
 msgid "Reply _mode"
 msgstr "_Modus balas"
 
-#: src/compose.c:659
+#: src/compose.c:664
 msgid "Privacy _System"
 msgstr "_Sistem Pribadi"
 
-#: src/compose.c:664
+#: src/compose.c:669
 msgid "_Priority"
 msgstr "_Prioritas"
 
-#: src/compose.c:666 src/mainwindow.c:605 src/messageview.c:265
+#: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "P_enyandian karakter"
 
-#: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:270
+#: src/compose.c:676 src/mainwindow.c:615 src/messageview.c:269
 msgid "Western European"
 msgstr "Eropa Barat"
 
-#: src/compose.c:672 src/mainwindow.c:611 src/messageview.c:271
+#: src/compose.c:677 src/mainwindow.c:616 src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltik"
 
-#: src/compose.c:673 src/mainwindow.c:612 src/messageview.c:272
+#: src/compose.c:678 src/mainwindow.c:617 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Yunani"
 
-#: src/compose.c:674 src/mainwindow.c:613 src/messageview.c:273
+#: src/compose.c:679 src/mainwindow.c:618 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arab"
 
-#: src/compose.c:675 src/mainwindow.c:614 src/messageview.c:274
+#: src/compose.c:680 src/mainwindow.c:619 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Cyrillic"
 
-#: src/compose.c:676 src/mainwindow.c:615 src/messageview.c:275
+#: src/compose.c:681 src/mainwindow.c:620 src/messageview.c:274
 msgid "Japanese"
 msgstr "Jepang"
 
-#: src/compose.c:677 src/mainwindow.c:616 src/messageview.c:276
+#: src/compose.c:682 src/mainwindow.c:621 src/messageview.c:275
 msgid "Chinese"
 msgstr "China"
 
-#: src/compose.c:678 src/mainwindow.c:617 src/messageview.c:277
+#: src/compose.c:683 src/mainwindow.c:622 src/messageview.c:276
 msgid "Korean"
 msgstr "Korea"
 
-#: src/compose.c:679 src/mainwindow.c:618 src/messageview.c:278
+#: src/compose.c:684 src/mainwindow.c:623 src/messageview.c:277
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:682 src/mainwindow.c:725 src/messageview.c:314
+#: src/compose.c:687 src/mainwindow.c:732 src/messageview.c:313
 msgid "_Address book"
 msgstr "Buku _alamat"
 
-#: src/compose.c:684
+#: src/compose.c:689
 msgid "_Template"
 msgstr "_Cetakan"
 
-#: src/compose.c:686 src/mainwindow.c:753 src/messageview.c:335
+#: src/compose.c:691 src/mainwindow.c:760 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "Aksi"
 
-#: src/compose.c:695
+#: src/compose.c:700
 msgid "Aut_o wrapping"
 msgstr "Penggalan ot_omatis"
 
-#: src/compose.c:696
+#: src/compose.c:701
 msgid "Auto _indent"
 msgstr "Otomat_is menjorok"
 
-#: src/compose.c:697
+#: src/compose.c:702
 msgid "Si_gn"
 msgstr "Tan_da"
 
-#: src/compose.c:698
+#: src/compose.c:703
 msgid "_Encrypt"
 msgstr "_Enkripsi"
 
-#: src/compose.c:699
+#: src/compose.c:704
 msgid "_Request Return Receipt"
 msgstr "_Meminta Tanda Terima"
 
-#: src/compose.c:700
+#: src/compose.c:705
 msgid "Remo_ve references"
 msgstr "Hapus re_ferensi"
 
-#: src/compose.c:701
+#: src/compose.c:706
 msgid "Show _ruler"
 msgstr "Tampilkan pengga_ris"
 
-#: src/compose.c:706 src/compose.c:716
+#: src/compose.c:711 src/compose.c:721
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:707 src/mainwindow.c:659 src/messageview.c:303
+#: src/compose.c:712 src/mainwindow.c:664 src/messageview.c:302
 msgid "_All"
 msgstr "Semu_a"
 
-#: src/compose.c:708 src/mainwindow.c:660 src/messageview.c:304
+#: src/compose.c:713 src/mainwindow.c:665 src/messageview.c:303
 msgid "_Sender"
 msgstr "_Pengirim"
 
-#: src/compose.c:709
+#: src/compose.c:714
 msgid "_Mailing-list"
 msgstr "_Mailing-list"
 
-#: src/compose.c:714
+#: src/compose.c:719
 msgid "_Highest"
 msgstr "_Tertinggi"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "Hi_gh"
 msgstr "Ting_gi"
 
-#: src/compose.c:717
+#: src/compose.c:722
 msgid "Lo_w"
 msgstr "Renda_h"
 
-#: src/compose.c:718
+#: src/compose.c:723
 msgid "_Lowest"
 msgstr "Te_rendah"
 
-#: src/compose.c:723 src/mainwindow.c:868 src/messageview.c:352
+#: src/compose.c:728 src/mainwindow.c:878 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_Otomatis"
 
-#: src/compose.c:724 src/mainwindow.c:869 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:725 src/mainwindow.c:870 src/messageview.c:354
+#: src/compose.c:730 src/mainwindow.c:880 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:358
+#: src/compose.c:734 src/mainwindow.c:884 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "Central European (ISO-8859-_2)"
 
-#: src/compose.c:732 src/mainwindow.c:877 src/messageview.c:361
+#: src/compose.c:737 src/mainwindow.c:887 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "Greek (ISO-8859-_7)"
 
-#: src/compose.c:737 src/mainwindow.c:882 src/messageview.c:366
+#: src/compose.c:742 src/mainwindow.c:892 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkish (ISO-8859-_9)"
 
-#: src/compose.c:1066
+#: src/compose.c:1071
 msgid "New message From format error."
 msgstr "Kesalahan pada format Pengirim pesan baru."
 
-#: src/compose.c:1158
+#: src/compose.c:1163
 msgid "New message subject format error."
 msgstr "Kesalahan pada format Subyek pesan baru."
 
-#: src/compose.c:1189 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 ""
 "Isi badan cetakan dari \"Pesan baru\" terdapat kesalahan pada baris %d."
 
-#: src/compose.c:1450
+#: src/compose.c:1455
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Tidak dapat membalas. Kemungkinan email asli tidak ada."
 
-#: src/compose.c:1633 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 ""
 "Pada bagian \"Dari\" di cetakan \"Balas\" mengandung alamat email yang salah."
 
-#: src/compose.c:1681 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 "Isi badan cetakan dari \"Balas\" terdapat kesalahan pada baris %d."
 
-#: src/compose.c:1817 src/compose.c:2009 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."
@@ -1834,55 +1825,55 @@ msgstr ""
 "Pada bagian \"Dari\" di cetakan \"Teruskan\" mengandung alamat email yang "
 "salah."
 
-#: src/compose.c:1877 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 "Isi badan cetakan dari \"Teruskan\" terdapat kesalahan pada baris %d."
 
-#: src/compose.c:2051
+#: src/compose.c:2056
 msgid "Fw: multiple emails"
 msgstr "Trs: banyak email"
 
-#: src/compose.c:2531
+#: src/compose.c:2539
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Isi badan cetakan dari \"Redirek\" terdapat kesalahan pada baris %d."
 
-#: src/compose.c:2598 src/gtk/headers.h:14
+#: src/compose.c:2606 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2601 src/gtk/headers.h:15
+#: src/compose.c:2609 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2604 src/gtk/headers.h:12
+#: src/compose.c:2612 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Balas-Ke:"
 
-#: src/compose.c:2607 src/compose.c:4929 src/compose.c:4931
+#: src/compose.c:2615 src/compose.c:4946 src/compose.c:4948
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
-#: src/compose.c:2610 src/gtk/headers.h:34
+#: src/compose.c:2618 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Ikuti-Ke:"
 
-#: src/compose.c:2613 src/gtk/headers.h:17
+#: src/compose.c:2621 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Dalam-Balas-Ke:"
 
-#: src/compose.c:2617 src/compose.c:4926 src/compose.c:4934
+#: 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 "Kepada:"
 
-#: src/compose.c:2826
+#: src/compose.c:2834
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Tidak dapat melampirkan berkas (konversi charset gagal)."
 
-#: src/compose.c:2832
+#: src/compose.c:2840
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1897,16 +1888,16 @@ msgstr[1] ""
 "Berkas-berkas berikut telah dilampirkan: \n"
 "%s"
 
-#: src/compose.c:3105
+#: src/compose.c:3113
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Tanda kutipan\" di cetakan salah."
 
-#: src/compose.c:3596
+#: src/compose.c:3613
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Tidak dapat mengambil ukuran berkas '%s'."
 
-#: src/compose.c:3607
+#: src/compose.c:3624
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1915,56 +1906,58 @@ msgstr ""
 "Anda akan menyisipkan berkas %s pada badan pesan. Anda yakin ingin "
 "melakukannya?"
 
-#: src/compose.c:3610
+#: src/compose.c:3627
 msgid "Are you sure?"
 msgstr "Apakah anda yakin?"
 
-#: src/compose.c:3611 src/compose.c:11243
-msgid "+_Insert"
-msgstr "+_Sisip"
+#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
+msgid "_Insert"
+msgstr "_Sisip"
 
-#: src/compose.c:3735
+#: src/compose.c:3752
 #, c-format
 msgid "File %s is empty."
 msgstr "Berkas %s kosong."
 
-#: src/compose.c:3736
+#: src/compose.c:3753
 msgid "Empty file"
 msgstr "Berkas kosong"
 
-#: src/compose.c:3737
-msgid "+_Attach anyway"
+#: src/compose.c:3754
+#, fuzzy
+msgid "_Attach anyway"
 msgstr "+_Lampirkan saja"
 
-#: src/compose.c:3746
+#: src/compose.c:3763
 #, c-format
 msgid "Can't read %s."
 msgstr "Tidak dapat membaca %s."
 
-#: src/compose.c:3773
+#: src/compose.c:3790
 #, c-format
 msgid "Message: %s"
 msgstr "Pesan: %s"
 
-#: src/compose.c:4766 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 "[Disunting]"
 
-#: src/compose.c:4773 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 - Tulis pesan%s"
 
-#: src/compose.c:4776 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 "[Tanpa subyek] - Tulis pesan%s"
 
-#: src/compose.c:4778 src/plugins/python/composewindowtype.c:415
+#: src/compose.c:4795 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Tulis pesan"
 
-#: src/compose.c:4805 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."
@@ -1972,51 +1965,52 @@ msgstr ""
 "Akun untuk mengirim surat belum ditentukan.\n"
 "Silahkan pilih akun surat sebelum mengirim."
 
-#: src/compose.c:5025 src/compose.c:5057 src/compose.c:5099
-#: src/plugins/attachwarner/attachwarner.c:217 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 "Kirim"
 
-#: src/compose.c:5026
+#: src/compose.c:5043
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Penerima satu-satunya adalah alamat CC standar. Lanjut pengiriman?"
 
-#: src/compose.c:5027 src/compose.c:5059 src/compose.c:5092 src/compose.c:5615
-#: src/plugins/attachwarner/attachwarner.c:209
-msgid "+_Send"
-msgstr "+_Kirim"
+#: 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 "_Kirim"
 
-#: src/compose.c:5058
+#: src/compose.c:5075
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Penerima satu-satunya adalah alamat BCC standar. Lanjut pengiriman?"
 
-#: src/compose.c:5075
+#: src/compose.c:5092
 msgid "Recipient is not specified."
 msgstr "Penerima belum ditentukan."
 
-#: src/compose.c:5094 src/plugins/attachwarner/attachwarner.c:211
-msgid "+_Queue"
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:212
+#, fuzzy
+msgid "_Queue"
 msgstr "+_Antri"
 
-#: src/compose.c:5095
+#: src/compose.c:5112
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Subyek kosong. %s"
 
-#: src/compose.c:5096
+#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Lanjutkan pengiriman?"
 
-#: src/compose.c:5097
+#: src/compose.c:5114 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Lanjutkan antri?"
 
-#: src/compose.c:5099 src/toolbar.c:425
+#: src/compose.c:5116 src/toolbar.c:425
 msgid "Send later"
 msgstr "Kirim nanti"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5169 src/compose.c:9999
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2026,7 +2020,7 @@ msgstr ""
 "\n"
 "Konversi charset gagal."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5172 src/compose.c:10002
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2036,7 +2030,7 @@ msgstr ""
 "\n"
 "Tidak dapat mengambil kunci enkripsi penerima."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5178 src/compose.c:9996
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2047,7 +2041,7 @@ msgstr ""
 "\n"
 "Tanda tangan gagal: %s"
 
-#: src/compose.c:5164
+#: src/compose.c:5181
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2058,11 +2052,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5166
+#: src/compose.c:5183
 msgid "Could not queue message for sending."
 msgstr "Tidak dapat antri pesan untuk pengiriman."
 
-#: src/compose.c:5181 src/compose.c:5241
+#: 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."
@@ -2070,7 +2064,7 @@ msgstr ""
 "Pesan ini ada di antrian tapi tidak dapat dikirim.\n"
 "Gunakan \"Kirim antrian pesan\" dari jendela utama untuk mencoba lagi."
 
-#: src/compose.c:5237
+#: src/compose.c:5254
 #, c-format
 msgid ""
 "%s\n"
@@ -2079,7 +2073,7 @@ msgstr ""
 "%s\n"
 "Gunakan \"Send queued messages\" dari jendela utama untuk mencoba lagi."
 
-#: src/compose.c:5612
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2090,7 +2084,7 @@ msgstr ""
 " ke %s charset yang ditentukan.\n"
 "Kirim sebagai %s?"
 
-#: src/compose.c:5669
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2103,95 +2097,101 @@ msgstr ""
 "\n"
 "Lanjutkan pengiriman?"
 
-#: src/compose.c:5903
+#: src/compose.c:5801
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "TIdak dapat mengenkripsi email: %s"
+
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Peringatan penyandian"
 
-#: src/compose.c:5904
-msgid "+C_ontinue"
+#: src/compose.c:5923
+#, fuzzy
+msgid "C_ontinue"
 msgstr "+L_anjutkan"
 
-#: src/compose.c:5953
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Akun untuk mengirim surat tidak tersedia!"
 
-#: src/compose.c:5962
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Akun terpilih bukan NNTP: Pengiriman tidak memungkinkan."
 
-#: src/compose.c:6197
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Lampiran %s sudah tidak ada lagi. Abaikan?"
 
-#: src/compose.c:6198 src/mainwindow.c:650 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 "Batalkan pengiriman"
 
-#: src/compose.c:6198
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Abaikan lampiran"
 
-#: src/compose.c:6238
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Bagian %s asli"
 
-#: src/compose.c:6820
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Tambahkan ke _buku alamat"
 
-#: src/compose.c:6977
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Hapus konten isian"
 
-#: src/compose.c:6981 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 "Gunakan <tab> untuk melengkapi dari buku alamat"
 
-#: src/compose.c:7203
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "Tipe Mime"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
-#: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
+#: 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 "Ukuran"
 
-#: src/compose.c:7272
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Simpan Pesan ke "
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
-#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
-#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
+#: 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
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
 #: src/plugins/clamd/clamav_plugin_gtk.c:299
-#: src/plugins/spamassassin/spamassassin_gtk.c:418
+#: src/plugins/spamassassin/spamassassin_gtk.c:417
 msgid "_Browse"
 msgstr "_Jelajah"
 
-#: src/compose.c:7782
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "Ke_pala"
 
-#: src/compose.c:7787
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Lampiran"
 
-#: src/compose.c:7801
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "Lainn_ya"
 
-#: src/compose.c:7816
+#: src/compose.c:7831
 #, fuzzy
 msgid "S_ubject:"
 msgstr "Subyek:"
 
-#: src/compose.c:8039
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2200,25 +2200,20 @@ msgstr ""
 "Pemeriksa ejaan tidak dapat dijalankan.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
-msgid "<i>%s</i>"
-msgstr "Dari: <i>%s</i>"
-
-#: src/compose.c:8178
+#: src/compose.c:8194
 #, fuzzy
 msgid "_From:"
 msgstr "Dari:"
 
-#: src/compose.c:8195
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Akun yang akan digunakan untuk email ini"
 
-#: src/compose.c:8197
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Alamat pengirim yang akan digunakan"
 
-#: src/compose.c:8363
+#: src/compose.c:8379
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2227,69 +2222,69 @@ msgstr ""
 "Sistem pribadi '%s' tidak dapat dimuat. Anda tidak dapat menandatangani atau "
 "menyandikan pesan ini."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Tidak ada"
 
-#: src/compose.c:8565 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 "Isi badan cetakan mengandung kesalahan pada baris %d."
 
-#: src/compose.c:8681
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Format cetakan Pengirim bermasalah."
 
-#: src/compose.c:8699
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Format cetakan Kepada bermasalah."
 
-#: src/compose.c:8717
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Format cetakan Cc bermasalah."
 
-#: src/compose.c:8735
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Format cetakan Bcc bermasalah."
 
-#: src/compose.c:8753
+#: src/compose.c:8769
 #, fuzzy
 msgid "Template Reply-To format error."
 msgstr "Format cetakan Kepada bermasalah."
 
-#: src/compose.c:8772
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Format cetakan Subyek bermasalah."
 
-#: src/compose.c:9041
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Tipe MIME salah."
 
-#: src/compose.c:9056
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Berkas tidak ada atau kosong."
 
-#: src/compose.c:9130
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Properti"
 
-#: src/compose.c:9147
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "Tipe MIME"
 
-#: src/compose.c:9188
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Penyandian"
 
-#: src/compose.c:9208
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Lokasi"
 
-#: src/compose.c:9209
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Nama berkas"
 
-#: src/compose.c:9401
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2300,15 +2295,15 @@ msgstr ""
 "Sudahi proses secara paksa?\n"
 "id kelompok proses: %d"
 
-#: src/compose.c:9806 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 membutuhkan akses jaringan untuk mengirimkan email ini."
 
-#: src/compose.c:9832
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Tidak dapat mengantrikan pesan."
 
-#: src/compose.c:9834
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2319,15 +2314,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10012
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Tidak dapat menyimpan konsep."
 
-#: src/compose.c:10016
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Tidak dapat menyimpan konsep"
 
-#: src/compose.c:10017
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2335,24 +2330,24 @@ msgstr ""
 "Tidak dapat menyimpan konsep.\n"
 "Apakah anda akan batal keluar atau membatalkan email ini?"
 
-#: src/compose.c:10019
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Batal keluar"
 
-#: src/compose.c:10019
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Batalkan email"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Pilih berkas"
 
-#: src/compose.c:10207
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Berkas '%s' tidak dapat di baca."
 
-#: src/compose.c:10209
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2361,62 +2356,54 @@ msgstr ""
 "Berkas '%s' mengandung karakter yang salah\n"
 "untuk penyandian ini, penyisipan mungkin salah."
 
-#: src/compose.c:10296
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Batalkan pesan"
 
-#: src/compose.c:10297
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Pesan ini telah dirubah. Batalkan ?"
 
-#: src/compose.c:10298
+#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Batalkan"
 
-#: src/compose.c:10298
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "_Simpan ke Konsep"
 
-#: src/compose.c:10300
+#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Simpan perubahan"
 
-#: src/compose.c:10301
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Pesan ini telah dirubah. Simpan perubahan terakhir?"
 
-#: src/compose.c:10302
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Jangan simpan"
 
-#: src/compose.c:10302
-msgid "+_Save to Drafts"
-msgstr "+-Simpan sebagai Konsep"
-
-#: src/compose.c:10372
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Apakah anda akan menerapkan cetakan '%s'?"
 
-#: src/compose.c:10374
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Terapkan cetakan"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
-#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
-#: src/prefs_matcher.c:775 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 "_Ganti"
 
-#: src/compose.c:10375
-msgid "_Insert"
-msgstr "_Sisip"
-
-#: src/compose.c:11240
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Sisipkan atau lampirkan?"
 
-#: src/compose.c:11241
+#: 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 +2411,16 @@ msgstr ""
 "Apakah anda akan menyisipkan isi berkas ke dalam badan pesan, atau "
 "melampirkan ke email?"
 
-#: src/compose.c:11243
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Lampirkan"
 
-#: src/compose.c:11460
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Kesalahan format kutip pada baris %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2442,16 +2429,16 @@ msgstr ""
 "Anda akan menjawab %d pesan. Membuka jendelanya membutuhkan beberapa waktu. "
 "Anda mau melanjutkan?"
 
-#: src/crash.c:141
+#: src/crash.c:140
 #, c-format
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr "Proses Claws Mail (%ld) sinyal diterima %ld"
 
-#: src/crash.c:187
+#: src/crash.c:186
 msgid "Claws Mail has crashed"
 msgstr "Claws Mail mengalami kegagalan"
 
-#: src/crash.c:203
+#: src/crash.c:202
 #, c-format
 msgid ""
 "%s.\n"
@@ -2460,31 +2447,31 @@ msgstr ""
 "%s.\n"
 "Mohon buatkan berkas laporan kesalahan dan masukkan informasi dibawah ini."
 
-#: src/crash.c:208
+#: src/crash.c:207
 msgid "Debug log"
 msgstr "Catatan Debug"
 
-#: src/crash.c:252 src/toolbar.c:422
+#: src/crash.c:251 src/toolbar.c:422
 msgid "Close"
 msgstr "Tutup"
 
-#: src/crash.c:257
+#: src/crash.c:256
 msgid "Save..."
 msgstr "Simpan..."
 
-#: src/crash.c:262
+#: src/crash.c:261
 msgid "Create bug report"
 msgstr "Buat laporan kesalahan"
 
-#: src/crash.c:312
+#: src/crash.c:311
 msgid "Save crash information"
 msgstr "Simpan informasi kegagalan"
 
-#: src/editaddress.c:156 src/editaddress.c:232
+#: src/editaddress.c:155 src/editaddress.c:231
 msgid "Add New Person"
 msgstr "Tambah Orang Baru"
 
-#: 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"
@@ -2510,7 +2497,7 @@ msgstr ""
 "Klik OK untuk tetap menyunting kontak ini.\n"
 "Klik Batal untuk menutup tanpa disimpan."
 
-#: 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"
@@ -2532,35 +2519,35 @@ msgstr ""
 "Klik OK untuk tetap menyunting kontak ini.\n"
 "Klik Batal untuk menutup tanpa disimpan."
 
-#: src/editaddress.c:233
+#: src/editaddress.c:232
 msgid "Edit Person Details"
 msgstr "Sunting Detail Orang"
 
-#: src/editaddress.c:411
+#: src/editaddress.c:410
 msgid "An Email address must be supplied."
 msgstr "Sebuah alamat email harus dipenuhi."
 
-#: 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 "Sebuah nama dan nilai harus dipenuhi."
 
-#: src/editaddress.c:676
+#: src/editaddress.c:675 src/prefs_folder_item.c:1675
 msgid "Discard"
 msgstr "Batalkan"
 
-#: src/editaddress.c:677
+#: src/editaddress.c:676
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/editaddress.c:707 src/editaddress.c:756
+#: src/editaddress.c:706 src/editaddress.c:755
 msgid "Edit Person Data"
 msgstr "Sunting Data Orang"
 
-#: src/editaddress.c:785
+#: src/editaddress.c:784
 msgid "Choose a picture"
 msgstr "Pilih gambar"
 
-#: src/editaddress.c:804
+#: src/editaddress.c:803
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2569,57 +2556,66 @@ msgstr ""
 "Gagal meng-impor gambar: \n"
 "%s"
 
-#: src/editaddress.c:846
+#: src/editaddress.c:845
 msgid "_Set picture"
 msgstr "_Pasang gambar"
 
-#: src/editaddress.c:847
+#: src/editaddress.c:846
 msgid "_Unset picture"
 msgstr "_Buang gambar"
 
-#: src/editaddress.c:905
+#: src/editaddress.c:904
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:517
-#: src/exporthtml.c:761 src/ldif.c:747
+#: src/editaddress.c:951 src/editaddress.c:953 src/expldifdlg.c:516
+#: src/exporthtml.c:761 src/ldif.c:746
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
-#: src/editaddress.c:961 src/editaddress.c:965 src/ldif.c:755
+#: src/editaddress.c:962 src/editaddress.c:966 src/ldif.c:754
 msgid "Last Name"
 msgstr "Nama Akhir"
 
-#: src/editaddress.c:962 src/editaddress.c:964 src/ldif.c:751
+#: src/editaddress.c:963 src/editaddress.c:965 src/ldif.c:750
 msgid "First Name"
 msgstr "Nama Awal"
 
-#: src/editaddress.c:968 src/editaddress.c:970
+#: src/editaddress.c:969 src/editaddress.c:971
 msgid "Nickname"
 msgstr "Nama panggilan"
 
-#: src/editaddress.c:1054 src/editaddress.c:1122
+#: src/editaddress.c:1055 src/editaddress.c:1123
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
+#: 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 "Nilai"
 
-#: src/editaddress.c:1424
+#: src/editaddress.c:1425
 msgid "_User Data"
 msgstr "_Data Pengguna"
 
-#: src/editaddress.c:1425
+#: src/editaddress.c:1426
 msgid "_Email Addresses"
 msgstr "Alamat _Email"
 
-#: src/editaddress.c:1428 src/editaddress.c:1431
+#: src/editaddress.c:1429 src/editaddress.c:1432
 msgid "O_ther Attributes"
 msgstr "A_tribut Lain"
 
+#: src/editaddress.c:1583
+#, c-format
+msgid ""
+"Failed to save image: \n"
+"%s"
+msgstr ""
+"Gagal menyimpan gambar: \n"
+"%s"
+
 #: src/editbook.c:109
 msgid "File appears to be OK."
 msgstr "Berkas OK."
@@ -2641,8 +2637,8 @@ msgid " Check File "
 msgstr " Periksa Berkas "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1959
-#: src/wizard.c:1187 src/wizard.c:1602
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
+#: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Berkas"
 
@@ -2690,13 +2686,13 @@ msgstr "Sunting direktori"
 msgid "Input the new name of folder:"
 msgstr "Masukkan nama baru dari direktori:"
 
-#: src/editgroup.c:556 src/foldersel.c:585 src/imap_gtk.c:195 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: src/editgroup.c:556 src/foldersel.c: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 "Direktori baru"
 
-#: src/editgroup.c:557 src/foldersel.c:586 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
+#: 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 "Masukkan nama direktori baru:"
 
@@ -2720,33 +2716,33 @@ msgstr "Tambahan bagian alamat email"
 msgid "Add New JPilot Entry"
 msgstr "Tambah Entri JPilot Baru"
 
-#: src/editldap_basedn.c:138
+#: src/editldap_basedn.c:137
 msgid "Edit LDAP - Select Search Base"
 msgstr "Sunting LDAP - Pilih Dasar Pencarian"
 
-#: src/editldap_basedn.c:157 src/editldap.c:441
+#: src/editldap_basedn.c:156 src/editldap.c:441
 msgid "Hostname"
 msgstr "Nama host"
 
-#: src/editldap_basedn.c:167 src/editldap.c:458
-#: 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 "Port"
 
-#: src/editldap_basedn.c:177 src/editldap.c:502
+#: src/editldap_basedn.c:176 src/editldap.c:502
 msgid "Search Base"
 msgstr "Dasar Pencarian"
 
-#: src/editldap_basedn.c:198
+#: src/editldap_basedn.c:197
 msgid "Available Search Base(s)"
 msgstr "Dasar Pencarian yang tersedia"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:287
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "Tidak dapat membaca Dasar Pencarian dari server - mohon diatur secara manual"
 
-#: src/editldap_basedn.c:292 src/editldap.c:281
+#: src/editldap_basedn.c:291 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "Tidak dapat menyambung ke server"
 
@@ -2766,7 +2762,7 @@ msgstr "Setidaknya satu atribut pencarian LDAP harus dipenuhi."
 msgid "Connected successfully to server"
 msgstr "Berhasil tersambung dengan server"
 
-#: src/editldap.c:336 src/editldap.c:974
+#: src/editldap.c:336 src/editldap.c:970
 msgid "Edit LDAP Server"
 msgstr "Sunting server LDAP"
 
@@ -2790,7 +2786,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3343
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
@@ -2971,23 +2967,20 @@ msgid ""
 msgstr ""
 "Jumlah entri maksimum yang seharusnya dikembalikan pada hasil pencarian."
 
-#: src/editldap.c:779 src/prefs_account.c:3234
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Dasar"
 
-#: src/editldap.c:780
-msgid "Search"
-msgstr "Pencarian"
-
 #: src/editldap.c:781 src/gtk/quicksearch.c:680
 msgid "Extended"
 msgstr "Diperlebar"
 
-#: src/editldap.c:979
+#: src/editldap.c:975
 msgid "Add New LDAP Server"
 msgstr "Tambah server LDAP baru"
 
 #: src/edittags.c:187 src/prefs_filtering_action.c:1446
+#: src/prefs_summaries.c:441
 msgid "Tag"
 msgstr "Penanda"
 
@@ -3051,19 +3044,19 @@ msgstr "Tambah entri vCard baru"
 msgid "Impossible to set the client certificate.\n"
 msgstr ""
 
-#: src/exphtmldlg.c:106
+#: src/exphtmldlg.c:105
 msgid "Please specify output directory and file to create."
 msgstr "Silahkan tentukan direktori dan berkas yang akan dibuat."
 
-#: src/exphtmldlg.c:109
+#: src/exphtmldlg.c:108
 msgid "Select stylesheet and formatting."
 msgstr "Pilih lembargaya dan format."
 
-#: src/exphtmldlg.c:112 src/expldifdlg.c:114
+#: src/exphtmldlg.c:111 src/expldifdlg.c:113
 msgid "File exported successfully."
 msgstr "Berkas telah diekspor dengan sukses."
 
-#: src/exphtmldlg.c:178
+#: src/exphtmldlg.c:177
 #, c-format
 msgid ""
 "The HTML output directory '%s'\n"
@@ -3072,11 +3065,11 @@ msgstr ""
 "Direktori keluaran HTML '%s'\n"
 "tidak ada. Apakah anda ingin membuatnya?"
 
-#: src/exphtmldlg.c:181
+#: src/exphtmldlg.c:180
 msgid "Create directory"
 msgstr "Buat direktori"
 
-#: src/exphtmldlg.c:190
+#: src/exphtmldlg.c:189
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
@@ -3085,123 +3078,125 @@ msgstr ""
 "Tidak dapat membuat direktori keluaran untuk berkas HTML:\n"
 "%s"
 
-#: src/exphtmldlg.c:192 src/expldifdlg.c:202
+#: src/exphtmldlg.c:191 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
 msgstr "Gagal untuk membuat direktori"
 
-#: src/exphtmldlg.c:234
+#: src/exphtmldlg.c:233
 msgid "Error creating HTML file"
 msgstr "Ada kesalahan dalam membuat berkas HTML"
 
-#: src/exphtmldlg.c:320
+#: src/exphtmldlg.c:319
 msgid "Select HTML output file"
 msgstr "pilih berkas keluaran HTML"
 
-#: src/exphtmldlg.c:384
+#: src/exphtmldlg.c:383
 msgid "HTML Output File"
 msgstr "Berkas keluaran HTML"
 
-#: src/exphtmldlg.c:393 src/expldifdlg.c:410 src/export.c:171 src/import.c:170
-#: src/importldif.c:685
+#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
+#: src/importldif.c:684
 msgid "B_rowse"
 msgstr "_Jelajah"
 
-#: src/exphtmldlg.c:446 src/plugins/fancy/fancy_prefs.c:300
+#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:300
 msgid "Stylesheet"
 msgstr "Lembargaya"
 
-#: src/exphtmldlg.c:454 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1178
+#: 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:1188
 #: src/plugins/archive/archiver_prefs.c:235
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:948
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6016
+#: 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 "Tidak ada"
 
-#: src/exphtmldlg.c:455 src/prefs_folder_item.c:512 src/prefs_other.c:116
-#: src/prefs_other.c:408
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
+#: src/prefs_other.c:418
 msgid "Default"
 msgstr "Standar"
 
-#: src/exphtmldlg.c:456 src/plugins/pgpcore/select-keys.c:244
-#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:164
+#: 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 "Penuh"
 
-#: src/exphtmldlg.c:457
+#: src/exphtmldlg.c:456
 msgid "Custom"
 msgstr "Reka"
 
-#: src/exphtmldlg.c:458
+#: src/exphtmldlg.c:457
 msgid "Custom-2"
 msgstr "Reka-2"
 
-#: src/exphtmldlg.c:459
+#: src/exphtmldlg.c:458
 msgid "Custom-3"
 msgstr "Reka-3"
 
-#: src/exphtmldlg.c:460
+#: src/exphtmldlg.c:459
 msgid "Custom-4"
 msgstr "Reka-4"
 
-#: src/exphtmldlg.c:467
+#: src/exphtmldlg.c:466
 msgid "Full Name Format"
 msgstr "Format nama lengkap"
 
-#: src/exphtmldlg.c:475
+#: src/exphtmldlg.c:474
 msgid "First Name, Last Name"
 msgstr "Nama Depan, Nama Belakang"
 
-#: src/exphtmldlg.c:476
+#: src/exphtmldlg.c:475
 msgid "Last Name, First Name"
 msgstr "Nama Belakang, Nama Depan"
 
-#: src/exphtmldlg.c:483
+#: src/exphtmldlg.c:482
 msgid "Color Banding"
 msgstr "Penanda Warna"
 
-#: src/exphtmldlg.c:489
+#: src/exphtmldlg.c:488
 msgid "Format Email Links"
 msgstr "Format Tautan Email"
 
-#: src/exphtmldlg.c:495
+#: src/exphtmldlg.c:494
 msgid "Format User Attributes"
 msgstr "Format Atribut Pengguna"
 
-#: src/exphtmldlg.c:540 src/expldifdlg.c:613 src/importldif.c:892
-msgid "Address Book :"
+#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
+#, fuzzy
+msgid "Address Book:"
 msgstr "Buku Alamat :"
 
-#: src/exphtmldlg.c:550 src/expldifdlg.c:623 src/importldif.c:902
-msgid "File Name :"
+#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
+#, fuzzy
+msgid "File Name:"
 msgstr "Nama Berkas :"
 
-#: src/exphtmldlg.c:560
+#: src/exphtmldlg.c:559
 msgid "Open with Web Browser"
 msgstr "Buka dengan Perambah Web"
 
-#: src/exphtmldlg.c:592
+#: src/exphtmldlg.c:591
 msgid "Export Address Book to HTML File"
 msgstr "Ekspor buku alamat ke berkas HTML"
 
-#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:1021
+#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
 msgid "File Info"
 msgstr "Info berkas"
 
-#: src/exphtmldlg.c:658
+#: src/exphtmldlg.c:657
 msgid "Format"
 msgstr "Format"
 
-#: src/expldifdlg.c:108
+#: src/expldifdlg.c:107
 msgid "Please specify output directory and LDIF filename to create."
 msgstr ""
 "Silahkan tentukan direktori keluaran dan nama berkas LDIF yang akan dibuat."
 
-#: src/expldifdlg.c:111
+#: src/expldifdlg.c:110
 msgid "Specify parameters to format distinguished name."
 msgstr "Tentukan parameter untuk membedakan nama."
 
-#: src/expldifdlg.c:188
+#: src/expldifdlg.c:187
 #, c-format
 msgid ""
 "LDIF Output Directory '%s'\n"
@@ -3210,11 +3205,11 @@ msgstr ""
 "Direktori keluaran LDIF '%s'\n"
 "tidak ada. OK untuk membuat direktori baru?"
 
-#: src/expldifdlg.c:191
+#: src/expldifdlg.c:190
 msgid "Create Directory"
 msgstr "Buat Direktori"
 
-#: src/expldifdlg.c:200
+#: src/expldifdlg.c:199
 #, c-format
 msgid ""
 "Could not create output directory for LDIF file:\n"
@@ -3223,11 +3218,11 @@ msgstr ""
 "Tidak dapat membuat direktori keluaran untuk berkas LDIF:\n"
 "%s"
 
-#: src/expldifdlg.c:242
+#: src/expldifdlg.c:241
 msgid "Suffix was not supplied"
 msgstr "Akhiran tidak diisi"
 
-#: src/expldifdlg.c:244
+#: src/expldifdlg.c:243
 msgid ""
 "A suffix is required if data is to be used for an LDAP server. Are you sure "
 "you wish to proceed without a suffix?"
@@ -3235,19 +3230,19 @@ msgstr ""
 "Sebuah akhiran dibutuhkan jika data akan digunakan untuk server LDAP. Anda "
 "yakin untuk melanjutkan tanpa sebuah akhiran?"
 
-#: src/expldifdlg.c:262
+#: src/expldifdlg.c:261
 msgid "Error creating LDIF file"
 msgstr "Kesalahan dalam membuat berkas LDIF"
 
-#: src/expldifdlg.c:337
+#: src/expldifdlg.c:336
 msgid "Select LDIF output file"
 msgstr "Pilih berkas keluaran LDIF"
 
-#: src/expldifdlg.c:401
+#: src/expldifdlg.c:400
 msgid "LDIF Output File"
 msgstr "Berkas Keluaran LDIF"
 
-#: src/expldifdlg.c:432
+#: src/expldifdlg.c:431
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
@@ -3257,7 +3252,7 @@ msgstr ""
 "dengan:\n"
 " uid=102376,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:438
+#: src/expldifdlg.c:437
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
@@ -3267,7 +3262,7 @@ msgstr ""
 "mirip dengan:\n"
 " cn=John Doe,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:444
+#: src/expldifdlg.c:443
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
@@ -3277,11 +3272,11 @@ msgstr ""
 "diformat mirip dengan:\n"
 " mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:490
+#: src/expldifdlg.c:489
 msgid "Suffix"
 msgstr "Akhiran"
 
-#: src/expldifdlg.c:500
+#: src/expldifdlg.c:499
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
@@ -3295,15 +3290,15 @@ msgstr ""
 " ou=people,dc=domainname,dc=com\n"
 " o=Organization Name,c=Country\n"
 
-#: src/expldifdlg.c:508
+#: src/expldifdlg.c:507
 msgid "Relative DN"
 msgstr "Relatif DN"
 
-#: src/expldifdlg.c:516
+#: src/expldifdlg.c:515
 msgid "Unique ID"
 msgstr "ID Unik"
 
-#: src/expldifdlg.c:524
+#: src/expldifdlg.c:523
 msgid ""
 "The LDIF file contains several data records that are usually loaded into an "
 "LDAP server. Each data record in the LDIF file is uniquely identified by a "
@@ -3317,11 +3312,11 @@ msgstr ""
 "Distinguished Name\" (or RDN) untuk membuat DN. Silahkan pilih salah satu "
 "dari pilihan RDN yg tersedia yang akan digunakan untuk membuat DN."
 
-#: src/expldifdlg.c:544
+#: src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
 msgstr "Gunakan atribut DN jika ada dalam data"
 
-#: src/expldifdlg.c:549
+#: src/expldifdlg.c:548
 msgid ""
 "The addressbook may contain entries that were previously imported from an "
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3333,11 +3328,11 @@ msgstr ""
 "alamat, dapat digunakan pada berkas LDIF hasil ekspor. RDN yang terpilih "
 "akan digunakan jika atribut pengguna DN tidak ditemukan."
 
-#: src/expldifdlg.c:559
+#: src/expldifdlg.c:558
 msgid "Exclude record if no Email Address"
 msgstr "Abaikan rekaman jika tidak ada alamat email"
 
-#: src/expldifdlg.c:564
+#: src/expldifdlg.c:563
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
@@ -3345,15 +3340,15 @@ msgstr ""
 "Sebuah buku alamat dapat berisi entri tanpa alamat email. Tandai pilihan ini "
 "untuk mengabaikan rekaman berikut."
 
-#: src/expldifdlg.c:656
+#: src/expldifdlg.c:655
 msgid "Export Address Book to LDIF File"
 msgstr "Ekspor Buku Alamat ke berkas LDIF"
 
-#: src/expldifdlg.c:722
+#: src/expldifdlg.c:721
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8128
+#: src/export.c:113 src/summaryview.c:8139
 msgid "Export to mbox file"
 msgstr "Ekspor ke berkas mbox"
 
@@ -3389,8 +3384,8 @@ msgstr "Pilih berkas ekspor"
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
-#: src/exporthtml.c:771 src/importldif.c:1022
-#: src/plugins/archive/archiver_gtk.c:731
+#: src/exporthtml.c:771 src/importldif.c:1021
+#: src/plugins/archive/archiver_gtk.c:735
 msgid "Attributes"
 msgstr "Atribut"
 
@@ -3589,248 +3584,256 @@ msgid ""
 "%smessage file: %s\n"
 msgstr ""
 
-#: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:306
+#: src/folder.c:1565 src/foldersel.c:400 src/prefs_folder_item.c:300
 msgid "Inbox"
 msgstr "Kotakmasuk"
 
-#: src/folder.c:1569 src/foldersel.c:407
+#: src/folder.c:1569 src/foldersel.c:404
 msgid "Sent"
 msgstr "Terkirim"
 
-#: src/folder.c:1573 src/foldersel.c:411
-#: src/plugins/attachwarner/attachwarner.c:217 src/prefs_folder_item.c:309
+#: src/folder.c:1573 src/foldersel.c:408 src/prefs_folder_item.c:303
 msgid "Queue"
 msgstr "Antri"
 
-#: src/folder.c:1577 src/foldersel.c:415 src/prefs_folder_item.c:310
+#: src/folder.c:1577 src/foldersel.c:412 src/prefs_folder_item.c:304
 msgid "Trash"
 msgstr "Tempat Sampah"
 
-#: src/folder.c:1581 src/foldersel.c:419 src/prefs_folder_item.c:308
+#: src/folder.c:1581 src/foldersel.c:416 src/prefs_folder_item.c:302
 msgid "Drafts"
 msgstr "Konsep"
 
-#: src/folder.c:2011
+#: src/folder.c:2012
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Sedang memproses (%s)...\n"
 
-#: src/folder.c:3256
+#: src/folder.c:3257
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Menyalin %s to %s...\n"
 
-#: src/folder.c:3256
+#: src/folder.c:3257
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Memindahkan %s to %s...\n"
 
-#: src/folder.c:3564
+#: src/folder.c:3563
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Memperbaharui tampungan untuk %s..."
 
-#: src/folder.c:4427
+#: src/folder.c:4424
 msgid "Processing messages..."
 msgstr "Memproses pesan..."
 
-#: src/folder.c:4563
+#: src/folder.c:4559
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sinkronisasi %s untuk penggunaan secara offline...\n"
 
-#: src/folder.c:4820
+#: src/folder.c:4816
 #, fuzzy
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Sebuah direktori tidak dapat dipindahkan antar kotaksurat berbeda."
 
+#: src/folder.c:4820
+#, fuzzy
+msgid "A folder name can not end with a space."
+msgstr "Sebuah direktori tidak dapat dipindahkan antar kotaksurat berbeda."
+
 #: src/foldersel.c:247
 msgid "Select folder"
 msgstr "Pilih direktori"
 
-#: src/foldersel.c:587 src/imap_gtk.c:199 src/mh_gtk.c:147
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:95
+#: 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 "Direktori Baru"
 
-#: src/foldersel.c:595 src/imap_gtk.c:210 src/imap_gtk.c:216
-#: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:264
-#: src/news_gtk.c:315 src/plugins/mailmbox/plugin_gtk.c:255
-#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:208
-#: src/plugins/vcalendar/vcal_folder.c:2042
+#: 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 "'%c' tidak dapat dimasukkan dalam nama direktori."
 
-#: src/foldersel.c:610 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:168
-#: src/mh_gtk.c:274 src/news_gtk.c:322 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:437 src/plugins/rssyl/rssyl_cb_menu.c:221
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: 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 "Direktori '%s' sudah ada."
 
-#: src/foldersel.c:617 src/imap_gtk.c:232 src/mh_gtk.c:174
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:126
+#: 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 "Tidak dapat membuat direktori '%s'."
 
-#: src/folderview.c:236
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Tandai semua sudah dib_aca"
 
-#: src/folderview.c:237
+#: src/folderview.c:242
 #, fuzzy
 msgid "Mark all read recursi_vely"
 msgstr "Tandai semua sudah dibaca"
 
-#: src/folderview.c:239
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "Jalan_kan aturan proses"
 
-#: src/folderview.c:240 src/mainwindow.c:546
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Cari direktori..."
 
-#: src/folderview.c:242
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "Memp_roses..."
 
-#: src/folderview.c:243
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Kosongkan _sampah..."
 
-#: src/folderview.c:244
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Kirim _antrian..."
 
-#: 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:391 src/summaryview.c:6292
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
 msgid "New"
 msgstr "Baru"
 
-#: 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:390 src/summaryview.c:6294
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
 msgid "Unread"
 msgstr "Belum dibaca"
 
-#: 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 "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:437 src/summaryview.c:446
+#: src/folderview.c:439 src/summaryview.c:445
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:767
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr "Atur info direktori..."
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "Tandai semua telah dibaca"
+#: src/folderview.c:845
+#, fuzzy
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"Anda yakin akan menandai semua surat dalam direktori ini dengan sudah dibaca?"
 
-#: src/folderview.c:841 src/summaryview.c:4128
+#: src/folderview.c:847 src/summaryview.c:4115
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Anda yakin akan menandai semua surat dalam direktori ini dengan sudah dibaca?"
 
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
-#, c-format
-msgid "Scanning folder %s%c%s..."
+#: src/folderview.c:851 src/summaryview.c:4114
+msgid "Mark all as read"
+msgstr "Tandai semua telah dibaca"
+
+#: src/folderview.c:1027 src/imap.c:4639
+#, fuzzy, c-format
+msgid "Scanning folder %s/%s..."
 msgstr "Memindai direktori %s%c%s..."
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 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 "Memindai direktori %s..."
 
-#: src/folderview.c:1039
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Bangun ulang struktur direktori"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Membangun ulang struktur direktori akan menghilangkan tampungan lokal. Anda "
 "yakin untuk melanjutkan?"
 
-#: src/folderview.c:1050
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Membangun ulang struktur direktori..."
 
-#: src/folderview.c:1052
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Memindai struktur direktori..."
 
-#: src/folderview.c:1143
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Tidak dapat memindai direktori %s\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Memeriksa pesan baru pada semua direktori..."
 
-#: src/folderview.c:2070
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Menutup direktori %s..."
 
-#: src/folderview.c:2165
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Membuka direktori %s..."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Direktori tidak dapat dibuka."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
 msgid "Empty trash"
 msgstr "Tempat Sampah kosong"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Hapus semua pesan dalam tempat sampah?"
 
-#: src/folderview.c:2328
-msgid "+_Empty trash"
+#: src/folderview.c:2401
+#, fuzzy
+msgid "_Empty trash"
 msgstr "+_Kosongkan tempat sampah"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Peringatan offline"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Anda sedang bekerja secara offline. Lanjutkan?"
 
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Kirim antrian pesan"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Kirim semua antrian pesan?"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
-#: src/toolbar.c:2629
-msgid "_Send"
-msgstr "_Kirim"
-
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2466 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Beberapa kesalahan terjadi ketika mengirimkan antrian pesan."
 
-#: src/folderview.c:2397 src/main.c:2714 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"
@@ -3839,65 +3842,65 @@ msgstr ""
 "Beberapa kesalahan terjadi ketika mengirimkan antrian pesan:\n"
 "%s"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Anda yakin akan menyalin direktori '%s' dalam '%s'?"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr ""
 "Anda yakin akan menjadikan direktori '%s' sebagai sub direktori dari '%s'?"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Salin direktori"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Pindahkan direktori"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Menyalin %s ke %s..."
 
-#: src/folderview.c:2488
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Memindahkan %s to %s..."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Sumber dan tujuan sama."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Tidak dapat menyalin direktori ke salah satu anaknya."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Tidak dapat memindahkan direktori ke salah satu anaknya."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Sebuah direktori tidak dapat dipindahkan antar kotaksurat berbeda."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Gagal menyalin!"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Gagal memindahkan!"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Memproses konfigurasi untuk direktori %s"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Direktori tujuan hanya dapat digunakan untuk menempatkan subdirektori."
 
@@ -3921,7 +3924,7 @@ msgstr " Pencarian "
 msgid "Newsgroup name"
 msgstr "Nama Newsgroup"
 
-#: src/grouplistdialog.c:205
+#: src/grouplistdialog.c:205 src/prefs_send.c:171
 msgid "Messages"
 msgstr "Pesan"
 
@@ -3947,7 +3950,7 @@ msgstr "Tidakdiketahui"
 msgid "Can't retrieve newsgroup list."
 msgstr "Tidak dapat mengambil daftar newsgroup."
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1907 src/summaryview.c:1587
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1565
 msgid "Done."
 msgstr "Selesai."
 
@@ -3995,7 +3998,7 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"Copyright (C) 1999-2015\n"
+"Copyright (C) 1999-2016\n"
 "The Claws Mail Team\n"
 " and Hiroyuki Yamamoto"
 msgstr ""
@@ -4015,10 +4018,9 @@ msgstr ""
 "\n"
 "Informasi Sistem\n"
 
-#: src/gtk/about.c:167
-#, c-format
+#: src/gtk/about.c:168
+#, fuzzy, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
@@ -4026,10 +4028,9 @@ msgstr ""
 "Locale: %s (charset: %s)\n"
 "Sistem Operasi: %s %s (%s)"
 
-#: src/gtk/about.c:176
-#, c-format
+#: src/gtk/about.c:177
+#, fuzzy, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
@@ -4037,10 +4038,9 @@ msgstr ""
 "Locale: %s (charset: %s)\n"
 "Sistem Operasi: %s"
 
-#: src/gtk/about.c:185
-#, c-format
+#: src/gtk/about.c:186
+#, fuzzy, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
@@ -4048,7 +4048,7 @@ msgstr ""
 "Locale: %s (charset: %s)\n"
 "Sistem Operasi: tidakdiketahui"
 
-#: src/gtk/about.c:242 src/prefs_themes.c:706 src/wizard.c:527
+#: src/gtk/about.c:242 src/prefs_themes.c:705 src/wizard.c:527
 msgid "The Claws Mail Team"
 msgstr "Tim Claws Mail"
 
@@ -4160,59 +4160,52 @@ msgstr ""
 "\n"
 
 #: src/gtk/about.c:567
+#, fuzzy
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <"
+"this program. If not, see "
 msgstr ""
 "Anda dianggap telah menerima salinan lisensi GNU General Publik bersama "
 "dengan aplikasi ini. Jika tidak, lihat <"
 
-#: src/gtk/about.c:572
-msgid ""
-">. \n"
-"\n"
-msgstr ""
-">. \n"
-"\n"
-
-#: src/gtk/about.c:698 src/main.c:2538
+#: src/gtk/about.c:698 src/main.c:2567
 msgid "Session statistics\n"
 msgstr "Statistik sesi\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2548 src/main.c:2551
+#: 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 "Dimulai: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2557
+#: src/gtk/about.c:718 src/main.c:2586
 msgid "Incoming traffic\n"
 msgstr "Lalu lintas masuk\n"
 
-#: src/gtk/about.c:721 src/main.c:2560
+#: src/gtk/about.c:721 src/main.c:2589
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Pesan yang diterima: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2566
+#: src/gtk/about.c:728 src/main.c:2595
 msgid "Outgoing traffic\n"
 msgstr "Lalu lintas keluar\n"
 
-#: src/gtk/about.c:731 src/main.c:2569
+#: src/gtk/about.c:731 src/main.c:2598
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Pesan baru/redireksi: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2573
+#: src/gtk/about.c:736 src/main.c:2602
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Pesan yang dibalas: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2577
+#: src/gtk/about.c:741 src/main.c:2606
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Pesan yang diteruskan: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2581
+#: src/gtk/about.c:746 src/main.c:2610
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total pesan keluar: %d\n"
@@ -4224,7 +4217,7 @@ msgstr "Tentang Claws Mail"
 #: src/gtk/about.c:831
 #, fuzzy
 msgid ""
-"Copyright (C) 1999-2015\n"
+"Copyright (C) 1999-2016\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
@@ -4256,63 +4249,63 @@ msgstr "Catatan _Rilis"
 msgid "_Statistics"
 msgstr "_Statistik"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:360
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Oranye"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Merah"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Merah Muda"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Biru Langit"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Biru"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Hijau"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Coklat"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Abu-abu"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Coklat muda"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Merah tua"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Merah muda gelap"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Biru baja"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Emas"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Hijau terang"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -4356,10 +4349,10 @@ msgstr "Tidak ditemukan kata yang salah eja."
 msgid "Replace unknown word"
 msgstr "Ganti kata yang tidak diketahui"
 
-#: src/gtk/gtkaspell.c:1459
-#, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Ganti \"%s\" dengan: </span>"
+#: src/gtk/gtkaspell.c:1460
+#, fuzzy, c-format
+msgid "Replace \"%s\" with: "
+msgstr "Ganti dengan..."
 
 #: src/gtk/gtkaspell.c:1503
 msgid ""
@@ -4439,18 +4432,27 @@ msgstr ""
 "Pemeriksa ejaan tidak dapat mengganti kamus alternatif.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1909
-msgid "Failed."
+#: src/gtk/gtkutils.c:1921
+msgid "Failed: no service record found."
 msgstr ""
 
-#: src/gtk/gtkutils.c:1972
+#: src/gtk/gtkutils.c:1924
+msgid "Failed: network error."
+msgstr ""
+
+#: src/gtk/gtkutils.c:1927
+#, fuzzy, c-format
+msgid "Failed: unknown error (%d)."
+msgstr "Kesalahan tidak diketahui"
+
+#: src/gtk/gtkutils.c:1997
 #, fuzzy
 msgid "Configuring..."
 msgstr "_Konfigurasi"
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2174 src/prefs_summary_column.c:84 src/quote_fmt.c:49
-#: src/summaryview.c:444
+#: src/prefs_matcher.c:2165 src/prefs_summaries.c:435
+#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:443
 msgid "Date"
 msgstr "Tanggal"
 
@@ -4459,8 +4461,8 @@ msgid "Date:"
 msgstr "Tanggal:"
 
 #: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2171 src/prefs_summary_column.c:82 src/quote_fmt.c:50
-#: src/summaryview.c:442
+#: src/prefs_matcher.c:2162 src/prefs_summaries.c:437
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:441
 msgid "From"
 msgstr "Dari"
 
@@ -4481,13 +4483,14 @@ msgid "Reply-To"
 msgstr "Balas-Ke"
 
 #: src/gtk/headers.h:13 src/plugins/address_keeper/address_keeper_prefs.c:140
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2172
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:57 src/summaryview.c:443
+#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
+#: src/prefs_summaries.c:438 src/prefs_summary_column.c:83 src/quote_fmt.c:57
+#: src/summaryview.c:442
 msgid "To"
 msgstr "Kepada"
 
 #: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2173
+#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
 #: src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
@@ -4497,7 +4500,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2175 src/quote_fmt.c:61
+#: src/prefs_matcher.c:2166 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Pesan-ID"
 
@@ -4510,7 +4513,7 @@ msgid "In-Reply-To"
 msgstr "Dalam-Balas-Ke"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2177 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2168 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referensi"
 
@@ -4519,17 +4522,17 @@ msgid "References:"
 msgstr "Referensi:"
 
 #: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2170 src/prefs_summary_column.c:81 src/quote_fmt.c:56
-#: src/summaryview.c:441
+#: src/prefs_matcher.c:2161 src/prefs_summaries.c:439
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:440
 msgid "Subject"
 msgstr "Subyek"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:703
 #: src/summary_search.c:440
 msgid "Subject:"
 msgstr "Subyek:"
 
-#: src/gtk/headers.h:20
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:433
 msgid "Comments"
 msgstr "Komentar"
 
@@ -4541,7 +4544,7 @@ msgstr "Komentar:"
 msgid "Keywords"
 msgstr "Katakunci"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Keywords:"
 msgstr "Katakunci:"
 
@@ -4618,7 +4621,7 @@ msgid "Received:"
 msgstr "Diterima:"
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2176 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2167 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
@@ -4643,12 +4646,12 @@ msgid "Seen:"
 msgstr "Terlihat:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summary_column.c:79
-#: src/summaryview.c:2801
+#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
+#: src/prefs_summary_column.c:79 src/summaryview.c:2786
 msgid "Status"
 msgstr "Status"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:881
+#: src/gtk/headers.h:37 src/prefs_themes.c:880
 msgid "Status:"
 msgstr "Status:"
 
@@ -4716,7 +4719,7 @@ msgstr "Preseden"
 msgid "Precedence:"
 msgstr "Preseden:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1072
+#: src/gtk/headers.h:46 src/prefs_account.c:1066
 msgid "Organization"
 msgstr "Organisasi"
 
@@ -4933,9 +4936,9 @@ msgid "Icon Legend"
 msgstr "Legenda Ikon"
 
 #: src/gtk/icon_legend.c:140
+#, fuzzy
 msgid ""
-"<span weight=\"bold\">The following icons are used to show the status of "
-"messages and folders:</span>"
+"The following icons are used to show the status of messages and folders:"
 msgstr ""
 "<span weight=\"bold\">Ikon berikut ini digunakan untuk memperlihatkan status "
 "pesan dan direktori:</span>"
@@ -4973,16 +4976,22 @@ msgid "Clear _Log"
 msgstr "Kosongkan _Catatan"
 
 #: src/gtk/menu.c:137
+#, fuzzy
+msgid "Warning:"
+msgstr "Peringatan"
+
+#: src/gtk/menu.c:138
+#, fuzzy
 msgid ""
-"<span><b>Warning:</b> This URL was too long for displaying and\n"
+"This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
-"corrupted, malformed or part of some DoS attempt.</span>"
+"corrupted, malformed or part of some DoS attempt."
 msgstr ""
 "<span><b>Peringatan:</b> URL ini terlalu panjang untuk ditampilkan dan\n"
 "telah diperpendek untuk keamanan. Pesan ini bisa saja\n"
 "rusak, cacat atau merupakan bagian dari percobaan DoS.</span>"
 
-#: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
+#: src/gtk/pluginwindow.c:163 src/gtk/pluginwindow.c:168
 msgid ""
 "\n"
 "\n"
@@ -4992,22 +5001,22 @@ msgstr ""
 "\n"
 "Versi: "
 
-#: src/gtk/pluginwindow.c:167
+#: src/gtk/pluginwindow.c:166
 msgid "Error: "
 msgstr "Kesalahan: "
 
-#: src/gtk/pluginwindow.c:168
+#: src/gtk/pluginwindow.c:167
 msgid "Plugin is not functional."
 msgstr "Pengaya tidak berfungsi."
 
-#: src/gtk/pluginwindow.c:201
+#: src/gtk/pluginwindow.c:200
 msgid "Select the Plugins to load"
 msgstr "Pilih pengaya untuk dimuat"
 
-#: src/gtk/pluginwindow.c:216
-#, c-format
+#: src/gtk/pluginwindow.c:215
+#, fuzzy, c-format
 msgid ""
-"The following error occurred while loading %s :\n"
+"The following error occurred while loading %s:\n"
 "\n"
 "%s\n"
 msgstr ""
@@ -5015,7 +5024,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
 #: src/plugins/address_keeper/address_keeper_prefs.c:256
 #: src/plugins/archive/archiver_prefs.c:90
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
@@ -5024,8 +5033,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:424
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5034,59 +5044,58 @@ 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:569 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:79
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:680 src/prefs_toolbar.c:944
+#: 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:728 src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Pengaya"
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:336
 msgid "Load..."
 msgstr "Memuat..."
 
-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:337
 msgid "Unload"
 msgstr "Bongkar"
 
-#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:221
+#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:222
 msgid "Description"
 msgstr "Deskripsi"
 
 #: src/gtk/pluginwindow.c:374
-#, c-format
-msgid ""
-"For more information about plugins see the <a href=\"%s\"><span underline="
-"\"none\">Claws Mail website</span></a>."
+#, fuzzy, c-format
+msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
 "Untuk informasi lebih lanjut tentang pengaya lihat <a href=\"%s\"><span "
 "underline=\"none\">situs Claws Mail</span></a>."
 
-#: src/gtk/pluginwindow.c:414
+#: src/gtk/pluginwindow.c:415
 msgid "Click here to load one or more plugins"
 msgstr "Klik disini untuk memuat satu atau lebih pengaya"
 
-#: src/gtk/pluginwindow.c:417
+#: src/gtk/pluginwindow.c:418
 msgid "Unload the selected plugin"
 msgstr "Bongkar pengaya terpilih"
 
-#: src/gtk/pluginwindow.c:482
+#: src/gtk/pluginwindow.c:483
 msgid "Loaded plugins"
 msgstr "Pengaya termuat"
 
-#: src/gtk/prefswindow.c:674
+#: src/gtk/prefswindow.c:639
 msgid "Page Index"
 msgstr "Indeks halaman"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:831
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
 msgid "_Hide"
 msgstr "_Sembunyikan"
 
-#: src/gtk/progressdialog.c:141 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_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
+#: 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"
 msgstr "Akun"
 
@@ -5366,7 +5375,7 @@ msgid "Signer"
 msgstr "Penandatangan"
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:837
+#: src/prefs_themes.c:836
 msgid "Name: "
 msgstr "nama: "
 
@@ -5492,21 +5501,21 @@ msgstr "Sertifikat SSL dirubah dan tidak sah"
 msgid "SSL certificate changed"
 msgstr "Sertifikat SSL dirubah"
 
-#: src/headerview.c:95
+#: src/headerview.c:94
 msgid "Tags:"
 msgstr "Tag:"
 
-#: src/headerview.c:193 src/plugins/notification/notification_popup.c:316
-#: src/plugins/notification/notification_popup.c:621
-#: src/plugins/notification/notification_trayicon.c:851 src/summaryview.c:3361
-#: src/summaryview.c:3379 src/summaryview.c:3400
+#: src/headerview.c:192 src/plugins/notification/notification_popup.c:316
+#: src/plugins/notification/notification_popup.c:623
+#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3344
+#: src/summaryview.c:3362 src/summaryview.c:3383
 msgid "(No From)"
 msgstr "(Tidak ada Pengirim)"
 
-#: src/headerview.c:208 src/plugins/notification/notification_popup.c:318
-#: src/plugins/notification/notification_popup.c:625
-#: src/plugins/notification/notification_trayicon.c:854 src/summaryview.c:3413
-#: src/summaryview.c:3417
+#: src/headerview.c:207 src/plugins/notification/notification_popup.c:318
+#: src/plugins/notification/notification_popup.c:627
+#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3395
+#: src/summaryview.c:3398
 msgid "(No Subject)"
 msgstr "(Tidak ada subyek)"
 
@@ -5514,8 +5523,9 @@ msgstr "(Tidak ada subyek)"
 msgid "Error:"
 msgstr "Kesalahan:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2545
-#: src/plugins/pdf_viewer/poppler_viewer.c:698
+#: src/image_viewer.c:299 src/mimeview.c:2558
+#: src/plugins/att_remover/att_remover.c:301
+#: src/plugins/pdf_viewer/poppler_viewer.c:699
 msgid "Filename:"
 msgstr "Namaberkas:"
 
@@ -5531,225 +5541,217 @@ msgstr "Memuat Gambar"
 msgid "IMAP4 connection broken\n"
 msgstr "Sambungan IMAP4 putus\n"
 
+#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
+#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
+#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
+#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
+#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
+#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
+#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
+#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
+#: src/imap.c:744 src/imap.c:748
+#, fuzzy, c-format
+msgid "IMAP error on %s:"
+msgstr "Kesalahan IMAP pada %s: kondisi yang buruk\n"
+
 #: src/imap.c:621
-#, c-format
-msgid "IMAP error on %s: authenticated\n"
-msgstr "Kesalahan IMAP pada %s: diotentifikasi\n"
+#, fuzzy
+msgid "authenticated"
+msgstr "Otentifikasi"
 
 #: src/imap.c:624
-#, c-format
-msgid "IMAP error on %s: not authenticated\n"
-msgstr "Kesalahan IMAP pada %s: tidak diotentifikasi\n"
+#, fuzzy
+msgid "not authenticated"
+msgstr "Gunakan otentifikasi"
 
 #: src/imap.c:627
-#, c-format
-msgid "IMAP error on %s: bad state\n"
-msgstr "Kesalahan IMAP pada %s: kondisi yang buruk\n"
+msgid "bad state"
+msgstr ""
 
 #: src/imap.c:630
-#, c-format
-msgid "IMAP error on %s: stream error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan stream\n"
+#, fuzzy
+msgid "stream error"
+msgstr "Kesalahan internal"
 
 #: src/imap.c:633
-#, c-format
-msgid ""
-"IMAP error on %s: parse error (very probably non-RFC compliance from the "
-"server)\n"
+#, fuzzy
+msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "Kesalahan IMAP pada %s: kesalahan parse (kemungkinan besar tidak memenuhi "
 "non-RFC dari server)\n"
 
 #: src/imap.c:637
-#, c-format
-msgid "IMAP error on %s: connection refused\n"
-msgstr "kesalahan IMAP pada %s: sambungan ditolak\n"
+#, fuzzy
+msgid "connection refused"
+msgstr "Sambungan gagal"
 
 #: src/imap.c:640
-#, c-format
-msgid "IMAP error on %s: memory error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan memori\n"
+#, fuzzy
+msgid "memory error"
+msgstr "Kesalahan internal"
 
 #: src/imap.c:643
-#, c-format
-msgid "IMAP error on %s: fatal error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan fatal\n"
+#, fuzzy
+msgid "fatal error"
+msgstr "Kesalahan internal"
 
 #: src/imap.c:646
-#, c-format
-msgid ""
-"IMAP error on %s: protocol error(very probably non-RFC compliance from the "
-"server)\n"
+#, fuzzy
+msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 "Kesalahan IMAP pada %s: kesalahan protokol (kemungkinan besar tidak memenuhi "
 "non-RFC dari server)\n"
 
 #: src/imap.c:650
-#, c-format
-msgid "IMAP error on %s: connection not accepted\n"
+#, fuzzy
+msgid "connection not accepted"
 msgstr "Kesalahan IMAP pada %s: sambungan tidak diterima\n"
 
 #: src/imap.c:653
-#, c-format
-msgid "IMAP error on %s: APPEND error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan APPEND\n"
+msgid "APPEND error"
+msgstr ""
 
 #: src/imap.c:656
-#, c-format
-msgid "IMAP error on %s: NOOP error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan NOOP\n"
+msgid "NOOP error"
+msgstr ""
 
 #: src/imap.c:659
-#, c-format
-msgid "IMAP error on %s: LOGOUT error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan LOGOUT\n"
+msgid "LOGOUT error"
+msgstr ""
 
 #: src/imap.c:662
-#, c-format
-msgid "IMAP error on %s: CAPABILITY error\n"
+#, fuzzy
+msgid "CAPABILITY error"
 msgstr "Kesalahan IMAP pada %s: kesalahan CAPABILITY\n"
 
 #: src/imap.c:665
-#, c-format
-msgid "IMAP error on %s: CHECK error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan CHECK\n"
+#, fuzzy
+msgid "CHECK error"
+msgstr "Kesalahan"
 
 #: src/imap.c:668
-#, c-format
-msgid "IMAP error on %s: CLOSE error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan CLOSE\n"
+#, fuzzy
+msgid "CLOSE error"
+msgstr "Kesalahan"
 
 #: src/imap.c:671
-#, c-format
-msgid "IMAP error on %s: EXPUNGE error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan EXPUNGE\n"
+msgid "EXPUNGE error"
+msgstr ""
 
 #: src/imap.c:674
-#, c-format
-msgid "IMAP error on %s: COPY error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan COPY\n"
+msgid "COPY error"
+msgstr ""
 
 #: src/imap.c:677
-#, c-format
-msgid "IMAP error on %s: UID COPY error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan UID COPY\n"
+msgid "UID COPY error"
+msgstr ""
 
 #: src/imap.c:680
-#, c-format
-msgid "IMAP error on %s: CREATE error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan CREATE\n"
+msgid "CREATE error"
+msgstr ""
 
 #: src/imap.c:683
-#, c-format
-msgid "IMAP error on %s: DELETE error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan DELETE\n"
+msgid "DELETE error"
+msgstr ""
 
 #: src/imap.c:686
-#, c-format
-msgid "IMAP error on %s: EXAMINE error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan EXAMINE\n"
+msgid "EXAMINE error"
+msgstr ""
 
 #: src/imap.c:689
-#, c-format
-msgid "IMAP error on %s: FETCH error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan FETCH\n"
+#, fuzzy
+msgid "FETCH error"
+msgstr "Kesalahan"
 
 #: src/imap.c:692
-#, c-format
-msgid "IMAP error on %s: UID FETCH error\n"
+#, fuzzy
+msgid "UID FETCH error"
 msgstr "Kesalahan IMAP pada %s: kesalahan UID FETCH\n"
 
 #: src/imap.c:695
-#, c-format
-msgid "IMAP error on %s: LIST error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan LIST\n"
+#, fuzzy
+msgid "LIST error"
+msgstr "Kesalahan pada Soket."
 
 #: src/imap.c:698
-#, c-format
-msgid "IMAP error on %s: LOGIN error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan LOGIN\n"
+msgid "LOGIN error"
+msgstr ""
 
 #: src/imap.c:701
-#, c-format
-msgid "IMAP error on %s: LSUB error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan LSUB\n"
+#, fuzzy
+msgid "LSUB error"
+msgstr "Kesalahan tidak diketahui"
 
 #: src/imap.c:704
-#, c-format
-msgid "IMAP error on %s: RENAME error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan RENAME\n"
+msgid "RENAME error"
+msgstr ""
 
 #: src/imap.c:707
-#, c-format
-msgid "IMAP error on %s: SEARCH error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan SEARCH\n"
+msgid "SEARCH error"
+msgstr ""
 
 #: src/imap.c:710
-#, c-format
-msgid "IMAP error on %s: UID SEARCH error\n"
+#, fuzzy
+msgid "UID SEARCH error"
 msgstr "Kesalahan IMAP pada %s: kesalahan UID SEARCH\n"
 
 #: src/imap.c:713
-#, c-format
-msgid "IMAP error on %s: SELECT error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan SELECT\n"
+msgid "SELECT error"
+msgstr ""
 
 #: src/imap.c:716
-#, c-format
-msgid "IMAP error on %s: STATUS error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan STATUS\n"
+msgid "STATUS error"
+msgstr ""
 
 #: src/imap.c:719
-#, c-format
-msgid "IMAP error on %s: STORE error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan STORE\n"
+#, fuzzy
+msgid "STORE error"
+msgstr "Kesalahan"
 
 #: src/imap.c:722
-#, c-format
-msgid "IMAP error on %s: UID STORE error\n"
+#, fuzzy
+msgid "UID STORE error"
 msgstr "Kesalahan IMAP pada %s: kesalahan UID STORE\n"
 
 #: src/imap.c:725
-#, c-format
-msgid "IMAP error on %s: SUBSCRIBE error\n"
+#, fuzzy
+msgid "SUBSCRIBE error"
 msgstr "Kesalahan IMAP pada %s: kesalahan SUBSCRIBE\n"
 
 #: src/imap.c:728
-#, c-format
-msgid "IMAP error on %s: UNSUBSCRIBE error\n"
+#, fuzzy
+msgid "UNSUBSCRIBE error"
 msgstr "Kesalahan IMAP pada %s: kesalahan UNSUBSCRIBE\n"
 
 #: src/imap.c:731
-#, c-format
-msgid "IMAP error on %s: STARTTLS error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan STARTTLS\n"
+msgid "STARTTLS error"
+msgstr ""
 
 #: src/imap.c:734
-#, c-format
-msgid "IMAP error on %s: INVAL error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan INVAL\n"
+msgid "INVAL error"
+msgstr ""
 
 #: src/imap.c:737
-#, c-format
-msgid "IMAP error on %s: EXTENSION error\n"
+#, fuzzy
+msgid "EXTENSION error"
 msgstr "Kesalahan IMAP pada %s: kesalahan EXTENSION\n"
 
 #: src/imap.c:740
-#, c-format
-msgid "IMAP error on %s: SASL error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan SASL\n"
+#, fuzzy
+msgid "SASL error"
+msgstr "Kesalahan pada Soket."
 
 #: src/imap.c:744
-#, c-format
-msgid "IMAP error on %s: SSL error\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan SSL\n"
+#, fuzzy
+msgid "SSL error"
+msgstr "Kesalahan pada Soket."
 
 #: src/imap.c:748
-#, c-format
-msgid "IMAP error on %s: Unknown error [%d]\n"
-msgstr "Kesalahan IMAP pada %s: kesalahan tidak dikenal [%d]\n"
+#, fuzzy, c-format
+msgid "Unknown error [%d]"
+msgstr "Kesalahan tidak diketahui"
 
-#: src/imap.c:940
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5761,7 +5763,7 @@ msgstr ""
 "Login CRAM-MD5 hanya berfungsi jika libetpan dipaketkan dengan dukungan SASL "
 "dan pengaya CRAM-MD5 SASL telah terpasang."
 
-#: src/imap.c:946
+#: src/imap.c:958
 msgid ""
 "\n"
 "\n"
@@ -5773,7 +5775,7 @@ msgstr ""
 "Login DIGEST-MD5 hanya berfungsi jika libetpan dipaketkan dengan dukungan "
 "SASL dan pengaya DIGEST-MD5 SASL telah terpasang."
 
-#: src/imap.c:952
+#: src/imap.c:964
 #, fuzzy
 msgid ""
 "\n"
@@ -5786,36 +5788,62 @@ msgstr ""
 "Login CRAM-MD5 hanya berfungsi jika libetpan dipaketkan dengan dukungan SASL "
 "dan pengaya CRAM-MD5 SASL telah terpasang."
 
-#: src/imap.c:959
+#: src/imap.c:970
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"PLAIN logins only work if libetpan has been compiled with SASL support and "
+"the PLAIN SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Login CRAM-MD5 hanya berfungsi jika libetpan dipaketkan dengan dukungan SASL "
+"dan pengaya CRAM-MD5 SASL telah terpasang."
+
+#: src/imap.c:976
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"LOGIN logins only work if libetpan has been compiled with SASL support and "
+"the LOGIN SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Login DIGEST-MD5 hanya berfungsi jika libetpan dipaketkan dengan dukungan "
+"SASL dan pengaya DIGEST-MD5 SASL telah terpasang."
+
+#: src/imap.c:983
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Menyambung ke %s gagal: login ditolak.%s"
 
-#: src/imap.c:963
+#: src/imap.c:987
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Menyambung ke %s gagal: login ditolak.%s\n"
 
-#: src/imap.c:981
+#: src/imap.c:1005
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Menyambung ke %s gagal"
 
-#: 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 "Sambungan IMAP4 ke %s telah terputus. Menyambung ulang...\n"
 
-#: src/imap.c:1021 src/imap.c:3631 src/imap.c:4290 src/imap.c:4387
-#: src/imap.c:4567 src/imap.c:5376
+#: 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 membutuhkan akses jaringan guna mengakses server IMAP."
 
-#: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:278
+#: src/imap.c:1154 src/inc.c:811 src/news.c:388 src/send_message.c:282
 msgid "Insecure connection"
 msgstr "Sambungan tidak aman"
 
-#: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:279
+#: 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"
@@ -5829,108 +5857,104 @@ msgstr ""
 "Apakah anda ingin melanjutkan menyambung ke server? Komunikasi tidak akan "
 "diamankan."
 
-#: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:285
+#: src/imap.c:1161 src/inc.c:818 src/news.c:395 src/send_message.c:289
 msgid "Con_tinue connecting"
 msgstr "Lanju_tkan menyambung"
 
-#: src/imap.c:1147
+#: src/imap.c:1171
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Akun '%s': Menyambung ke server IMAP4: %s:%d..."
 
-#: src/imap.c:1195
+#: src/imap.c:1219
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Tidak dapat menyambung ke server IMAP4: %s:%d"
 
-#: src/imap.c:1198
+#: src/imap.c:1222
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Tidak dapat menyambung ke server IMAP4: %s:%d\n"
 
-#: src/imap.c:1231 src/imap.c:4052
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr "Tidak dapat menjalankan sesi TLS.\n"
 
-#: src/imap.c:1294
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Tidak dapat login ke server IMAP %s.\n"
 
-#: src/imap.c:1297
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Tidak dapat login ke server IMAP %s."
 
-#: src/imap.c:1715
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Menambahkan pesan..."
 
-#: src/imap.c:1920 src/mh.c:532
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Menyalin pesan..."
 
-#: src/imap.c:2504
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "Tidak dapat menandai penanda terhapus\n"
 
-#: src/imap.c:2511 src/imap.c:5006
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "tidak dapat expunge\n"
 
-#: src/imap.c:2862
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Mencari direktori takterdaftar di %s..."
 
-#: src/imap.c:2865
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Mencari subdirektori dari %s..."
 
-#: src/imap.c:3171
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Tidak dapat membuat kotaksurat: LIST gagal\n"
 
-#: src/imap.c:3186
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "Tidak dapat membuat kotaksurat\n"
 
-#: src/imap.c:3277
-msgid "New folder name must not contain the namespace path separator"
-msgstr "Nama direktori baru tidak boleh mengandung pemisah nama lokasi"
-
-#: src/imap.c:3317
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Tidak dapat mengganti nama kotaksurat: %s ke %s\n"
 
-#: src/imap.c:3430
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "Tidak dapat menghapus kotaksurat\n"
 
-#: src/imap.c:3709
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST gagal\n"
 
-#: src/imap.c:3794
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Menandai pesan..."
 
-#: src/imap.c:3897
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Tidak dapat memilih direktori: %s\n"
 
-#: src/imap.c:4049
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Server membutuhkan TLS untuk login.\n"
 
-#: src/imap.c:4059
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Tidak dapat memperbaharui kapabilitas.\n"
 
-#: src/imap.c:4064
+#: src/imap.c:4122
 #, fuzzy, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5939,24 +5963,24 @@ msgstr ""
 "Sambungan ke %s gagal: server membutuhkan TLS, namun Claws Mail telah "
 "dipaketkan tanpa dukungan OpenSSL.\n"
 
-#: src/imap.c:4072
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Login ke Server dinonaktifkan.\n"
 
-#: src/imap.c:4295
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Mengambil pesan..."
 
-#: src/imap.c:4999
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Tidak dapat menandai penanda terhapus: %d\n"
 
-#: src/imap.c:6032
+#: src/imap.c:6089
+#, fuzzy
 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 ""
@@ -6003,7 +6027,7 @@ msgstr "Pen_daftaran"
 msgid "_Subscribe..."
 msgstr "_Mendaftar..."
 
-#: 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 "_Unsubscribe..."
 
@@ -6024,7 +6048,7 @@ msgstr "Bangun ulang susunan dir_ektori"
 msgid "Show only subscribed _folders"
 msgstr "Hanya tampilkan direktori terda_ftar"
 
-#: src/imap_gtk.c:196
+#: src/imap_gtk.c:194
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
@@ -6035,26 +6059,26 @@ msgstr ""
 "meletakkan subdirektori saja dan tanpa surat, tambahkan '/' di nama "
 "direktori)"
 
-#: src/imap_gtk.c:200 src/mh_gtk.c:148
+#: src/imap_gtk.c:198 src/mh_gtk.c:147
 msgid "Inherit properties from parent folder"
 msgstr "Properti turunan dari direktori atasnya"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/news_gtk.c:306
-#: src/plugins/mailmbox/plugin_gtk.c:414 src/plugins/rssyl/rssyl_cb_menu.c:201
-#: src/plugins/vcalendar/vcal_folder.c:2034
+#: 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 "Masukkan nama baru untuk '%s':"
 
-#: src/imap_gtk.c:263 src/mh_gtk.c:256 src/plugins/mailmbox/plugin_gtk.c:415
-#: src/plugins/rssyl/rssyl_cb_menu.c:202
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: 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 "Ganti nama direktori"
 
-#: src/imap_gtk.c:292 src/mh_gtk.c:282 src/news_gtk.c:328
-#: src/plugins/mailmbox/plugin_gtk.c:445 src/plugins/rssyl/rssyl_cb_menu.c:228
-#: src/plugins/vcalendar/vcal_folder.c:2055
+#: 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."
@@ -6062,7 +6086,7 @@ msgstr ""
 "Direktori tidak dapat di ganti nama.\n"
 "Nama direktori baru tidak diperbolehkan."
 
-#: src/imap_gtk.c:360 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:154
+#: 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 "
@@ -6075,44 +6099,45 @@ msgstr ""
 "\n"
 "Anda benar-benar ingin menghapus?"
 
-#: src/imap_gtk.c:381 src/news_gtk.c:281 src/plugins/mailmbox/plugin_gtk.c:350
-#: src/plugins/rssyl/rssyl_cb_menu.c:175
-#: src/plugins/vcalendar/vcal_folder.c:1988
+#: 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 "Tidak dapat menghapus direktori '%s'."
 
-#: src/imap_gtk.c:507
+#: src/imap_gtk.c:498
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "Apakah anda akan mencari subdirektori takterdaftar dari '%s'?"
 
-#: src/imap_gtk.c:510
+#: src/imap_gtk.c:501
 msgid "Search recursively"
 msgstr "Cari secara rekursif"
 
-#: src/imap_gtk.c:515 src/imap_gtk.c:574
+#: src/imap_gtk.c:506 src/imap_gtk.c:565
 msgid "Subscriptions"
 msgstr "Pendaftaran"
 
-#: src/imap_gtk.c:516
-msgid "+_Search"
+#: src/imap_gtk.c:507
+#, fuzzy
+msgid "_Search"
 msgstr "+_Cari"
 
-#: src/imap_gtk.c:526
+#: src/imap_gtk.c:517
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Pilih sub direktori dari %s untuk didaftarkan ke:"
 
-#: src/imap_gtk.c:537 src/mainwindow.c:674
+#: src/imap_gtk.c:528 src/mainwindow.c:679
 msgid "Subscribe"
 msgstr "Daftarkan"
 
-#: src/imap_gtk.c:539 src/imap_gtk.c:541
+#: src/imap_gtk.c:530 src/imap_gtk.c:532
 msgid "All of them"
 msgstr "Seluruhnya"
 
-#: src/imap_gtk.c:557
+#: src/imap_gtk.c:548
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6124,31 +6149,32 @@ msgstr ""
 "Jika ada direktori baru yang dibuat dan terdaftar dari tempat lain, gunakan "
 "\"Periksa direktori baru\" pada direktori utama kotaksurat."
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:557
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Apakah anda ingin %s direktori '%s'?"
 
-#: src/imap_gtk.c:567
+#: src/imap_gtk.c:558
 msgid "subscribe"
 msgstr "daftarkan"
 
-#: src/imap_gtk.c:567
+#: src/imap_gtk.c:558
 msgid "unsubscribe"
 msgstr "unsubscribe"
 
-#: src/imap_gtk.c:569 src/prefs_folder_item.c:1440
-#: src/prefs_folder_item.c:1468 src/prefs_folder_item.c:1496
+#: 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 "Terapkan pada sub direktori"
 
-#: src/imap_gtk.c:575
-msgid "+_Subscribe"
+#: src/imap_gtk.c:566
+#, fuzzy
+msgid "_Subscribe"
 msgstr "+_Daftarkan"
 
-#: src/imap_gtk.c:575
-msgid "+_Unsubscribe"
-msgstr "+_Unsubscribe"
+#: src/imap_gtk.c:567 src/news_gtk.c:252
+msgid "_Unsubscribe"
+msgstr "_Berhenti langganan"
 
 #: src/import.c:113 src/import.c:207
 msgid "Import mbox file"
@@ -6182,77 +6208,77 @@ msgstr "Tidak dapat menemukan direktori tujuan."
 msgid "Select importing file"
 msgstr "Pilih berkas pengimpor"
 
-#: src/importldif.c:186
+#: src/importldif.c:185
 msgid "Please specify address book name and file to import."
 msgstr "Silahkan tentukan nama buku alamat dan berkas untuk di impor."
 
-#: src/importldif.c:189
+#: src/importldif.c:188
 msgid "Select and rename LDIF field names to import."
 msgstr "Pilih dan ganti nama kolom LDIF untuk di impor."
 
-#: src/importldif.c:192
+#: src/importldif.c:191
 msgid "File imported."
 msgstr "Berkas telah di impor."
 
-#: src/importldif.c:451 src/importmutt.c:123 src/importpine.c:122
+#: src/importldif.c:450 src/importmutt.c:122 src/importpine.c:121
 msgid "Please select a file."
 msgstr "Silahkan pilih berkas."
 
-#: src/importldif.c:457 src/importmutt.c:128 src/importpine.c:127
+#: src/importldif.c:456 src/importmutt.c:127 src/importpine.c:126
 msgid "Address book name must be supplied."
 msgstr "Nama buku alamat harus diisikan."
 
-#: src/importldif.c:497
+#: src/importldif.c:496
 msgid "LDIF file imported successfully."
 msgstr "Berkas LDIF telah diimpor dengan sukses."
 
-#: src/importldif.c:582
+#: src/importldif.c:581
 msgid "Select LDIF File"
 msgstr "Pilih berkas LDIF"
 
-#: src/importldif.c:668
+#: src/importldif.c:667
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr "Tentukan nama buku alamat yang akan dibuat dari berkas data LDIF."
 
-#: src/importldif.c:673
+#: src/importldif.c:672
 msgid "File Name"
 msgstr "Nama Berkas"
 
-#: src/importldif.c:683
+#: src/importldif.c:682
 msgid "The full file specification of the LDIF file to import."
 msgstr "Spesifikasi lengkap dari berkas LDIF yang akan di impor."
 
-#: src/importldif.c:690
+#: src/importldif.c:689
 msgid "Select the LDIF file to import."
 msgstr "Pilih berkas LDIF yang akan di impor."
 
-#: src/importldif.c:726
+#: src/importldif.c:725
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:727 src/summaryview.c:439
+#: src/importldif.c:726 src/summaryview.c:438
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:728
+#: src/importldif.c:727
 msgid "LDIF Field Name"
 msgstr "Nama Kolom LDIF"
 
-#: src/importldif.c:729
+#: src/importldif.c:728
 msgid "Attribute Name"
 msgstr "Nama Atribut"
 
-#: src/importldif.c:784
+#: src/importldif.c:783
 msgid "LDIF Field"
 msgstr "Kolom LDIF"
 
-#: src/importldif.c:796
+#: src/importldif.c:795
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:808
+#: src/importldif.c:807
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6270,201 +6296,203 @@ msgstr ""
 "dibawah daftar.  Sebuah klik ganda dimana saja pada baris juga akan memilih "
 "kolom untuk impor."
 
-#: src/importldif.c:823
+#: src/importldif.c:822
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "Kolom LDIF dapat di ganti nama ke nama atribut pengguna."
 
-#: src/importldif.c:828
+#: src/importldif.c:827
 msgid "Select for Import"
 msgstr "Pilih untuk impor"
 
-#: src/importldif.c:833
+#: src/importldif.c:832
 msgid "Select the LDIF field for import into the address book."
 msgstr "Pilih kolom LDIF untuk di impor ke buku alamat."
 
-#: src/importldif.c:835
+#: src/importldif.c:834
 msgid " Modify "
 msgstr " Perbaiki "
 
-#: src/importldif.c:840
+#: src/importldif.c:839
 msgid "This button will update the list above with the data supplied."
 msgstr "Tombol ini akan memperbarui daftar diatas dengan data yang diberikan."
 
-#: src/importldif.c:912
-msgid "Records Imported :"
+#: src/importldif.c:911
+#, fuzzy
+msgid "Records Imported:"
 msgstr "Rekaman yang di impor :"
 
-#: src/importldif.c:944
+#: src/importldif.c:943
 msgid "Import LDIF file into Address Book"
 msgstr "Impor berkas LDIF ke Buku Alamat"
 
-#: src/importldif.c:981
+#: src/importldif.c:980
 msgid "Proceed"
 msgstr "Lanjutkan"
 
-#: src/importmutt.c:142
+#: src/importmutt.c:141
 msgid "Error importing MUTT file."
 msgstr "Kesalahan dalam mengimpor berkas MUTT."
 
-#: src/importmutt.c:157
+#: src/importmutt.c:156
 msgid "Select MUTT File"
 msgstr "Pilih Berkas MUTT"
 
-#: src/importmutt.c:204
+#: src/importmutt.c:203
 msgid "Import MUTT file into Address Book"
 msgstr "Impor berkas MUTT ke Buku Alamat"
 
-#: src/importmutt.c:289 src/importpine.c:289
+#: src/importmutt.c:288 src/importpine.c:288
 msgid "Please select a file to import."
 msgstr "Silahkan pilih berkas untuk di impor."
 
-#: src/importpine.c:141
+#: src/importpine.c:140
 msgid "Error importing Pine file."
 msgstr "Kesalahan dalam mengimpor berkas Pine."
 
-#: src/importpine.c:156
+#: src/importpine.c:155
 msgid "Select Pine File"
 msgstr "Pilih Berkas Pine"
 
-#: src/importpine.c:203
+#: src/importpine.c:202
 msgid "Import Pine file into Address Book"
 msgstr "Impor berkas Pine ke Buku Alamat"
 
-#: 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 "Claws Mail membutuhkan akses jaringan untuk mengambil surat."
 
-#: src/inc.c:344
+#: src/inc.c:343
 #, c-format
 msgid "%s failed\n"
 msgstr "%s gagal\n"
 
-#: src/inc.c:417
+#: src/inc.c:416
 msgid "Retrieving new messages"
 msgstr "Mengambil pesan baru"
 
-#: src/inc.c:478
+#: src/inc.c:474
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:621 src/inc.c:675
+#: src/inc.c:615 src/inc.c:669
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: src/inc.c:632
+#: src/inc.c:626
 msgid "Retrieving"
 msgstr "Mengambil"
 
-#: 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] "Selesai (%d pesan (%s) diterima)"
 msgstr[1] "Selesai (%d pesan (%s) diterima)"
 
-#: src/inc.c:647
+#: src/inc.c:641
 msgid "Done (no new messages)"
 msgstr "Selesai (tidak ada pesan baru)"
 
-#: src/inc.c:652
+#: src/inc.c:646
 msgid "Connection failed"
 msgstr "Sambungan gagal"
 
-#: src/inc.c:655
+#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
 msgid "Auth failed"
 msgstr "Otentifikasi gagal"
 
-#: src/inc.c:662 src/prefs_matcher.c:396 src/prefs_summary_column.c:88
-#: src/summaryview.c:2797 src/summaryview.c:6318
+#: 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 "Dikunci"
 
-#: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Timeout"
 msgstr "Waktuhabis"
 
-#: src/inc.c:759
+#: src/inc.c:752
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Selesai (%d pesan baru)"
 msgstr[1] "Selesai (%d pesan baru)"
 
-#: src/inc.c:763
+#: src/inc.c:756
 msgid "Finished (no new messages)"
 msgstr "Selesai (tidak ada pesan baru)"
 
-#: src/inc.c:802
+#: src/inc.c:795
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Mengambil pesan baru"
 
-#: src/inc.c:832
+#: src/inc.c:825
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Akun '%s': Menyambung ke server POP3: %s:%d..."
 
-#: src/inc.c:850
+#: src/inc.c:843
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Tidak dapat menyambung ke server POP3: %s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:847
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Tidak dapat menyambung ke server POP3: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
+#: src/send_message.c:496
 msgid "Authenticating..."
 msgstr "Melakukan Otentifikasi..."
 
-#: src/inc.c:936
+#: src/inc.c:929
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Mengambil pesan dari %s (%s)..."
 
-#: src/inc.c:942
+#: src/inc.c:935
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Menghitung jumlah pesan baru (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:939
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Menghitung jumlah pesan baru (LAST)..."
 
-#: src/inc.c:950
+#: src/inc.c:943
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Menghitung jumlah pesan baru (UIDL)..."
 
-#: src/inc.c:954
+#: src/inc.c:947
 msgid "Getting the size of messages (LIST)..."
 msgstr "Menghitung ukuran pesan (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:512
+#: src/inc.c:954 src/send_message.c:514
 msgid "Quitting"
 msgstr "Keluar"
 
-#: src/inc.c:986
+#: src/inc.c:979
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Mengambil pesan (%d / %d) (%s / %s)"
 
-#: 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] "Mengambil (%d pesan (%s) diterima)"
 msgstr[1] "Mengambil (%d pesan (%s) diterima)"
 
-#: src/inc.c:1158
+#: src/inc.c:1151
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Sambungan ke %s:%d gagal."
 
-#: src/inc.c:1163
+#: src/inc.c:1156
 msgid "Error occurred while processing mail."
 msgstr "Kesalahan terjadi ketika memproses surat."
 
-#: src/inc.c:1169
+#: src/inc.c:1162
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6473,37 +6501,37 @@ msgstr ""
 "Kesalahan terjadi ketika memproses surat:\n"
 "%s"
 
-#: src/inc.c:1175
+#: src/inc.c:1168
 msgid "No disk space left."
 msgstr "Tidak ada ruang disk tersisa."
 
-#: src/inc.c:1180
+#: src/inc.c:1173
 msgid "Can't write file."
 msgstr "Tidak dapat menulis berkas."
 
-#: src/inc.c:1185
+#: src/inc.c:1178
 msgid "Socket error."
 msgstr "Kesalahan pada Soket."
 
-#: src/inc.c:1188
+#: src/inc.c:1181
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Soket mengalami kesalahan saat menyambung ke %s:%d."
 
-#: src/inc.c:1193 src/send_message.c:423 src/send_message.c:686
+#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
 msgid "Connection closed by the remote host."
 msgstr "Sambungan ditutup oleh remote host."
 
-#: src/inc.c:1196
+#: src/inc.c:1189
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Sambungan ke %s:%d ditutup oleh remote host."
 
-#: src/inc.c:1201
+#: src/inc.c:1194
 msgid "Mailbox is locked."
 msgstr "Kotaksurat dikunci."
 
-#: src/inc.c:1205
+#: src/inc.c:1198
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6512,11 +6540,11 @@ msgstr ""
 "Kotaksurat dikunci:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:671
+#: src/inc.c:1204 src/send_message.c:673
 msgid "Authentication failed."
 msgstr "Otentifikasi gagal."
 
-#: src/inc.c:1217 src/send_message.c:674
+#: src/inc.c:1210 src/send_message.c:676
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6525,7 +6553,7 @@ msgstr ""
 "Otentifikasi gagal:\n"
 "%s"
 
-#: src/inc.c:1222 src/send_message.c:690
+#: 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."
@@ -6533,26 +6561,26 @@ msgstr ""
 "Waktu sesi habis. Anda dapat menyelamatkannya dengan meningkatkan nilai "
 "waktuhabis pada Preferensi/Lainnya/Macam-macam."
 
-#: src/inc.c:1227
+#: src/inc.c:1220
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Sambungan ke %s:%d habis waktu."
 
-#: src/inc.c:1265
+#: src/inc.c:1258
 msgid "Incorporation cancelled\n"
 msgstr "proses dibatalkan\n"
 
-#: src/inc.c:1530
+#: src/inc.c:1523
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sAnda bekerja offline. Abaikan untuk %d menit?"
 
-#: src/inc.c:1536
+#: src/inc.c:1529
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sAnda bekerja offline. Abaikan?"
 
-#: src/inc.c:1543
+#: src/inc.c:1536
 msgid "On_ly once"
 msgstr "Hanya seka_li"
 
@@ -6560,11 +6588,11 @@ msgstr "Hanya seka_li"
 msgid "Some SN"
 msgstr ""
 
-#: src/ldif.c:759
+#: src/ldif.c:758
 msgid "Nick Name"
 msgstr "Nama Panggilan"
 
-#: src/main.c:242
+#: src/main.c:244
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6573,7 +6601,7 @@ msgstr ""
 "Berkas '%s' telah ada.\n"
 "Tidak dapat membuat direktori."
 
-#: src/main.c:363
+#: src/main.c:365
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6582,7 +6610,7 @@ msgstr ""
 "Konfigurasi %s ditemukan.\n"
 "Anda ingin memigrasikan konfigurasi ini?"
 
-#: src/main.c:365
+#: src/main.c:367
 #, c-format
 msgid ""
 "\n"
@@ -6595,11 +6623,11 @@ msgstr ""
 "Aturan penyaringan Sylpheed anda dapat dikonversi dengan\n"
 "kode yang tersedia di %s."
 
-#: src/main.c:377
+#: src/main.c:379
 msgid "Keep old configuration"
 msgstr "Simpan konfigurasi lama"
 
-#: 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 "
@@ -6609,47 +6637,32 @@ msgstr ""
 "membutuhkan waktu jika anda menampung IMAP atau data Berita, dan membutuhkan "
 "tambahan ruang pada disk anda."
 
-#: src/main.c:388
+#: src/main.c:390
 msgid "Migration of configuration"
 msgstr "Migrasi konfigurasi"
 
-#: src/main.c:399
+#: src/main.c:401
 msgid "Copying configuration... This may take a while..."
 msgstr "Menyalin konfigurasi... Membutuhkan waktu..."
 
-#: src/main.c:408
+#: src/main.c:410
 msgid "Migration failed!"
 msgstr "Migrasi gagal!"
 
-#: src/main.c:417
+#: src/main.c:419
 msgid "Migrating configuration..."
 msgstr "Memigrasi konfigurasi..."
 
-#: src/main.c:937
-msgid "Failed to register folder item update hook"
-msgstr "Gagal untuk registrasi item direktori kaitan baru"
-
-#: src/main.c:944
-msgid "Failed to register folder update hook"
-msgstr "Gagal untuk registrasi direktori kaitan baru"
-
-#: src/main.c:1117
+#: src/main.c:1119
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread tidak didukung oleh glib.\n"
 
-#: src/main.c:1136
-msgid "Sylpheed-Claws 2.6.0 (or older)"
-msgstr "Sylpheed-Claws 2.6.0 (atau lebih lama)"
-
-#: src/main.c:1139
-msgid "Sylpheed-Claws 1.9.15 (or older)"
-msgstr "Sylpheed-Claws 1.9.15 (atau lebih lama)"
-
-#: src/main.c:1142
-msgid "Sylpheed-Claws 1.0.5 (or older)"
-msgstr "Sylpheed-Claws 1.0.5 (atau lebih lama)"
+#: src/main.c:1139 src/main.c:1143 src/main.c:1147
+#, fuzzy
+msgid "(or older)"
+msgstr "Direktori sumber:"
 
-#: src/main.c:1442
+#: src/main.c:1448
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6668,7 +6681,7 @@ msgstr[1] ""
 "informasi lebih lanjut:\n"
 "%s"
 
-#: src/main.c:1470
+#: 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 "
@@ -6678,7 +6691,7 @@ msgstr ""
 "Kemungkinan karena kegagalan akun IMAP. Gunakan \"Bangun ulang struktur "
 "direktori\" pada menu konteks direktori utama kotaksurat untuk memperbaiki."
 
-#: src/main.c:1476
+#: 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 "
@@ -6688,36 +6701,36 @@ msgstr ""
 "dimuat. Kemungkinan akibat pengaya eksternal yang lama. Silahkan pasang "
 "ulang pengaya dan ulangi lagi."
 
-#: src/main.c:1726
+#: src/main.c:1750
 msgid "Missing filename\n"
 msgstr "Nama berkas hilang\n"
 
-#: src/main.c:1733
+#: src/main.c:1757
 msgid "Cannot open filename for reading\n"
 msgstr "Tidak dapat membuka nama berkas untuk dibaca\n"
 
-#: src/main.c:1744
+#: src/main.c:1768
 msgid "Malformed header\n"
 msgstr "Header yang salah format\n"
 
-#: src/main.c:1751
+#: src/main.c:1775
 msgid "Duplicated 'To:' header\n"
 msgstr "header 'Kepada:' ganda\n"
 
-#: src/main.c:1762
+#: src/main.c:1786
 msgid "Missing required 'To:' header\n"
 msgstr "Header 'Kepada:' seharusnya ada\n"
 
-#: src/main.c:1905
+#: src/main.c:1929
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Penggunaan: %s [PILIHAN]...\n"
 
-#: src/main.c:1907
+#: src/main.c:1931
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [alamat]    membuka jendela tulis"
 
-#: src/main.c:1908
+#: src/main.c:1932
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6736,11 +6749,11 @@ msgstr ""
 "sampai\n"
 "                         baris kosong, lalu badan surat sampai akhir berkas."
 
-#: src/main.c:1913
+#: src/main.c:1937
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]    mendaftar ke alamat URI yang diberikan"
 
-#: src/main.c:1914
+#: src/main.c:1938
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6750,23 +6763,23 @@ msgstr ""
 "                       membuka jendela tulis dengan melampirkan berkas "
 "tertera"
 
-#: src/main.c:1917
+#: src/main.c:1941
 msgid "  --receive              receive new messages"
 msgstr "  --receive    menerima pesan baru"
 
-#: src/main.c:1918
+#: src/main.c:1942
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all     menerima pesan baru dari semua akun"
 
-#: src/main.c:1919
+#: src/main.c:1943
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving    membatalkan penerimaan pesan"
 
-#: src/main.c:1920
+#: src/main.c:1944
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending    membatalkan pengiriman pesan"
 
-#: src/main.c:1921
+#: src/main.c:1945
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6785,15 +6798,15 @@ msgstr ""
 "                         permintaan: kata yang dicari\n"
 "                         rekursif: false jika diisi dengan 0, n, N, f atau F"
 
-#: src/main.c:1928
+#: src/main.c:1952
 msgid "  --send                 send all queued messages"
 msgstr "  --send     kirim semua antrian pesan"
 
-#: src/main.c:1929
+#: src/main.c:1953
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [direktori]...   menunjukkan total jumlah pesan"
 
-#: src/main.c:1930
+#: src/main.c:1954
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6801,15 +6814,15 @@ msgstr ""
 "  --status-full [direktori]...\n"
 "                menunjukkan status dari setiap direktori"
 
-#: src/main.c:1932
+#: src/main.c:1956
 msgid "  --statistics           show session statistics"
 msgstr " --statistik           perlihatkan statistik sesi"
 
-#: src/main.c:1933
+#: src/main.c:1957
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistik     reset statistik sesi"
 
-#: src/main.c:1934
+#: src/main.c:1958
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6817,35 +6830,35 @@ msgstr ""
 "  --select direktori[/msg]   menuju direktori/pesan yg ditentukan\n"
 "              direktori adalah id direktori seperti 'direktori/sub_direktori'"
 
-#: src/main.c:1936
+#: src/main.c:1960
 msgid "  --online               switch to online mode"
 msgstr "  --online     berallih ke modus online"
 
-#: src/main.c:1937
+#: src/main.c:1961
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline     beralih ke modus offline"
 
-#: src/main.c:1938
+#: src/main.c:1962
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q     keluar dari Claws Mail"
 
-#: src/main.c:1939
+#: src/main.c:1963
 msgid "  --debug                debug mode"
 msgstr "  -debug      modus debug"
 
-#: src/main.c:1940
+#: src/main.c:1964
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug      beralih modus debug"
 
-#: src/main.c:1941
+#: src/main.c:1965
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h        menampilkan bantuan ini dan keluar"
 
-#: src/main.c:1942
+#: src/main.c:1966
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v          menampilkan informasi versi dan keluar"
 
-#: src/main.c:1943
+#: src/main.c:1967
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6853,11 +6866,11 @@ msgstr ""
 "  --version-full -V     menampilkan versi dan informasi fitur tertanam dan "
 "keluar"
 
-#: src/main.c:1944
+#: src/main.c:1968
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir         menampilkan direktori konfigurasi"
 
-#: src/main.c:1945
+#: src/main.c:1969
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6865,834 +6878,852 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                      gunakan direktori konfigurasi tertera"
 
-#: src/main.c:1995
+#: 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 "Pilihan takdiketahui\n"
 
-#: src/main.c:2013
+#: src/main.c:2042
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Memproses (%s)..."
 
-#: src/main.c:2016
+#: src/main.c:2045
 msgid "top level folder"
 msgstr "direktori level teratas"
 
-#: src/main.c:2099
+#: src/main.c:2128
 msgid "Queued messages"
 msgstr "antrian pesan"
 
-#: src/main.c:2100
+#: src/main.c:2129
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Beberapa pesan yang belum dikirim dalam antrian. Keluar sekarang?"
 
-#: src/main.c:2842
+#: src/main.c:2871
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: jaringan sedang online.\n"
 
-#: src/main.c:2848
+#: src/main.c:2877
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: jaringan sedang offline.\n"
 
-#: src/mainwindow.c:505 src/messageview.c:209
+#: src/mainwindow.c:511 src/messageview.c:208
 msgid "_File"
 msgstr "_Berkas"
 
-#: src/mainwindow.c:507 src/messageview.c:211 src/summaryview.c:434
+#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
 msgid "_View"
 msgstr "_Tampilan"
 
-#: src/mainwindow.c:510
+#: src/mainwindow.c:516
 msgid "_Configuration"
 msgstr "_Konfigurasi"
 
-#: src/mainwindow.c:514
+#: src/mainwindow.c:520
 msgid "_Add mailbox"
 msgstr "_Tambah kotaksurat"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:521
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:524
 msgid "Change mailbox order..."
 msgstr "Ganti urutan kotaksurat..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:527
 msgid "_Import mbox file..."
 msgstr "_Impor berkas mbox..."
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:528
 msgid "_Export to mbox file..."
 msgstr "_Ekspor ke berkas mbox..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:529
 msgid "_Export selected to mbox file..."
 msgstr "_Ekspor terpilih ke berkas mbox..."
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:531
 msgid "Empty all _Trash folders"
 msgstr "Kosongkan semua direktori _Tong Sampah"
 
-#: src/mainwindow.c:528 src/messageview.c:218
+#: src/mainwindow.c:534 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "_Simpan email sebagai..."
 
-#: src/mainwindow.c:529 src/messageview.c:219
+#: src/mainwindow.c:535 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "_Simpan bagian sebagai..."
 
-#: src/mainwindow.c:532 src/messageview.c:220
+#: src/mainwindow.c:538 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Atur halaman..."
 
-#: src/mainwindow.c:533 src/messageview.c:221
+#: src/mainwindow.c:539 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Cetak..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:541
 msgid "Synchronise folders"
 msgstr "Sinkronkan direktori"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:543
 msgid "E_xit"
 msgstr "_Keluar"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:548
 msgid "Select _thread"
 msgstr "Pilih _thread"
 
-#: src/mainwindow.c:543
-msgid "_Delete thread"
-msgstr "_Hapus thread"
-
-#: src/mainwindow.c:545
+#: src/mainwindow.c:550
 msgid "_Find in current message..."
 msgstr "_Cari pada pesan aktif..."
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:552
 msgid "_Quick search"
 msgstr "_Pencarian cepat"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:555
 msgid "Show or hi_de"
 msgstr "Tampilkan atau sem_bunyikan"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:556
 msgid "_Toolbar"
 msgstr "_Bar peralatan"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:558
 msgid "Set displayed _columns"
 msgstr "Atur _kolom yang ditampilkan"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:559
 msgid "In _folder list..."
 msgstr "Pada _daftar direktori..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:560
 msgid "In _message list..."
 msgstr "Pada daftar _pesan..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:565
 msgid "La_yout"
 msgstr "La_yout"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:568
 msgid "_Sort"
 msgstr "_Urutkan"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:570
 msgid "_Attract by subject"
 msgstr "_Attract berdasar subyek"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:572
 msgid "E_xpand all threads"
 msgstr "E_xpand semua utas"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:573
 msgid "Co_llapse all threads"
 msgstr "Co_llapse semua utas"
 
-#: src/mainwindow.c:570 src/messageview.c:232
+#: src/mainwindow.c:575 src/messageview.c:231
 msgid "_Go to"
 msgstr "_Pergi ke"
 
-#: src/mainwindow.c:571 src/messageview.c:233
+#: src/mainwindow.c:576 src/messageview.c:232
 msgid "_Previous message"
 msgstr "Pesan _sebelum"
 
-#: src/mainwindow.c:572 src/messageview.c:234
+#: src/mainwindow.c:577 src/messageview.c:233
 msgid "_Next message"
 msgstr "Pesan _berikut"
 
-#: src/mainwindow.c:574 src/messageview.c:236
+#: src/mainwindow.c:579 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "P_esan belumdibaca sebelum"
 
-#: src/mainwindow.c:575 src/messageview.c:237
+#: src/mainwindow.c:580 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Pesan belumdibaca be_rikut"
 
-#: src/mainwindow.c:577 src/messageview.c:239
+#: src/mainwindow.c:582 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Pesan bar_u sebelum"
 
-#: src/mainwindow.c:578 src/messageview.c:240
+#: src/mainwindow.c:583 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "Pesan b_aru berikut"
 
-#: src/mainwindow.c:580 src/messageview.c:242
+#: src/mainwindow.c:585 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "Pesan ber_tanda sebelum"
 
-#: src/mainwindow.c:581 src/messageview.c:243
+#: src/mainwindow.c:586 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "Pesan bertan_da berikut"
 
-#: src/mainwindow.c:583 src/messageview.c:245
+#: src/mainwindow.c:588 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "Pesan ber_label sebelum"
 
-#: src/mainwindow.c:584 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Pesan berla_bel berikut"
 
-#: src/mainwindow.c:586 src/messageview.c:248
+#: src/mainwindow.c:591 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Pesan yang telah dibuka sebelumnya"
 
-#: src/mainwindow.c:587 src/messageview.c:249
+#: src/mainwindow.c:592 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Pesan yang telah dibuka berikutnya"
 
-#: src/mainwindow.c:589 src/messageview.c:251
+#: src/mainwindow.c:594 src/messageview.c:250
 msgid "Parent message"
 msgstr "Pesan parent"
 
-#: src/mainwindow.c:591 src/messageview.c:253
+#: src/mainwindow.c:596 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "_Direktori belumdibaca berikut"
 
-#: src/mainwindow.c:592 src/messageview.c:254
-msgid "_Other folder..."
-msgstr "Direkt_ori lain..."
+#: src/mainwindow.c:597 src/messageview.c:253
+#, fuzzy
+msgid "F_older..."
+msgstr "Direktori"
 
-#: src/mainwindow.c:594 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
 msgid "Next part"
 msgstr "Bagian berikutnya"
 
-#: src/mainwindow.c:595 src/messageview.c:257 src/mimeview.c:202
+#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Bagian sebelumnya"
 
-#: src/mainwindow.c:598 src/messageview.c:258
+#: src/mainwindow.c:603 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Gulung pesan"
 
-#: src/mainwindow.c:599 src/messageview.c:259
+#: src/mainwindow.c:604 src/messageview.c:258
 msgid "Previous line"
 msgstr "Baris sebelum"
 
-#: src/mainwindow.c:600 src/messageview.c:260
+#: src/mainwindow.c:605 src/messageview.c:259
 msgid "Next line"
 msgstr "Baris berikut"
 
-#: src/mainwindow.c:601 src/messageview.c:261 src/printing.c:481
+#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
 msgid "Previous page"
 msgstr "Halaman sebelum"
 
-#: src/mainwindow.c:602 src/messageview.c:262 src/printing.c:488
+#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
 msgid "Next page"
 msgstr "Halaman berikut"
 
-#: src/mainwindow.c:620 src/messageview.c:280
+#: src/mainwindow.c:625 src/messageview.c:279
 msgid "Decode"
 msgstr "Decode"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:632
 msgid "Open in new _window"
 msgstr "Buka di _jendela baru"
 
-#: src/mainwindow.c:628 src/messageview.c:287
+#: src/mainwindow.c:633 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Sumber pes_an"
 
-#: src/mainwindow.c:630 src/messageview.c:288
+#: src/mainwindow.c:635 src/messageview.c:287
 msgid "Message part"
 msgstr "Bagian pesan"
 
-#: src/mainwindow.c:631 src/messageview.c:289
+#: src/mainwindow.c:636 src/messageview.c:288
 msgid "View as text"
 msgstr "Tampilkan sebagai teks"
 
-#: src/mainwindow.c:632 src/messageview.c:290 src/toolbar.c:403
+#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
 msgid "Open"
 msgstr "Buka"
 
-#: src/mainwindow.c:634 src/messageview.c:292
+#: src/mainwindow.c:639 src/messageview.c:291
 msgid "Open with..."
 msgstr "Buka dengan..."
 
-#: src/mainwindow.c:638 src/messageview.c:295
+#: src/mainwindow.c:643 src/messageview.c:294
 msgid "Quotes"
 msgstr "Kutipan"
 
-#: src/mainwindow.c:640
+#: src/mainwindow.c:645
 msgid "_Update summary"
 msgstr "_Perbarui ringkasan"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:648
 msgid "Recei_ve"
 msgstr "Terim_a"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:649
 msgid "Get from _current account"
 msgstr "Ambil dari akun a_ktif"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:650
 msgid "Get from _all accounts"
 msgstr "Ambil dari semu_a akun"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:651
 msgid "Cancel receivin_g"
 msgstr "Batalkan _penerimaan"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:654
 msgid "_Send queued messages"
 msgstr "_Kirim antrian pesan"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:659
 msgid "Compose a_n email message"
 msgstr "Tulis sebuah pesa_n email"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:660
 msgid "Compose a news message"
 msgstr "Tulis sebuah pesan berita"
 
-#: src/mainwindow.c:657 src/messageview.c:301
+#: src/mainwindow.c:662 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Balas"
 
-#: src/mainwindow.c:658 src/messageview.c:302 src/summaryview.c:426
+#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
 msgid "Repl_y to"
 msgstr "Bala_s ke"
 
-#: src/mainwindow.c:661 src/messageview.c:305
+#: src/mainwindow.c:666 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "Mailing _list"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:667
 msgid "Follow-up and reply to"
 msgstr "Follow-up dan balas ke"
 
-#: src/mainwindow.c:665 src/messageview.c:308 src/toolbar.c:2069
+#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Teruskan"
 
-#: src/mainwindow.c:666 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 "Ter_uskan sebagai lampiran"
 
-#: src/mainwindow.c:667 src/messageview.c:310 src/toolbar.c:2071
+#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Redirec_t"
 
-#: src/mainwindow.c:669
+#: src/mainwindow.c:674
 msgid "Mailing-_List"
 msgstr "Mailing-_List"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:675
 msgid "Post"
 msgstr "Post"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:677
 msgid "Help"
 msgstr "Bantuan"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:681
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:683
 msgid "View archive"
 msgstr "Tampilkan archive"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:685
 msgid "Contact owner"
 msgstr "Kontak pemilik"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:689
 msgid "M_ove..."
 msgstr "Pin_dahkan..."
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:690
 msgid "_Copy..."
 msgstr "_Salin..."
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:691
 msgid "Move to _trash"
 msgstr "Pindahkan ke _tong sampah"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:692
 msgid "_Delete..."
 msgstr "_Hapus..."
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:693
+#, fuzzy
+msgid "Move thread to tr_ash"
+msgstr "Pindahkan ke _tong sampah"
+
+#: src/mainwindow.c:694
+#, fuzzy
+msgid "Delete t_hread"
+msgstr "_Hapus thread"
+
+#: src/mainwindow.c:695
 msgid "Cancel a news message"
 msgstr "Batalkan pesan berita"
 
-#: src/mainwindow.c:691 src/mainwindow.c:692 src/summaryview.c:427
+#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
 msgid "_Mark"
 msgstr "_Tandai"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:700
 msgid "_Unmark"
 msgstr "_Unmark"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:703
 msgid "Mark as unr_ead"
 msgstr "Tandai b_elumdibaca"
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:704
 msgid "Mark as rea_d"
 msgstr "Tandai sudah _dibaca"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:706
 msgid "Mark all read"
 msgstr "Tandai semua sudah dibaca"
 
-#: src/mainwindow.c:701 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 "Abaikan thread"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:709
 msgid "Unignore thread"
 msgstr "Jangan abaikan thread"
 
-#: src/mainwindow.c:703 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 "Awasi thread"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:711
 msgid "Unwatch thread"
 msgstr "Jangan awasi thread"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:714
 msgid "Mark as _spam"
 msgstr "Tandai sebagai _spam"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:715
 msgid "Mark as _ham"
 msgstr "Tandai sebagai _ham"
 
-#: src/mainwindow.c:711 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Kunci"
 
-#: src/mainwindow.c:712 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Buka kunci"
 
-#: src/mainwindow.c:714 src/summaryview.c:428
+#: src/mainwindow.c:721 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "Warna la_bel"
 
-#: src/mainwindow.c:715 src/summaryview.c:429
+#: src/mainwindow.c:722 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Ta_gs"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:725
 msgid "Re-_edit"
 msgstr "Re-_edit"
 
-#: src/mainwindow.c:721 src/messageview.c:311 src/mimeview.c:1027
+#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "Periksa tandatangan"
 
-#: src/mainwindow.c:726 src/messageview.c:315
+#: src/mainwindow.c:733 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "Masukkan pengirim ke bu_ku alamat"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:735
 msgid "C_ollect addresses"
 msgstr "Kumpulkan alamat"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:736
 msgid "From current _folder..."
 msgstr "Dari direktori akti_f..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:737
 msgid "From selected _messages..."
 msgstr "Dari pesa_n terpilih..."
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:740
 msgid "_Filter all messages in folder"
 msgstr "_Saring semua pesan dalam direktori"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:741
 msgid "Filter _selected messages"
 msgstr "Saring pesan _terpilih"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:742
 msgid "Run folder pr_ocessing rules"
 msgstr "Jalankan aturan pemroses direktori"
 
-#: src/mainwindow.c:737 src/messageview.c:318
+#: src/mainwindow.c:744 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "_Buat aturan penyaringan"
 
-#: src/mainwindow.c:738 src/mainwindow.c:744 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 "Secara otom_atis"
 
-#: src/mainwindow.c:739 src/mainwindow.c:745 src/mainwindow.c:848
-#: 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 "Berdasar _Pengirim"
 
-#: src/mainwindow.c:740 src/mainwindow.c:746 src/mainwindow.c:849
-#: 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 "Berdasar _Kepada"
 
-#: src/mainwindow.c:741 src/mainwindow.c:747 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 "Berdasar _Subyek"
 
-#: src/mainwindow.c:743 src/messageview.c:324 src/summaryview.c:432
+#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
 msgid "Create processing rule"
 msgstr "Buat aturan pemrosesan"
 
-#: src/mainwindow.c:750 src/messageview.c:332
+#: src/mainwindow.c:757 src/messageview.c:331
 msgid "List _URLs..."
 msgstr "Daftar _URLs..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:764
 msgid "Ch_eck for new messages in all folders"
 msgstr "P_eriksa pesan baru di seluruh direktori"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:765
 msgid "Delete du_plicated messages"
 msgstr "Hapus du_plikasi pesan"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:766
 msgid "In selected folder"
 msgstr "Pada direktori terpilih"
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:767
 msgid "In all folders"
 msgstr "Pada semua direktori"
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:770
 msgid "E_xecute"
 msgstr "Jalan_kan"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:771
 msgid "Exp_unge"
 msgstr "Hila_ngkan"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:774
 msgid "SSL cer_tificates"
 msgstr "Ser_tifikat SSL"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:778
 msgid "Filtering Lo_g"
 msgstr "Menyaring Lo_g"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:780
 msgid "Network _Log"
 msgstr "_Catatan Jaringan"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:782
 msgid "_Forget all session passwords"
 msgstr "_Lupakan kata kunci semua sesi"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:784
+#, fuzzy
+msgid "Forget _master passphrase"
+msgstr "_Lupakan kata kunci semua sesi"
+
+#: src/mainwindow.c:788
 msgid "C_hange current account"
 msgstr "Gan_ti akun aktif"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:790
 msgid "_Preferences for current account..."
 msgstr "_Pengaturan untuk akun aktif..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:791
 msgid "Create _new account..."
 msgstr "Buat aku_n baru..."
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:792
 msgid "_Edit accounts..."
 msgstr "_Sunting akun..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:795
 msgid "P_references..."
 msgstr "P_engaturan..."
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:796
 msgid "Pre-pr_ocessing..."
 msgstr "Pra-pemrosesan..."
 
-#: src/mainwindow.c:787
+#: src/mainwindow.c:797
 msgid "Post-pro_cessing..."
 msgstr "Paska-pemrosesan..."
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:798
 msgid "_Filtering..."
 msgstr "_Penyaringan..."
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:799
 msgid "_Templates..."
 msgstr "_Cetakan..."
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:800
 msgid "_Actions..."
 msgstr "_Aksi..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:801
 msgid "Tag_s..."
 msgstr "Tag_s..."
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:803
 msgid "Plu_gins..."
 msgstr "Pen_gaya..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:806
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:807
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ kontribusi pengguna online"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:808
 msgid "Icon _Legend"
 msgstr "_Legenda ikon"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:810
 msgid "Set as default client"
 msgstr "Pasang sebagai klien standar"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:817
 msgid "Offline _mode"
 msgstr "_Modus offline"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:818
 msgid "Men_ubar"
 msgstr ""
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:819
 msgid "_Message view"
 msgstr "Ta_mpilan pesan"
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:821
 msgid "Status _bar"
 msgstr "_Bar status"
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:823
 msgid "Column headers"
 msgstr "Header kolom"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:824
 msgid "Th_read view"
 msgstr "Tampilan th_read"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:825
 msgid "Hide read threads"
 msgstr "Sembunyikan utas yang sudah dibaca"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:826
 msgid "_Hide read messages"
 msgstr "_Sembunyikan pesan yang sudah dibaca"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:827
 msgid "Hide deleted messages"
 msgstr "Sembunyikan pesan yang dihapus"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:828
 msgid "_Fullscreen"
 msgstr "Layar _Penuh"
 
-#: src/mainwindow.c:819 src/messageview.c:344
+#: src/mainwindow.c:829 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Tampilkan seluruh _headers"
 
-#: src/mainwindow.c:820 src/messageview.c:345
+#: src/mainwindow.c:830 src/messageview.c:344
 msgid "_Collapse all"
 msgstr "_Tutup semua"
 
-#: src/mainwindow.c:821 src/messageview.c:346
+#: src/mainwindow.c:831 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Tutup dari level _2"
 
-#: src/mainwindow.c:822 src/messageview.c:347
+#: src/mainwindow.c:832 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Tutup dari level _3"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:836
 msgid "Text _below icons"
 msgstr "Teks di_bawah ikon"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:837
 msgid "Text be_side icons"
 msgstr "Teks di_samping ikon"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:838
 msgid "_Icons only"
 msgstr "Hanya _ikon"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:839
 msgid "_Text only"
 msgstr "Hanya _teks"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:846
 msgid "_Standard"
 msgstr "_Standar"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:847
 msgid "_Three columns"
 msgstr "_Tiga kolom"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:848
 msgid "_Wide message"
 msgstr "_Pesan lebar"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:849
 msgid "W_ide message list"
 msgstr "_Daftar pesan lebar"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:850
 msgid "S_mall screen"
 msgstr "Layar ke_cil"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:854
 msgid "By _number"
 msgstr "Berdasar _nomor"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:855
 msgid "By s_ize"
 msgstr "Berdasar U_kuran"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:856
 msgid "By _date"
 msgstr "Berdasar _tanggal"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:857
 msgid "By thread date"
 msgstr "Berdasar Tanggal thread"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:860
 msgid "By s_ubject"
 msgstr "Berdasar _Subyek"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:861
 msgid "By _color label"
 msgstr "Berdasar _Warna label"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:862
 msgid "By tag"
 msgstr "Berdasar penanda"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:863
 msgid "By _mark"
 msgstr "Berdasar _tanda"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:864
 msgid "By _status"
 msgstr "Berdasar _status"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:865
 msgid "By a_ttachment"
 msgstr "Berdasar _lampiran"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:866
 msgid "By score"
 msgstr "Berdasar Skor"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:867
 msgid "By locked"
 msgstr "Berdasar Penguncian"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:868
 msgid "D_on't sort"
 msgstr "Jangan _urutkan"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:872 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Ascending"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:873 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Descending"
 
-#: src/mainwindow.c:905 src/messageview.c:389
+#: src/mainwindow.c:915 src/messageview.c:388
 msgid "_Auto detect"
 msgstr "_Deteksi otomatis"
 
-#: src/mainwindow.c:1302 src/summaryview.c:6244
+#: src/mainwindow.c:1312 src/summaryview.c:6218
 msgid "Apply tags..."
 msgstr "Terapkan penanda..."
 
-#: src/mainwindow.c:1945
+#: src/mainwindow.c:1959
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Beberapa kesalahan terjadi. Klik disini untuk melihat catatan."
 
-#: src/mainwindow.c:1960
+#: src/mainwindow.c:1974
 msgid "You are online. Click the icon to go offline"
 msgstr "Anda online. Klik ikon untuk offline"
 
-#: src/mainwindow.c:1963
+#: src/mainwindow.c:1977
 msgid "You are offline. Click the icon to go online"
 msgstr "Anda offline. Klik ikon untuk online"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1991
 msgid "Select account"
 msgstr "Pilih akun"
 
-#: src/mainwindow.c:2004 src/prefs_logging.c:140
+#: src/mainwindow.c:2018 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Catatan jaringan"
 
-#: src/mainwindow.c:2008
+#: src/mainwindow.c:2022
 msgid "Filtering/Processing debug log"
 msgstr "Catatan debug Penyaringan/Pemrosesan"
 
-#: src/mainwindow.c:2027 src/prefs_logging.c:392
+#: src/mainwindow.c:2041 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "Catatan penyaringan diaktifkan\n"
 
-#: src/mainwindow.c:2029 src/prefs_logging.c:394
+#: src/mainwindow.c:2043 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "Catatan penyaringan dimatikan\n"
 
-#: src/mainwindow.c:2472 src/mainwindow.c:2479 src/mainwindow.c:2522
-#: src/mainwindow.c:2555 src/mainwindow.c:2587 src/mainwindow.c:2632
-#: src/plugins/notification/notification_trayicon.c:360
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1065
+#: 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 "Tidak ada judul"
 
-#: src/mainwindow.c:2633 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "tidak ada"
 
-#: src/mainwindow.c:2890 src/mainwindow.c:2894
+#: src/mainwindow.c:2904 src/mainwindow.c:2908
 msgid "Delete all messages in trash folders?"
 msgstr "Hapus semua pesan pada direktori tong sampah?"
 
-#: src/mainwindow.c:2891
+#: src/mainwindow.c:2905
 msgid "Don't quit"
 msgstr "Jangan berhenti"
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Tambah kotaksurat"
 
-#: src/mainwindow.c:2921
+#: src/mainwindow.c:2935
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7702,18 +7733,18 @@ msgstr ""
 "Jika kotaksurat sudah ada, secara otomatis\n"
 "akan dipindai."
 
-#: src/mainwindow.c:2927 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 "kotaksurat '%s' sudah ada."
 
-#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Kotaksurat"
 
-#: src/mainwindow.c:2937 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 "
@@ -7723,131 +7754,137 @@ msgstr ""
 "Mungkin beberapa berkas sudah ada, atau anda tidak memiliki hak untuk "
 "menulis disana."
 
-#: src/mainwindow.c:3389
+#: src/mainwindow.c:3413
 msgid "No posting allowed"
 msgstr "Posting tidak diperkenankan"
 
-#: src/mainwindow.c:3967
+#: src/mainwindow.c:3996
 msgid "Mbox import has failed."
 msgstr "Impor mbox gagal."
 
-#: src/mainwindow.c:3976 src/mainwindow.c:3985
+#: src/mainwindow.c:4005 src/mainwindow.c:4014
 msgid "Export to mbox has failed."
 msgstr "Ekspor ke mbox gagal."
 
-#: src/mainwindow.c:4026 src/plugins/notification/notification_trayicon.c:515
+#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:548
 msgid "Exit"
 msgstr "Keluar"
 
-#: src/mainwindow.c:4026 src/plugins/notification/notification_trayicon.c:515
+#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:548
 msgid "Exit Claws Mail?"
 msgstr "Keluar Claws Mail?"
 
-#: src/mainwindow.c:4217
+#: src/mainwindow.c:4246
 msgid "Folder synchronisation"
 msgstr "Sinkronisasi direktori"
 
-#: src/mainwindow.c:4218
+#: src/mainwindow.c:4247
 msgid "Do you want to synchronise your folders now?"
 msgstr "Apakah anda ingin mensinkronkan direktori anda sekarang?"
 
-#: src/mainwindow.c:4219
-msgid "+_Synchronise"
+#: src/mainwindow.c:4248
+#, fuzzy
+msgid "_Synchronise"
 msgstr "+_Sinkronkan"
 
-#: src/mainwindow.c:4661
+#: src/mainwindow.c:4689
 msgid "Deleting duplicated messages..."
 msgstr "Menghapus pesan duplikat..."
 
-#: src/mainwindow.c:4698
+#: 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] "%d Pesan ganda dihapus pada %d direktori.\n"
 msgstr[1] "%d Pesan ganda dihapus pada %d direktori.\n"
 
-#: src/mainwindow.c:4953 src/summaryview.c:5733
+#: src/mainwindow.c:4982 src/summaryview.c:5709
 msgid "Processing rules to apply before folder rules"
 msgstr "Aturan pemrosesan diterapkan sebelum aturan direktori"
 
-#: src/mainwindow.c:4961
+#: src/mainwindow.c:4990
 msgid "Processing rules to apply after folder rules"
 msgstr "Aturan pemrosesan diterapkan setelah aturan direktori"
 
-#: src/mainwindow.c:4969 src/summaryview.c:5744
+#: src/mainwindow.c:4998 src/summaryview.c:5720
 msgid "Filtering configuration"
 msgstr "Konfigurasi penyaringan"
 
-#: src/mainwindow.c:5084
+#: src/mainwindow.c:5113
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Tidak dapat registrasi sebagai klien standar: mustahil untuk mendapatkan "
 "lokasi eksekusi."
 
-#: src/mainwindow.c:5143
+#: src/mainwindow.c:5172
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail telah diregistrasi sebagai klien standar."
 
-#: src/mainwindow.c:5145
+#: src/mainwindow.c:5174
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Tidak dapat registrasi sebagai klien standar: mustahil untuk menulis ke "
 "registrasi."
 
-#: src/mainwindow.c:5303
+#: src/mainwindow.c:5188 src/setup.c:91
+#, c-format
+msgid "Scanning folder %s%c%s..."
+msgstr "Memindai direktori %s%c%s..."
+
+#: src/mainwindow.c:5332
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "Lupa %d sandi pada %d akun.\n"
 msgstr[1] "Lupa %d sandi pada %d akun.\n"
 
-#: src/matcher.c:211 src/matcher.c:212 src/matcher.c:213 src/matcher.c:214
-#: src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
+#: src/matcher.c:214 src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
+#: src/matcher.c:218 src/matcher.c:219 src/matcher.c:220 src/matcher.c:221
 #, c-format
 msgid "%s header"
 msgstr "%s header"
 
-#: src/matcher.c:218
+#: src/matcher.c:222
 msgid "header"
 msgstr "header"
 
-#: src/matcher.c:219
+#: src/matcher.c:223
 msgid "header line"
 msgstr "garis header"
 
-#: src/matcher.c:220
+#: src/matcher.c:224
 msgid "body line"
 msgstr "garis badan"
 
-#: src/matcher.c:221
+#: src/matcher.c:225
 msgid "tag"
 msgstr "penanda"
 
-#: src/matcher.c:525 src/matcher.c:530 src/matcher.c:550 src/matcher.c:555
+#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
 #: src/message_search.c:212 src/prefs_matcher.c:742 src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Peka terhadap huruf"
 
-#: src/matcher.c:525 src/matcher.c:530 src/matcher.c:550 src/matcher.c:555
+#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
 msgid "Case insensitive"
 msgstr "Tidak peka terhadap huruf"
 
-#: src/matcher.c:1843
+#: src/matcher.c:1849
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "memeriksa jika pesan cocok [ %s ]\n"
 
-#: src/matcher.c:1912 src/matcher.c:1931 src/matcher.c:1944
+#: src/matcher.c:1920 src/matcher.c:1939 src/matcher.c:1952
 msgid "message matches\n"
 msgstr "pesan cocok\n"
 
-#: src/matcher.c:1919 src/matcher.c:1937 src/matcher.c:1946
+#: src/matcher.c:1927 src/matcher.c:1945 src/matcher.c:1954
 msgid "message does not match\n"
 msgstr "pesan tidak cocok\n"
 
-#: src/matcher.c:2209 src/matcher.c:2210 src/matcher.c:2211 src/matcher.c:2212
-#: src/matcher.c:2213 src/matcher.c:2214 src/matcher.c:2215 src/matcher.c:2216
+#: src/matcher.c:2217 src/matcher.c:2218 src/matcher.c:2219 src/matcher.c:2220
+#: src/matcher.c:2221 src/matcher.c:2222 src/matcher.c:2223 src/matcher.c:2224
 msgid "(none)"
 msgstr "(tidak ada)"
 
@@ -7867,20 +7904,20 @@ msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] "Mengimpor dari mbox... (%d surat terimpor)"
 msgstr[1] "Mengimpor dari mbox... (%d surat terimpor)"
 
-#: src/mbox.c:554
+#: src/mbox.c:553
 msgid "Overwrite mbox file"
 msgstr "Timpa berkas mbox"
 
-#: src/mbox.c:555
+#: src/mbox.c:554
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Berkas ini sudah ada. Anda mau menimpanya?"
 
-#: src/mbox.c:556 src/messageview.c:1848 src/mimeview.c:1844
-#: src/prefs_themes.c:533 src/textview.c:3053
+#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
+#: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Timpa"
 
-#: src/mbox.c:565
+#: src/mbox.c:564
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -7889,7 +7926,7 @@ msgstr ""
 "Tidak dapat membuat berkas mbox:\n"
 "%s\n"
 
-#: src/mbox.c:573
+#: src/mbox.c:572
 msgid "Exporting to mbox..."
 msgstr "Mengekspor ke mbox..."
 
@@ -7921,19 +7958,19 @@ msgstr "Akhir pesan telah dicapai; lanjutkan dari awal?"
 msgid "Search finished"
 msgstr "Pencarian selesai"
 
-#: src/messageview.c:298 src/textview.c:239
+#: src/messageview.c:297 src/textview.c:238
 msgid "Compose _new message"
 msgstr "Tulis pesa_n baru"
 
-#: 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 "Claws Mail - Tampilan Pesan"
 
-#: src/messageview.c:841
+#: src/messageview.c:840
 msgid "<No Return-Path found>"
 msgstr "<Return-Path tidak ditemukan>"
 
-#: src/messageview.c:849
+#: src/messageview.c:848
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7948,11 +7985,11 @@ msgstr ""
 "Lokasi kembali: %s\n"
 "Dianjurkan untuk tidak mengirimkan tanda terima."
 
-#: src/messageview.c:856 src/messageview.c:873
+#: src/messageview.c:855 src/messageview.c:872
 msgid "_Don't Send"
 msgstr "_Jangan kirim"
 
-#: 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"
@@ -7964,67 +8001,68 @@ msgstr ""
 "secara resmi tidak dikirimkan kepada anda.\n"
 "Dianjurkan untuk tidak mengirimkan tanda terima."
 
-#: src/messageview.c:1323
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Mengambil pesan (%s)..."
 
-#: src/messageview.c:1359 src/procmime.c:1007
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Tidak dapat melakukan decrypt: %s"
 
-#: 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 ""
 "Pesan tidak memenuhi standar MIME. Hal ini dapat menyebabkan kesalahan."
 
-#: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1997
-#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4816
-#: src/summaryview.c:4819 src/textview.c:3041
+#: 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 "Simpan sebagai"
 
-#: src/messageview.c:1849
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Timpa berkas yang sudah ada?"
 
-#: src/messageview.c:1857 src/summaryview.c:4836 src/summaryview.c:4839
-#: src/summaryview.c:4854
+#: 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 "Tidak dapat menyimpan berkas '%s'"
 
-#: src/messageview.c:1910
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Tampilkan semua %s."
 
-#: src/messageview.c:1912
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Hanya bagian awal megabyte dari teks yang ditampilkan"
 
-#: src/messageview.c:1943
+#: src/messageview.c:1950
+#, fuzzy
 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 ""
 "Anda mendapatkan bukti penerimaan pesan ini : pesan sudah dilihat oleh "
 "penerima."
 
-#: src/messageview.c:1946
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Anda meminta bukti penerimaan pesan ini."
 
-#: src/messageview.c:1952
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Pesan ini meminta bukti penerimaan."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Kirim bukti penerimaan"
 
-#: src/messageview.c:1996
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8032,7 +8070,7 @@ msgstr ""
 "Pesan ini telah diambil sebagian,\n"
 "dan telah dihapus dari server."
 
-#: src/messageview.c:2002
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8041,15 +8079,15 @@ msgstr ""
 "Pesan ini telah diambil sebagian;\n"
 "yaitu %s."
 
-#: src/messageview.c:2006 src/messageview.c:2028
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Tandai untuk diunduh"
 
-#: src/messageview.c:2007 src/messageview.c:2019
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Tandai untuk dihapus"
 
-#: src/messageview.c:2012
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8058,12 +8096,12 @@ msgstr ""
 "Pesan ini telah diambil sebagian;\n"
 "yaitu %s dan akan diunduh."
 
-#: 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 "Unmark"
 
-#: src/messageview.c:2023
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8072,11 +8110,11 @@ msgstr ""
 "Pesan ini telah diambil sebagian;\n"
 "yaitu %s dan akan dihapus."
 
-#: src/messageview.c:2096
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Pemberitahuan Bukti Benerimaan"
 
-#: 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"
@@ -8087,19 +8125,19 @@ msgstr ""
 "Silahkan pilih akun yang akan anda gunakan untuk mengirim pemberitahuan "
 "tanda terima:"
 
-#: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:588
+#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: src/messageview.c:2101
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Kirim Pemberitahuan"
 
-#: src/messageview.c:2168
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Tidak dapat mencetak: Pesan tidak mengandung tulisan."
 
-#: src/messageview.c:2931
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8107,7 +8145,7 @@ msgstr ""
 "\n"
 "  Tidak ada pesan dalam direktori ini"
 
-#: src/messageview.c:2939
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8115,7 +8153,7 @@ msgstr ""
 "\n"
 "  Pesan telah dihapus"
 
-#: src/messageview.c:2940
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8123,21 +8161,16 @@ msgstr ""
 "\n"
 "  Pesan telah dihapus atau dipindahkan ke direktori lain"
 
-#: src/messageview.c:2973 src/messageview.c:2979 src/summaryview.c:4201
-#: src/summaryview.c:6972
+#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
+#: src/summaryview.c:6987
 msgid "An error happened while learning.\n"
 msgstr "Kesalahan terjadi ketika sedang dipelajari.\n"
 
-#: src/mh.c:444
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "tidak dapat menyalin pesan %s ke %s\n"
-
-#: src/mh.c:530
+#: src/mh.c:527
 msgid "Moving messages..."
 msgstr "Memindahkan pesan..."
 
-#: 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 "Menghapus pesan..."
 
@@ -8145,7 +8178,7 @@ msgstr "Menghapus pesan..."
 msgid "Remove _mailbox..."
 msgstr "Menghapus _kotaksurat..."
 
-#: src/mh_gtk.c:224
+#: src/mh_gtk.c:222
 #, fuzzy, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -8153,7 +8186,7 @@ msgid ""
 "%s."
 msgstr "Tidak dapat menghapus direktori '%s'."
 
-#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
+#: src/mh_gtk.c:364 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8162,62 +8195,62 @@ msgstr ""
 "Yakin akan menghapus kotaksurat '%s'?\n"
 "(Pesan TIDAK dihapus dari media penyimpan)"
 
-#: src/mh_gtk.c:368 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr "Hapus kotaksurat"
 
-#: src/mimeview.c:193
+#: src/mimeview.c:192
 msgid "_Open"
 msgstr "_Buka"
 
-#: src/mimeview.c:195
+#: src/mimeview.c:194
 msgid "Open _with..."
 msgstr "Buka _dengan..."
 
-#: src/mimeview.c:197
+#: src/mimeview.c:196
 msgid "Send to..."
 msgstr "Kirim ke..."
 
-#: src/mimeview.c:198
+#: src/mimeview.c:197
 msgid "_Display as text"
 msgstr "_Tampilkan sebagai teks"
 
-#: src/mimeview.c:199
+#: src/mimeview.c:198
 msgid "_Save as..."
 msgstr "_Simpan sebagai..."
 
-#: src/mimeview.c:200
+#: src/mimeview.c:199
 msgid "Save _all..."
 msgstr "Simpan semu_a..."
 
-#: src/mimeview.c:273
+#: src/mimeview.c:272
 msgid "MIME Type"
 msgstr "Tipe MIME"
 
-#: src/mimeview.c:1032 src/mimeview.c:1037 src/mimeview.c:1042
-#: src/mimeview.c:1047
+#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
+#: src/mimeview.c:1041
 msgid "View full information"
 msgstr "Lihat informasi lengkap"
 
-#: src/mimeview.c:1053
+#: src/mimeview.c:1047
 msgid "Check again"
 msgstr "Periksa kembali"
 
-#: src/mimeview.c:1065
+#: src/mimeview.c:1059
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Klik ikon untuk memeriksa."
 
-#: src/mimeview.c:1067
+#: src/mimeview.c:1061
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Klik ikon atau tekan '%s' untuk memeriksa."
 
-#: src/mimeview.c:1077
+#: src/mimeview.c:1071
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr "Waktu periksa tandatangan habis. Klik ikon untuk mencoba lagi."
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1073
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8225,40 +8258,39 @@ msgstr ""
 "Waktu periksa tandatangan habis. Klik ikon atau tekan '%s' untuk mencoba "
 "lagi."
 
-#: src/mimeview.c:1319
+#: src/mimeview.c:1313
 msgid "Checking signature..."
 msgstr "Memeriksa tandatangan..."
 
-#: src/mimeview.c:1360
+#: src/mimeview.c:1354
 msgid "Go back to email"
 msgstr "Kembali ke email"
 
-#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
-#: src/mimeview.c:2080 src/mimeview.c:2192
-#: src/plugins/fancy/fancy_viewer.c:424
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Tidak dapat menyimpan bagian dari pesan multibagian: %s"
 
-#: src/mimeview.c:1841 src/textview.c:3051
+#: src/mimeview.c:1839 src/textview.c:3073
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Timpa berkas '%s' yang sudah ada?"
 
-#: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:126
+#: src/mimeview.c:1881 src/plugins/archive/archiver_prefs.c:126
 msgid "Select destination folder"
 msgstr "Pilih direktori tujuan"
 
-#: src/mimeview.c:1890 src/plugins/archive/archiver_prefs.c:132
+#: src/mimeview.c:1888 src/plugins/archive/archiver_prefs.c:132
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' bukan sebuah direktori."
 
-#: src/mimeview.c:2127 src/mimeview.c:2134 src/textview.c:2972
+#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:2990
 msgid "Open with"
 msgstr "Buka dengan"
 
-#: src/mimeview.c:2128 src/mimeview.c:2135 src/textview.c:2973
+#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2991
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8267,11 +8299,19 @@ msgstr ""
 "Masukkan baris-perintah untuk membuka berkas:\n"
 "('%s' akan digantikan dengan nama berkas)"
 
-#: src/mimeview.c:2226
+#: src/mimeview.c:2228
+#, c-format
+msgid ""
+"Could not convert attachment name to UTF-16:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/mimeview.c:2236
 msgid "Execute untrusted binary?"
 msgstr "Jalankan binari yang tidak dipercaya?"
 
-#: src/mimeview.c:2227
+#: src/mimeview.c:2237
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8284,101 +8324,102 @@ msgstr ""
 "\n"
 "Apakah anda akan menjalankan berkas ini?"
 
-#: src/mimeview.c:2231
+#: src/mimeview.c:2241
 msgid "Run binary"
 msgstr "Jalankan binari"
 
-#: src/mimeview.c:2530
+#: src/mimeview.c:2543 src/plugins/att_remover/att_remover.c:299
 msgid "Type:"
 msgstr "Tipe:"
 
-#: src/mimeview.c:2531 src/plugins/pdf_viewer/poppler_viewer.c:699
+#: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
+#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2676
 msgid "Size:"
 msgstr "Ukuran:"
 
-#: src/mimeview.c:2545 src/plugins/vcalendar/vcalendar.c:1271
+#: src/mimeview.c:2558 src/plugins/vcalendar/vcalendar.c:1274
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1722
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
 msgstr "Deskripsi:"
 
-#: src/news.c:302
+#: src/news.c:303
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "Sambungan NNTP ke %s:%d telah diputus.\n"
 
-#: src/news.c:335
+#: src/news.c:336
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Akun '%s': Menyambung ke server NNTP: %s:%d...\n"
 
-#: src/news.c:356
+#: src/news.c:357
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Terjadi kesalahan ketika masuk ke %s:%d...\n"
 
-#: 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 ""
 "Libetpan tidak mendukung kode 480 sehingga untuk saat ini kita pilih untuk "
 "dilanjutkan\n"
 
-#: src/news.c:446
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Modus pembaca gagal, namun tetap dilanjutkan\n"
 
-#: src/news.c:450
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Terjadi kesalahan dalam membuat sesi dengan %s:%d ...\n"
 
-#: src/news.c:465
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Terjadi kesalahan ketika melakukan otentifikasi ke %s:%d...\n"
 
-#: src/news.c:490
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail membutuhkan akses jaringan untuk mengakses server Berita."
 
-#: src/news.c:861
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "tidak dapat memilih kelompok: %s\n"
 
-#: 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 "tidak dapat mengatur kelompok: %s\n"
 
-#: src/news.c:1059
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "selang artikel salah: %d - %d\n"
 
-#: 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 "tidak dapat mengambil xhdr\n"
 
-#: src/news.c:1213
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "mengambil xover %d - %d dalam %s...\n"
 
-#: src/news.c:1228
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "tidak dapat mengambil xover\n"
 
-#: src/news.c:1243
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "baris xover salah\n"
 
-#: src/news.c:1445
+#: src/news.c:1449
+#, fuzzy
 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 ""
@@ -8395,23 +8436,63 @@ msgstr "_Mendaftar ke newgroup..."
 msgid "_Unsubscribe newsgroup"
 msgstr "_Berhenti langganan newsgroup"
 
-#: src/news_gtk.c:266
+#: src/news_gtk.c:250
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "Yakin berhenti langganan dari newsgroup '%s'?"
 
-#: src/news_gtk.c:267
+#: src/news_gtk.c:251
 msgid "Unsubscribe newsgroup"
 msgstr "Berhenti langganan newsgroup"
 
-#: src/news_gtk.c:268
-msgid "_Unsubscribe"
-msgstr "_Berhenti langganan"
-
-#: src/news_gtk.c:307
+#: src/news_gtk.c:291
 msgid "Rename newsgroup folder"
 msgstr "Ganti nama direktori newsgroup"
 
+#: src/password.c:128 src/password.c:129
+#, fuzzy
+msgid "Input master passphrase"
+msgstr "Tangkap masukan ketika memberikan frasakunci"
+
+#: src/password.c:141
+#, fuzzy
+msgid "Incorrect master passphrase."
+msgstr "Bagian yang salah"
+
+#: src/password_gtk.c:67
+#, fuzzy
+msgid "New passphrases do not match, try again."
+msgstr "Frasakunci tidak cocok.\n"
+
+#: 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
+#, fuzzy
+msgid "Old passphrase:"
+msgstr "Frasakunci buruk.\n"
+
+#: src/password_gtk.c:191
+#, fuzzy
+msgid "New passphrase:"
+msgstr "Frasakunci"
+
+#: src/password_gtk.c:202
+#, fuzzy
+msgid "Confirm passphrase:"
+msgstr "Frasakunci buruk.\n"
+
 #: src/plugins/acpi_notifier/acpi_notifier.c:51
 msgid "Acpi Notifier"
 msgstr "Pemberitahu Acpi"
@@ -8523,7 +8604,7 @@ msgid "Laptop LED"
 msgstr "LED Laptop"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:250
+#: src/plugins/attachwarner/attachwarner.c:256
 msgid "Failed to register check before send hook"
 msgstr "Gagal untuk registrasi pemeriksaan sebelum mengirim kaitan"
 
@@ -8553,7 +8634,7 @@ msgstr "Jalur buku alamat dimana alamat dipelihara"
 #: src/plugins/address_keeper/address_keeper_prefs.c:121
 #: src/plugins/bogofilter/bogofilter_gtk.c:278
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
+#: src/plugins/spamassassin/spamassassin_gtk.c:446
 #: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:679
 msgid "Select..."
@@ -8661,36 +8742,36 @@ msgstr "Tekan tombol Batal untuk berhenti mengarsipkan"
 msgid "Archiving:"
 msgstr "Mengarsipkan:"
 
-#: src/plugins/archive/archiver_gtk.c:503
+#: src/plugins/archive/archiver_gtk.c:507
 msgid "Folder and archive must be selected"
 msgstr "Direktori dan arsip harus dipilih"
 
-#: src/plugins/archive/archiver_gtk.c:512
+#: src/plugins/archive/archiver_gtk.c:516
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: Ada. Lanjutkan saja?"
 
-#: src/plugins/archive/archiver_gtk.c:515
+#: src/plugins/archive/archiver_gtk.c:519
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: Adalah sebuah tautan. Tidak dapat melanjutkan"
 
-#: src/plugins/archive/archiver_gtk.c:518
+#: src/plugins/archive/archiver_gtk.c:522
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: Adalah sebuah direktori. Tidak dapat melanjutkan"
 
-#: src/plugins/archive/archiver_gtk.c:521
+#: src/plugins/archive/archiver_gtk.c:525
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: Kehilangan hak akses. Tidak dapat melanjutkan"
 
-#: src/plugins/archive/archiver_gtk.c:524
+#: src/plugins/archive/archiver_gtk.c:528
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: Kesalahan tidak diketahui. Tidak dapat melanjutkan"
 
-#: src/plugins/archive/archiver_gtk.c:561
+#: src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8699,7 +8780,7 @@ msgstr ""
 "Bukan sebuah nama berkas yang absah:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:574
+#: src/plugins/archive/archiver_gtk.c:578
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8708,7 +8789,7 @@ msgstr ""
 "Bukan sebuah direktori Claws Mail yang absah:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:603
+#: src/plugins/archive/archiver_gtk.c:607
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8723,181 +8804,181 @@ msgstr ""
 "\n"
 "Lanjutkan saja?"
 
-#: src/plugins/archive/archiver_gtk.c:705
+#: src/plugins/archive/archiver_gtk.c:709
 msgid "Archive result"
 msgstr "Hasil pengarsipan"
 
-#: src/plugins/archive/archiver_gtk.c:735
+#: src/plugins/archive/archiver_gtk.c:739
 msgid "Values"
 msgstr "Nilai"
 
-#: src/plugins/archive/archiver_gtk.c:744
+#: src/plugins/archive/archiver_gtk.c:748
 msgid "Archive"
 msgstr "Arsip"
 
-#: src/plugins/archive/archiver_gtk.c:750
+#: src/plugins/archive/archiver_gtk.c:754
 msgid "Archive format"
 msgstr "Format arsip"
 
-#: src/plugins/archive/archiver_gtk.c:757
+#: src/plugins/archive/archiver_gtk.c:761
 msgid "Compression method"
 msgstr "Metode kompresi"
 
-#: src/plugins/archive/archiver_gtk.c:765
+#: src/plugins/archive/archiver_gtk.c:769
 msgid "Number of files"
 msgstr "Jumlah berkas"
 
-#: src/plugins/archive/archiver_gtk.c:773
+#: src/plugins/archive/archiver_gtk.c:777
 msgid "Archive Size"
 msgstr "Ukuran Arsip"
 
-#: src/plugins/archive/archiver_gtk.c:781
+#: src/plugins/archive/archiver_gtk.c:785
 msgid "Folder Size"
 msgstr "Ukuran Direktori"
 
-#: src/plugins/archive/archiver_gtk.c:790
+#: src/plugins/archive/archiver_gtk.c:794
 msgid "Compression level"
 msgstr "Tingkat kompresi"
 
-#: src/plugins/archive/archiver_gtk.c:795
-#: src/plugins/archive/archiver_gtk.c:803
-#: src/plugins/archive/archiver_gtk.c:811
-#: src/plugins/pdf_viewer/poppler_viewer.c:718 src/prefs_folder_item.c:514
+#: src/plugins/archive/archiver_gtk.c:799
+#: src/plugins/archive/archiver_gtk.c:807
+#: src/plugins/archive/archiver_gtk.c:815
+#: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:507
 msgid "Yes"
 msgstr "Ya"
 
-#: src/plugins/archive/archiver_gtk.c:795
-#: src/plugins/archive/archiver_gtk.c:803
-#: src/plugins/archive/archiver_gtk.c:811
-#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:513
-#: src/prefs_summaries.c:369
+#: src/plugins/archive/archiver_gtk.c:799
+#: src/plugins/archive/archiver_gtk.c:807
+#: src/plugins/archive/archiver_gtk.c:815
+#: src/plugins/pdf_viewer/poppler_viewer.c:722 src/prefs_folder_item.c:506
+#: src/prefs_summaries.c:372
 msgid "No"
 msgstr "Tidak"
 
-#: src/plugins/archive/archiver_gtk.c:798
+#: src/plugins/archive/archiver_gtk.c:802
 msgid "MD5 checksum"
 msgstr "Ceksum MD5"
 
-#: src/plugins/archive/archiver_gtk.c:806
+#: src/plugins/archive/archiver_gtk.c:810
 msgid "Descriptive names"
 msgstr "Nama deskriptif"
 
-#: src/plugins/archive/archiver_gtk.c:814
+#: src/plugins/archive/archiver_gtk.c:818
 msgid "Delete selected files"
 msgstr "Hapus berkas terpilih"
 
-#: src/plugins/archive/archiver_gtk.c:823
-#: src/plugins/archive/archiver_gtk.c:1199
+#: src/plugins/archive/archiver_gtk.c:827
+#: src/plugins/archive/archiver_gtk.c:1203
 msgid "Select mails before"
 msgstr "Pilih surat sebelum"
 
-#: src/plugins/archive/archiver_gtk.c:899
+#: src/plugins/archive/archiver_gtk.c:903
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Pilih nama berkas untuk arsip [akhiran mencerminkan arsip seperti .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:947
+#: src/plugins/archive/archiver_gtk.c:951
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld dari %ld"
 
-#: src/plugins/archive/archiver_gtk.c:984
+#: src/plugins/archive/archiver_gtk.c:988
 msgid "Create Archive"
 msgstr "Buat Arsip"
 
-#: src/plugins/archive/archiver_gtk.c:999
+#: src/plugins/archive/archiver_gtk.c:1003
 msgid "Enter Archiver arguments"
 msgstr "Masukkan argumen pengarsip"
 
-#: src/plugins/archive/archiver_gtk.c:1012
+#: src/plugins/archive/archiver_gtk.c:1016
 msgid "Folder to archive"
 msgstr "Direktori untuk diarsipkan"
 
-#: src/plugins/archive/archiver_gtk.c:1019
+#: src/plugins/archive/archiver_gtk.c:1023
 msgid "Folder which is the root of the archive"
 msgstr "Direktori yang menjadi direktori utama arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1024
+#: src/plugins/archive/archiver_gtk.c:1028
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Klik tombol ini untuk memilih direktori yang menjadi direktori utama dari "
 "arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1030
+#: src/plugins/archive/archiver_gtk.c:1034
 msgid "Name for archive"
 msgstr "Nama untuk arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1036
+#: src/plugins/archive/archiver_gtk.c:1040
 msgid "Archive location and name"
 msgstr "Nama dan lokasi arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1038
+#: 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 "_Pilih"
 
-#: src/plugins/archive/archiver_gtk.c:1041
+#: src/plugins/archive/archiver_gtk.c:1045
 msgid "Click this button to select a name and location for the archive"
 msgstr "Klik tombol ini untuk memilih nama dan lokasi untuk arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:1047
 msgid "Choose compression"
 msgstr "Pilih kompresi"
 
-#: src/plugins/archive/archiver_gtk.c:1056
+#: src/plugins/archive/archiver_gtk.c:1060
 msgid "Choose this option to use ZIP compression for the archive"
 msgstr "Ambil pilihan ini untuk menggunakan kompresi ZIP terhadap arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1063
+#: src/plugins/archive/archiver_gtk.c:1067
 msgid "Choose this option to use BZIP2 compression for the archive"
 msgstr "Ambil pilihan ini untuk menggunakan kompresi BZIP2 terhadap arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1070
+#: src/plugins/archive/archiver_gtk.c:1074
 msgid "Choose this to use Compress compression for your archive"
 msgstr "Pilih ini untuk menggunakan kompresi Kompres terhadap arsip anda"
 
-#: src/plugins/archive/archiver_gtk.c:1077
+#: src/plugins/archive/archiver_gtk.c:1081
 msgid "Choose this option to disable compression for the archive"
 msgstr "Ambil pilihan ini untuk menonaktifkan kompresi terhadap arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1097
+#: src/plugins/archive/archiver_gtk.c:1101
 msgid "Choose format"
 msgstr "Pilih format"
 
-#: src/plugins/archive/archiver_gtk.c:1110
+#: src/plugins/archive/archiver_gtk.c:1114
 msgid "Choose this option to use TAR as format for the archive"
 msgstr "Ambil pilihan ini untuk menggunakan TAR sebagai format untuk arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1121
 msgid "Choose this to use SHAR as format for the archive"
 msgstr "Pilih ini untuk menggunakan SHAR sebagai format untuk arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1124
+#: src/plugins/archive/archiver_gtk.c:1128
 msgid "Choose this option to use CPIO as format for the archive"
 msgstr "Ambil pilihan ini untuk menggunakan CPIO sebagai format untuk arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1131
+#: src/plugins/archive/archiver_gtk.c:1135
 msgid "Choose this option to use PAX as format for the archive"
 msgstr "Ambil pilihan ini untuk menggunakan PAX sebagai format untuk arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1151
+#: src/plugins/archive/archiver_gtk.c:1155
 msgid "Miscellaneous options"
 msgstr "Pilihan macam-macam"
 
-#: src/plugins/archive/archiver_gtk.c:1160
+#: src/plugins/archive/archiver_gtk.c:1164
 msgid "_Recursive"
 msgstr "_Rekursif"
 
-#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1168
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Ambil pilihan ini untuk menyertakan subdirektori pada arsip"
 
-#: src/plugins/archive/archiver_gtk.c:1166
+#: src/plugins/archive/archiver_gtk.c:1170
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1170
+#: src/plugins/archive/archiver_gtk.c:1174
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archive.\n"
 "Be aware though, that this dramatically increases the time it\n"
@@ -8908,11 +8989,11 @@ msgstr ""
 "Namun waspadalah, hal ini meningkatkan waktu\n"
 "pembuatan arsip secara drastis"
 
-#: src/plugins/archive/archiver_gtk.c:1174
+#: src/plugins/archive/archiver_gtk.c:1178
 msgid "R_ename"
 msgstr "G_anti nama"
 
-#: src/plugins/archive/archiver_gtk.c:1178
+#: src/plugins/archive/archiver_gtk.c:1182
 #: src/plugins/archive/archiver_prefs.c:325
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -8924,7 +9005,7 @@ msgstr ""
 "Skema nama: tanggal_dari at ke@subyek.\n"
 "Nama akan dipotong sampai maksimum 96 karakter"
 
-#: src/plugins/archive/archiver_gtk.c:1186
+#: src/plugins/archive/archiver_gtk.c:1190
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -8932,11 +9013,11 @@ msgstr ""
 "Ambil pilihan ini untuk menghapus surat setelah mengarsipkan\n"
 "Pilihan ini hanya mampu menangani IMAP4, mbox lokal dan POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1190
+#: src/plugins/archive/archiver_gtk.c:1194
 msgid "Selection options"
 msgstr "Pilihan pemilihan"
 
-#: src/plugins/archive/archiver_gtk.c:1206
+#: src/plugins/archive/archiver_gtk.c:1210
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9018,6 +9099,7 @@ msgstr ""
 "pembuatan arsip secara drastis"
 
 #: src/plugins/archive/archiver_prefs.c:323
+#: src/plugins/managesieve/sieve_manager.c:761
 msgid "Rename"
 msgstr "Ganti nama"
 
@@ -9025,29 +9107,17 @@ msgstr "Ganti nama"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Ambil pilihan ini untuk menghapus pesan setelah mengarsipkan"
 
-#: src/plugins/att_remover/att_remover.c:299
-msgid "<b>Type: </b>"
-msgstr "<b>Tipe: </b>"
-
-#: src/plugins/att_remover/att_remover.c:300
-msgid "<b>Size: </b>"
-msgstr "<b>Ukuran: </b>"
-
-#: src/plugins/att_remover/att_remover.c:301
-msgid "<b>Filename: </b>"
-msgstr "<b>Namaberkas: </b>"
-
 #: src/plugins/att_remover/att_remover.c:332
 msgid "Remove attachments"
 msgstr "Hapus lampiran"
 
 #: 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 "Hapus"
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summary_column.c:80
-#: src/summaryview.c:2785
+#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
+#: src/prefs_summary_column.c:80 src/summaryview.c:2770
 msgid "Attachment"
 msgstr "Lampiran"
 
@@ -9094,14 +9164,13 @@ msgstr ""
 msgid "Attachment handling"
 msgstr "Penanganan lampiran"
 
-#: src/plugins/attachwarner/attachwarner.c:214
-#, c-format
+#: src/plugins/attachwarner/attachwarner.c:217
+#, fuzzy, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
-"attached. Mention appears on line %d, which begins with text: <span weight="
-"\"bold\">%.20s</span>...\n"
+"attached. Mention appears on line %d, which begins with text: %s\n"
 "\n"
-"%s it anyway?"
+"%s"
 msgstr ""
 "Lampiran disebut dalam surat yang anda kirim, namun tidak ada berkas yang "
 "dilampirkan. Disebutkan pada baris %d, dimulai dengan teks: <span weight="
@@ -9109,17 +9178,17 @@ msgstr ""
 "\n"
 "%s saja?"
 
-#: src/plugins/attachwarner/attachwarner.c:218
+#: src/plugins/attachwarner/attachwarner.c:223
 msgid "Attachment warning"
 msgstr "Peringatan lampiran"
 
-#: src/plugins/attachwarner/attachwarner.c:243
-#: src/plugins/attachwarner/attachwarner.c:280
-#: src/plugins/attachwarner/attachwarner.c:332
+#: src/plugins/attachwarner/attachwarner.c:249
+#: src/plugins/attachwarner/attachwarner.c:286
+#: src/plugins/attachwarner/attachwarner.c:338
 msgid "Attach warner"
 msgstr "Pengingat lampiran"
 
-#: src/plugins/attachwarner/attachwarner.c:290
+#: src/plugins/attachwarner/attachwarner.c:296
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9169,8 +9238,7 @@ msgstr ""
 "Jangan periksa lampiran yang tidak ditemukan ketika meneruskan atau "
 "meredirek pesan"
 
-#: 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 "Tandatangan"
 
@@ -9233,7 +9301,7 @@ msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: belajar dari pesan..."
 
 #: 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 "Belajar gagal; `%s` dikembalikan dengan status %d."
@@ -9276,39 +9344,37 @@ msgstr ""
 "\n"
 "Pilihan dapat ditemukan di /Konfigurasi/Preferensi/Pengaya/Bogofilter"
 
-#: 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 "Pendeteksi spam"
 
-#: 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 "Mempelajari spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:400
+#: src/plugins/spamassassin/spamassassin_gtk.c:399
 msgid "Process messages on receiving"
 msgstr "Proses pesan selama mengambil"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:358
+#: src/plugins/spamassassin/spamassassin_gtk.c:357
 msgid "Maximum size"
 msgstr "Ukuran maksimum"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:367
+#: src/plugins/spamassassin/spamassassin_gtk.c:366
 msgid "Messages larger than this will not be checked"
 msgstr "Pesan yang lebih besar tidak akan diperiksa"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1507
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "KB"
 
@@ -9329,7 +9395,7 @@ msgstr "Tandai sebagai spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:415
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9338,7 +9404,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:233
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:422
+#: src/plugins/spamassassin/spamassassin_gtk.c:421
 msgid "Click this button to select a folder for storing spam"
 msgstr "Klik tombol ini untuk memilih direktori untuk menaruh spam"
 
@@ -9370,13 +9436,13 @@ msgstr "Hanya dilakukan untuk pesan pada direktori MH"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:437
+#: src/plugins/spamassassin/spamassassin_gtk.c:436
 msgid "Whitelist senders found in address book/folder"
 msgstr "Daftar putih pengirim ditemukan pada buku alamat/direktori"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:272
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:441
+#: src/plugins/spamassassin/spamassassin_gtk.c:440
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9386,7 +9452,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:282
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:451
+#: src/plugins/spamassassin/spamassassin_gtk.c:450
 msgid "Click this button to select a book or folder in the address book"
 msgstr "Klik tombol ini untuk memilih buku atau direktori dalam buku alamat"
 
@@ -9413,7 +9479,7 @@ msgstr "Lokasi bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:309
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:428
 msgid "Mark spam as read"
 msgstr "Tandai spam sudah dibaca"
 
@@ -9421,15 +9487,15 @@ msgstr "Tandai spam sudah dibaca"
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:299
+#: src/plugins/bsfilter/bsfilter.c:300
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: mengambil isi..."
 
-#: src/plugins/bsfilter/bsfilter.c:308
+#: src/plugins/bsfilter/bsfilter.c:309
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: menyaring pesan..."
 
-#: 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"
@@ -9441,7 +9507,7 @@ msgstr ""
 "Gunakan \"/Tandai/Tandai sebagai spam\" dan \"Tandai/Tandai sebagai ham\" "
 "untuk melatih Bsfilter dengan beberapa ratus pesan spam dan ham."
 
-#: 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 "
@@ -9450,11 +9516,11 @@ msgstr ""
 "Pengaya Bsfilter tidak dapat menyaring pesan. Perintah `%s` tidak dapat "
 "dijalankan."
 
-#: src/plugins/bsfilter/bsfilter.c:501
+#: src/plugins/bsfilter/bsfilter.c:502
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: belajar dari pesan..."
 
-#: 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 "
@@ -9483,7 +9549,7 @@ msgstr ""
 "Pilihan dapat ditemukan pada /Konfigurasi/Pengaturan/Pengaya/Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:408
+#: src/plugins/spamassassin/spamassassin_gtk.c:407
 msgid "Save spam in"
 msgstr "Simpan spam di"
 
@@ -9745,26 +9811,26 @@ msgstr ""
 msgid "Could not create socket"
 msgstr "Tidak dapat membuat soket"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:421
+#: src/plugins/clamd/libclamd/clamd-plugin.c:422
 msgid ": File does not exist"
 msgstr ": Berkas tidak ada"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:434
+#: src/plugins/clamd/libclamd/clamd-plugin.c:435
 msgid ": Unable to open"
 msgstr ": Tidak dapat di buka"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:454
-#: src/plugins/clamd/libclamd/clamd-plugin.c:459
-#: src/plugins/clamd/libclamd/clamd-plugin.c:473
+#: src/plugins/clamd/libclamd/clamd-plugin.c:455
+#: src/plugins/clamd/libclamd/clamd-plugin.c:460
+#: src/plugins/clamd/libclamd/clamd-plugin.c:474
 msgid "Socket write error"
 msgstr "Terjadi kesalahan penulisan soket"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:466
+#: src/plugins/clamd/libclamd/clamd-plugin.c:467
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Terjadi kesalahan pembacaan"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:480
+#: src/plugins/clamd/libclamd/clamd-plugin.c:481
 msgid "Socket read error"
 msgstr "Terjadi kesalahan pembacaan soket"
 
@@ -9878,8 +9944,8 @@ msgstr ""
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
-#: src/plugins/rssyl/rssyl_prefs.c:186 src/prefs_account.c:1441
-#: src/prefs_account.c:1530 src/prefs_account.c:1991
+#: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
+#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Jela_jah"
@@ -9889,93 +9955,93 @@ msgstr "Jela_jah"
 msgid "Select stylesheet"
 msgstr "Lembargaya"
 
-#: src/plugins/fancy/fancy_viewer.c:395
+#: src/plugins/fancy/fancy_viewer.c:387
 msgid "Remote content loading is disabled."
 msgstr "Pemuatan konten remot dinonaktifkan."
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:464
 msgid "Load images"
 msgstr "Memuat gambar"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:466
 msgid "Enable remote content"
 msgstr "Aktifkan konten remot"
 
-#: src/plugins/fancy/fancy_viewer.c:476
+#: src/plugins/fancy/fancy_viewer.c:468
 msgid "Enable Javascript"
 msgstr "Aktifkan Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:470
 msgid "Enable Plugins"
 msgstr "Aktifkan Pengaya"
 
-#: src/plugins/fancy/fancy_viewer.c:480
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable Java"
 msgstr "Aktifkan Java"
 
-#: src/plugins/fancy/fancy_viewer.c:482
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Open links with external browser"
 msgstr "Buka tautan dengan perambah luar"
 
-#: src/plugins/fancy/fancy_viewer.c:651
+#: src/plugins/fancy/fancy_viewer.c:643
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Terjadi kesalahan: %d\n"
 
-#: 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 "%s adalah feed yang salah format atau feed yang tidak didukung"
 
-#: src/plugins/fancy/fancy_viewer.c:718
+#: src/plugins/fancy/fancy_viewer.c:710
 msgid "Search the Web"
 msgstr "Cari situs"
 
-#: src/plugins/fancy/fancy_viewer.c:730
+#: src/plugins/fancy/fancy_viewer.c:722
 msgid "Open in Viewer"
 msgstr "Buka di Penampil"
 
-#: src/plugins/fancy/fancy_viewer.c:732
+#: src/plugins/fancy/fancy_viewer.c:724
 msgid "Open in Viewer (enable remote content)"
 msgstr "Buka pada penampil (konten remot diaktifkan)"
 
-#: src/plugins/fancy/fancy_viewer.c:741
+#: src/plugins/fancy/fancy_viewer.c:733
 msgid "Open in Browser"
 msgstr "Buka di Peramban"
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:743
 msgid "Open Image"
 msgstr "Buka Gambar"
 
-#: src/plugins/fancy/fancy_viewer.c:760
+#: src/plugins/fancy/fancy_viewer.c:752
 msgid "Copy Link"
 msgstr "Salin Tautan"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:756
 msgid "Download Link"
 msgstr "Unduh Tautan"
 
-#: src/plugins/fancy/fancy_viewer.c:775
+#: src/plugins/fancy/fancy_viewer.c:767
 msgid "Save Image As"
 msgstr "Simpan Gambar Sebagai"
 
-#: src/plugins/fancy/fancy_viewer.c:785
+#: src/plugins/fancy/fancy_viewer.c:777
 msgid "Copy Image"
 msgstr "Salin Gambar"
 
-#: src/plugins/fancy/fancy_viewer.c:803
+#: src/plugins/fancy/fancy_viewer.c:795
 msgid "Import feed"
 msgstr "Impor feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1016
+#: src/plugins/fancy/fancy_viewer.c:1007
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1044
+#: src/plugins/fancy/fancy_viewer.c:1035
 msgid "Fancy HTML Viewer"
 msgstr "Penampil HTML Indah"
 
-#: 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"
@@ -9986,10 +10052,6 @@ msgstr ""
 "Secara standar seluruh konten remot di blokir. Pilihan dapat ditemukan pada /"
 "Konfigurasi/Preferensi/Pengaya/Fancy"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:151
-msgid "failed to write Fetchinfo configuration to file\n"
-msgstr "Gagal menulis konfigurasi PengambilInfo ke berkas\n"
-
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:200
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
@@ -10070,12 +10132,12 @@ msgid ""
 "RFC822 format"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:125
+#: src/plugins/gdata/cm_gdata_contacts.c:127
 #, fuzzy
 msgid "GData plugin: Authorization required"
 msgstr "Pengaya GData: Otentifikasi gagal: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: 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"
@@ -10086,141 +10148,136 @@ msgid ""
 "list."
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:142
+#: src/plugins/gdata/cm_gdata_contacts.c:144
 #, fuzzy
 msgid "Step 1:"
 msgstr "Langkah"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:148
+#: 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:152
+#: src/plugins/gdata/cm_gdata_contacts.c:154
 #, fuzzy
 msgid "Step 2:"
 msgstr "Langkah"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:158
+#: src/plugins/gdata/cm_gdata_contacts.c:160
 #, fuzzy
 msgid "Enter code:"
 msgstr "Antarmuka"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:324
+#: src/plugins/gdata/cm_gdata_contacts.c:326
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "Pengaya GData: Terjadi kesalahan saat kueri kontak: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:340
+#. TRANSLATORS: First part of "Added X of Y contacts to cache"
+#: src/plugins/gdata/cm_gdata_contacts.c:342
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
 msgstr[0] "Ditambahkan %d dari"
 msgstr[1] "Ditambahkan %d dari"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:342
+#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
+#: 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] "1 kontak ke tampungan"
 msgstr[1] "%d kontak ke tampungan"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:352
+#: src/plugins/gdata/cm_gdata_contacts.c:354
 msgid "GData plugin: Starting async contacts query\n"
 msgstr "Pengaya GData: Memulai kueri kontak secara async\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:373
+#: src/plugins/gdata/cm_gdata_contacts.c:375
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "Pengaya GData: Kesalahan dalam permintaan untuk kelompok: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:410
+#: src/plugins/gdata/cm_gdata_contacts.c:412
 msgid "GData plugin: Groups received\n"
 msgstr "Pengaya GData: Kelompok diterima\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:417
+#: src/plugins/gdata/cm_gdata_contacts.c:419
 msgid "GData plugin: Starting async groups query\n"
 msgstr "Pengaya GData: Memulai kelompok permintaan asinkron\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:442
+#: src/plugins/gdata/cm_gdata_contacts.c:444
 #, fuzzy, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Pengaya GData: Otentifikasi gagal: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:449
+#: src/plugins/gdata/cm_gdata_contacts.c:451
 #, fuzzy
 msgid "GData plugin: Authorization successful\n"
 msgstr "Pengaya GData: Otentifikasi gagal: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:459
+#: src/plugins/gdata/cm_gdata_contacts.c:461
 #, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "Pengaya GData: Memulai otentifikasi asinkron\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:469
+#: src/plugins/gdata/cm_gdata_contacts.c:471
 #, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "Pengaya GData: Memulai otentifikasi asinkron\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:476
+#: 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:493
+#: src/plugins/gdata/cm_gdata_contacts.c:495
 #, fuzzy, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "Pengaya GData: Otentifikasi gagal: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:502
+#: src/plugins/gdata/cm_gdata_contacts.c:504
 #, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "Pengaya GData: Otentifikasi gagal: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:555
+#: src/plugins/gdata/cm_gdata_contacts.c:560
 #, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Pengaya GData: Memulai otentifikasi asinkron\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 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 "Otentifikasi"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:152
+#: src/plugins/gdata/cm_gdata_prefs.c:84
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
 msgid "Username:"
 msgstr "Nama pengguna:"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:94
+#: src/plugins/gdata/cm_gdata_prefs.c:95
 msgid "Polling interval (seconds):"
 msgstr "Jeda pemilihan (detik):"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:101
+#: src/plugins/gdata/cm_gdata_prefs.c:102
 msgid "Maximum number of results:"
 msgstr "Maksimum jumlah hasil:"
 
-#: 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 "GData"
 
-#: src/plugins/gdata/gdata_plugin.c:75
-msgid ""
-"\n"
-"GData Plugin: Failed to write plugin configuration to file\n"
-msgstr ""
-"\n"
-"Pengaya GData: Gagal untuk menulis konfigurasi pengaya ke dalam berkas\n"
-
-#: 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 "Gagal untuk registrasi kaitan pelengkap alamat pada pengaya GData"
 
-#: 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 "Gagal untuk registrasi kaitan saklar luring pada pengaya GData"
 
-#: 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"
@@ -10238,1341 +10295,588 @@ msgstr ""
 "\n"
 "Saran ke <berndth at gmx.de> dipersilahkan."
 
-#: src/plugins/gdata/gdata_plugin.c:187
+#: src/plugins/gdata/gdata_plugin.c:196
 msgid "GData integration"
 msgstr "Integrasi GData"
 
-#. TRANSLATORS: The two numbers are latitude and longitude coordinates
-#: src/plugins/geolocation/geolocation_plugin.c:349
-#, c-format
-msgid "Found location: (%.2f,%.2f)"
-msgstr ""
-
-#. TRANSLATORS: The country name is appended to the string
-#: src/plugins/geolocation/geolocation_plugin.c:369
-msgid "Alleged country of origin: "
-msgstr ""
+#: src/plugins/libravatar/libravatar.c:374
+#: src/plugins/libravatar/libravatar.c:439
+#: src/plugins/libravatar/libravatar.c:499
+#: src/plugins/libravatar/libravatar_prefs.c:546
+msgid "Libravatar"
+msgstr "Libravatar"
 
-#. TRANSLATORS: The IP address is appended to the string
-#: src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
-msgid "Could not resolve location of IP address "
-msgstr "Tidak dapat membaca indeks alamat"
+#: src/plugins/libravatar/libravatar.c:381
+msgid "Failed to register avatar header update hook"
+msgstr "Gagal untuk registrasi kaitan pembaruan header avatar"
 
-#: src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
-msgid "Try to locate sender"
-msgstr "nama depan pengirim"
+#: src/plugins/libravatar/libravatar.c:390
+msgid "Failed to register avatar image render hook"
+msgstr "Gagal untuk registrasi kaitan render gambar avatar"
 
-#: src/plugins/geolocation/geolocation_plugin.c:528
-msgid "Andorra"
-msgstr ""
+#: src/plugins/libravatar/libravatar.c:396
+msgid "Failed to create avatar image cache directory"
+msgstr "Gagal untuk membuat direktori tampungan gambar avatar"
 
-#: src/plugins/geolocation/geolocation_plugin.c:529
-msgid "United Arab Emirates"
-msgstr ""
+#: src/plugins/libravatar/libravatar.c:406
+msgid "Failed to load missing items cache"
+msgstr "Gagal memuat tampungan item yang hilang"
 
-#: src/plugins/geolocation/geolocation_plugin.c:530
-msgid "Afghanistan"
+#: src/plugins/libravatar/libravatar.c:449
+msgid ""
+"Display libravatar profiles' images for mail messages. More\n"
+"info about libravatar at http://www.libravatar.org/. If you have\n"
+"a gravatar.com profile but not a libravatar one, those will also\n"
+"be retrieved (when redirections are allowed in plugin config).\n"
+"Plugin config page is available from main window at:\n"
+"/Configuration/Preferences/Plugins/Libravatar.\n"
+"\n"
+"This plugin uses libcurl to retrieve images, so if you're behind a\n"
+"proxy please refer to curl(1) manpage for details on 'http_proxy'\n"
+"configuration. More details about this and others on README file.\n"
+"\n"
+"Feedback to <ricardo at mones.org> is welcome.\n"
 msgstr ""
+"Menampilkan gambar profil libravatar untuk pesan surat. Info\n"
+"lebih lanjut tentang libravatar pada http://www.libravatar.org/.Jika anda "
+"memiliki profil gravatar.com akan ditampilkan juga\n"
+"(jika pengalihan diperbolehkan di konfigurasi pengaya).\n"
+"Halaman konfigurasi Pengaya tersedia pada jendela utama:\n"
+"/Konfigurasi/Preferensi/Pengaya/Libravatar.\n"
+"\n"
+"Pengaya ini menggunakan libcurl untuk mengambil gambar,\n"
+"jika anda berada di belakang proxy, silahkan cek ke halaman\n"
+"man curl(1) untuk konfigurasi detail tentang 'http_proxy'\n"
+"Lebih detail lagi dapat dilihat pada berkas README.\n"
+"\n"
+"Saran ke <ricardo at mones.org> dipersilahkan.\n"
 
-#: src/plugins/geolocation/geolocation_plugin.c:531
-msgid "Antigua And Barbuda"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:137
+#, fuzzy
+msgid "Error reading cache stats"
+msgstr "Kesalahan dalam membaca berkas"
 
-#: src/plugins/geolocation/geolocation_plugin.c:532
-msgid "Anguilla"
+#: src/plugins/libravatar/libravatar_prefs.c:141
+#, c-format
+msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:533
-msgid "Albania"
+#: src/plugins/libravatar/libravatar_prefs.c:150
+#, c-format
+msgid "Using %s in %d files, %d directories and %d others"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:534
-msgid "Armenia"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:164
+#, fuzzy
+msgid "Clear icon cache"
+msgstr "Tampungan ikon"
 
-#: src/plugins/geolocation/geolocation_plugin.c:535
-msgid "Netherlands Antilles"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:165
+#, fuzzy
+msgid "Are you sure you want to remove all cached avatar icons?"
+msgstr "Apakah anda yakin ingin menghapus tema ini?"
 
-#: src/plugins/geolocation/geolocation_plugin.c:536
-msgid "Angola"
+#: src/plugins/libravatar/libravatar_prefs.c:178
+msgid "Not enough memory for operation"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:537
-msgid "Antarctica"
+#: src/plugins/libravatar/libravatar_prefs.c:183
+#, c-format
+msgid ""
+"Icon cache successfully cleared:\n"
+"• %u missing entries removed.\n"
+"• %u files removed."
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:538
+#: src/plugins/libravatar/libravatar_prefs.c:188
 #, fuzzy
-msgid "Argentina"
-msgstr "Magenta"
-
-#: src/plugins/geolocation/geolocation_plugin.c:539
-msgid "American Samoa"
-msgstr ""
+msgid "Icon cache successfully cleared!"
+msgstr "Berhasil tersambung dengan server"
 
-#: src/plugins/geolocation/geolocation_plugin.c:540
-msgid "Austria"
+#: src/plugins/libravatar/libravatar_prefs.c:191
+#, c-format
+msgid ""
+"Errors clearing icon cache:\n"
+"• %u missing entries removed.\n"
+"• %u files removed.\n"
+"• %u files failed to be read.\n"
+"• %u files couldn't be removed."
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:541
-msgid "Australia"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:198
+#, fuzzy
+msgid "Error clearing icon cache."
+msgstr "Tampungan ikon"
 
-#: src/plugins/geolocation/geolocation_plugin.c:542
-msgid "Aruba"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:213
+msgid "_Use cached icons"
+msgstr "_Gunakan ikon di tampungan"
 
-#: src/plugins/geolocation/geolocation_plugin.c:543
-msgid "Azerbaijan"
+#: src/plugins/libravatar/libravatar_prefs.c:214
+msgid ""
+"Keep icons on disk for reusing instead of making another network request"
 msgstr ""
+"Biarkan ikon pada media untuk penggunaan ulang daripada membuat permintaan "
+"lagi"
 
-#: src/plugins/geolocation/geolocation_plugin.c:544
-msgid "Bosnia And Herzegovina"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:229
+msgid "Cache refresh interval"
+msgstr "Interval untuk muat ulang Tampungan"
 
-#: src/plugins/geolocation/geolocation_plugin.c:545
-msgid "Barbados"
-msgstr ""
+#: 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 "jam"
 
-#: src/plugins/geolocation/geolocation_plugin.c:546
-msgid "Bangladesh"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:305
+msgid "Mystery man"
+msgstr "Manusia misteri"
 
-#: src/plugins/geolocation/geolocation_plugin.c:547
-msgid "Belgium"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:306
+msgid "Identicon"
+msgstr "Identikon"
 
-#: src/plugins/geolocation/geolocation_plugin.c:548
-msgid "Burkina Faso"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:307
+msgid "MonsterID"
+msgstr "MonsterID"
 
-#: src/plugins/geolocation/geolocation_plugin.c:549
-msgid "Bulgaria"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:308
+msgid "Wavatar"
+msgstr "Wavatar"
 
-#: src/plugins/geolocation/geolocation_plugin.c:550
-msgid "Bahrain"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:309
+msgid "Retro"
+msgstr "Retro"
 
-#: src/plugins/geolocation/geolocation_plugin.c:551
-msgid "Burundi"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:310
+msgid "Custom URL"
+msgstr "URL bebas"
 
-#: src/plugins/geolocation/geolocation_plugin.c:552
-msgid "Benin"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:313
+msgid "A blank image"
+msgstr "Gambar kosong"
 
-#: src/plugins/geolocation/geolocation_plugin.c:553
-msgid "Bermuda"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:314
+msgid "The unobtrusive low-contrast greyish silhouette"
+msgstr "Siluet abu-abu berkontras rendah"
 
-#: src/plugins/geolocation/geolocation_plugin.c:554
-msgid "Brunei Darussalam"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:315
+msgid "A generated geometric pattern"
+msgstr "Tampilan pola geometrik"
 
-#: src/plugins/geolocation/geolocation_plugin.c:555
-msgid "Bolivia"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:316
+msgid "A generated full-body monster"
+msgstr "Tampilan monster full-body"
 
-#: src/plugins/geolocation/geolocation_plugin.c:556
-msgid "Brazil"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:317
+msgid "A generated almost unique face"
+msgstr "Tampilan wajah yang hampir unik"
 
-#: src/plugins/geolocation/geolocation_plugin.c:557
-msgid "Bahamas"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:558
-msgid "Bhutan"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:559
-msgid "Bouvet Island"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:560
-msgid "Botswana"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:561
-msgid "Belarus"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:562
-msgid "Belize"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:563
-msgid "Canada"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:564
-msgid "Cocos (Keeling) Islands"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:565
-msgid "Central African Republic"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:318
+msgid "A generated 8-bit arcade-style pixelated image"
+msgstr "Gambar pixel 8-bit bergaya arcade"
 
-#: src/plugins/geolocation/geolocation_plugin.c:566
-msgid "Congo"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:319
+msgid "Redirect to a user provided URL"
+msgstr "pergi ke URL yang disediakan pengguna"
 
-#: src/plugins/geolocation/geolocation_plugin.c:567
-msgid "Switzerland"
+#: src/plugins/libravatar/libravatar_prefs.c:333
+msgid ""
+"Enter the URL you want to be redirected when no user icon is available. "
+"Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:568
-msgid "Cote D'Ivoire"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:382
+msgid "_Allow redirects to other sites"
+msgstr "_Perbolehkan pengalihan ke situs lainnya"
 
-#: src/plugins/geolocation/geolocation_plugin.c:569
-msgid "Cook Islands"
+#: src/plugins/libravatar/libravatar_prefs.c:383
+msgid ""
+"Follow redirect responses received from libravatar server to other avatar "
+"services like gravatar.com"
 msgstr ""
+"Mengikuti respon yang dialihkan yang diterima dari server libravatar ke "
+"layanan avatar lainnya seperti gravatar.com"
 
-#: src/plugins/geolocation/geolocation_plugin.c:570
-msgid "Chile"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:392
+msgid "_Enable federated servers"
+msgstr "_Aktifkan penggabungan server"
 
-#: src/plugins/geolocation/geolocation_plugin.c:571
-msgid "Cameroon"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:393
+msgid "Try to get avatar from sender's domain libravatar server"
+msgstr "Mencoba untuk mengambil avatar dari domain pengirim server libravatar"
 
-#: src/plugins/geolocation/geolocation_plugin.c:572
+#: src/plugins/libravatar/libravatar_prefs.c:410
 #, fuzzy
-msgid "China"
-msgstr "China"
+msgid "Request timeout"
+msgstr "Waktu sesi habis\n"
 
-#: src/plugins/geolocation/geolocation_plugin.c:573
+#: src/plugins/libravatar/libravatar_prefs.c:410
 #, fuzzy
-msgid "Colombia"
-msgstr "Warna"
-
-#: src/plugins/geolocation/geolocation_plugin.c:574
-msgid "Costa Rica"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:575
-msgid "Cuba"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:576
-msgid "Cape Verde"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:577
-msgid "Christmas Island"
-msgstr ""
+msgid "second(s)"
+msgstr "detik"
 
-#: src/plugins/geolocation/geolocation_plugin.c:578
-msgid "Cyprus"
+#: src/plugins/libravatar/libravatar_prefs.c:411
+msgid ""
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:579
-msgid "Czech Republic"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:455
+msgid "Icon cache"
+msgstr "Tampungan ikon"
 
-#: src/plugins/geolocation/geolocation_plugin.c:580
-msgid "Germany"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:459
+msgid "Default missing icon mode"
+msgstr "mode ikon kehilangan standar"
 
-#: src/plugins/geolocation/geolocation_plugin.c:581
-msgid "Djibouti"
-msgstr ""
+#: src/plugins/libravatar/libravatar_prefs.c:463
+msgid "Network"
+msgstr "Jaringan"
 
-#: src/plugins/geolocation/geolocation_plugin.c:582
+#: src/plugins/mailmbox/plugin.c:58
 #, fuzzy
-msgid "Denmark"
-msgstr "Unmark"
-
-#: src/plugins/geolocation/geolocation_plugin.c:583
-msgid "Dominica"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:584
-msgid "Dominican Republic"
-msgstr ""
+msgid "mailmbox folder"
+msgstr "direktori mailmbox (etPan!)"
 
-#: src/plugins/geolocation/geolocation_plugin.c:585
-msgid "Algeria"
-msgstr ""
+#: src/plugins/mailmbox/plugin.c:63
+msgid "This is a plugin to handle mailboxes in mbox format."
+msgstr "Ini adalah pengaya untuk menangani kotaksurat dalam format mbox."
 
-#: src/plugins/geolocation/geolocation_plugin.c:586
-msgid "Ecuador"
-msgstr ""
+#: src/plugins/mailmbox/plugin.c:84
+msgid "MBOX"
+msgstr "MBOX"
 
-#: src/plugins/geolocation/geolocation_plugin.c:587
-msgid "Estonia"
+#: src/plugins/mailmbox/plugin_gtk.c:190
+msgid ""
+"Input the location of mailbox.\n"
+"If the existing mailbox is specified, it will be\n"
+"scanned automatically."
 msgstr ""
+"Masukkan lokasi kotaksurat.\n"
+"Jika lokasi kotaksurat sudah ada, secara otomatis\n"
+"akan dipindai."
 
-#: src/plugins/geolocation/geolocation_plugin.c:588
-msgid "Egypt"
+#: src/plugins/mailmbox/plugin_gtk.c:330
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be deleted.\n"
+"Do you really want to delete?"
 msgstr ""
+"Semua direktori dan pesan di bawah '%s' akan dihapus.\n"
+"Anda benar-benar ingin menghapus?"
 
-#: src/plugins/geolocation/geolocation_plugin.c:589
+#: src/plugins/managesieve/managesieve.c:435
 #, fuzzy
-msgid "Western Sahara"
-msgstr "Eropa Barat"
-
-#: src/plugins/geolocation/geolocation_plugin.c:590
-msgid "Eritrea"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:591
-msgid "Spain"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:592
-msgid "Ethiopia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:593
-msgid "Finland"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:594
-msgid "Fiji"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:595
-msgid "Falkland Islands (Malvinas)"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:596
-msgid "Micronesia, Federated States Of"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:597
-msgid "Faroe Islands"
-msgstr ""
+msgid "No Sieve auth method available\n"
+msgstr "Metode SMTP AUTH tidak tersedia\n"
 
-#: src/plugins/geolocation/geolocation_plugin.c:598
+#: src/plugins/managesieve/managesieve.c:439
 #, fuzzy
-msgid "France"
-msgstr "Batal"
-
-#: src/plugins/geolocation/geolocation_plugin.c:599
-msgid "France, Metropolitan"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:600
-msgid "Gabon"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:601
-#: src/plugins/geolocation/geolocation_plugin.c:747
-msgid "United Kingdom"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:602
-msgid "Grenada"
-msgstr ""
+msgid "Selected Sieve auth method not available\n"
+msgstr "Metode SMTP AUTH yang dipilih tidak tersedia\n"
 
-#: src/plugins/geolocation/geolocation_plugin.c:603
-msgid "Georgia"
+#: src/plugins/managesieve/managesieve.c:672
+msgid "Disconnected"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:604
-msgid "French Guiana"
-msgstr ""
+#: src/plugins/managesieve/managesieve.c:676
+#, fuzzy, c-format
+msgid "Disconnected: %s"
+msgstr "Kamus: %s"
 
-#: src/plugins/geolocation/geolocation_plugin.c:605
-msgid "Ghana"
+#: 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/geolocation/geolocation_plugin.c:606
+#: src/plugins/managesieve/managesieve.c:731
 #, fuzzy
-msgid "Gibraltar"
-msgstr "Libravatar"
+msgid "TLS failed"
+msgstr "LIST gagal\n"
 
-#: src/plugins/geolocation/geolocation_plugin.c:607
+#: 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
 #, fuzzy
-msgid "Greenland"
-msgstr "Hijau"
-
-#: src/plugins/geolocation/geolocation_plugin.c:608
-msgid "Gambia"
-msgstr ""
+msgid "error occurred on SIEVE session\n"
+msgstr "terjadi kesalahan pada sesi SMTP\n"
 
-#: src/plugins/geolocation/geolocation_plugin.c:609
-msgid "Guinea"
-msgstr ""
+#: src/plugins/managesieve/managesieve.c:865
+#, fuzzy, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "terjadi kesalahan pada sesi SMTP\n"
 
-#: src/plugins/geolocation/geolocation_plugin.c:610
-msgid "Guadeloupe"
+#: src/plugins/managesieve/managesieve.c:874
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:611
-msgid "Equatorial Guinea"
+#: src/plugins/managesieve/managesieve.c:1131
+msgid "Sieve: retrying auth\n"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:612
+#: src/plugins/managesieve/managesieve.c:1133
 #, fuzzy
-msgid "Greece"
-msgstr "Hijau"
-
-#: src/plugins/geolocation/geolocation_plugin.c:613
-msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:614
-msgid "Guatemala"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:615
-msgid "Guam"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:616
-msgid "Guinea-Bissau"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:617
-msgid "Guyana"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:618
-msgid "Hong Kong"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:619
-msgid "Heard Island And Mcdonald Islands"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:620
-msgid "Honduras"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:621
-msgid "Croatia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:622
-msgid "Haiti"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:623
-msgid "Hungary"
-msgstr ""
+msgid "Auth method not available"
+msgstr "tidak tersedia"
 
-#: src/plugins/geolocation/geolocation_plugin.c:624
-msgid "Indonesia"
-msgstr ""
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5607
+msgid "_Filter"
+msgstr "_Saring"
 
-#: src/plugins/geolocation/geolocation_plugin.c:625
-msgid "Ireland"
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:630
+msgid "Chec_k Syntax"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:626
-msgid "Israel"
+#: src/plugins/managesieve/sieve_editor.c:87
+msgid "Re_vert"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:627
+#: src/plugins/managesieve/sieve_editor.c:296
+#: src/plugins/managesieve/sieve_editor.c:722
+#: src/plugins/managesieve/sieve_manager.c:182
 #, fuzzy
-msgid "India"
-msgstr "Indikator"
-
-#: src/plugins/geolocation/geolocation_plugin.c:628
-msgid "British Indian Ocean Territory"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:629
-msgid "Iraq"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:630
-msgid "Iran, Islamic Republic Of"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:631
-msgid "Iceland"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:632
-msgid "Italy"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:633
-msgid "Jamaica"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:634
-msgid "Jordan"
-msgstr ""
+msgid "Unable to get script contents"
+msgstr "Aktifkan konten remot"
 
-#: src/plugins/geolocation/geolocation_plugin.c:635
+#: src/plugins/managesieve/sieve_editor.c:325
 #, fuzzy
-msgid "Japan"
-msgstr "Jepang"
-
-#: src/plugins/geolocation/geolocation_plugin.c:636
-msgid "Kenya"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:637
-msgid "Kyrgyzstan"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:638
-msgid "Cambodia"
-msgstr ""
+msgid "Reverting..."
+msgstr "Melaporkan spam..."
 
-#: src/plugins/geolocation/geolocation_plugin.c:639
-msgid "Kiribati"
+#: src/plugins/managesieve/sieve_editor.c:334
+msgid "Revert script"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:640
+#: src/plugins/managesieve/sieve_editor.c:335
 #, fuzzy
-msgid "Comoros"
-msgstr "besok"
-
-#: src/plugins/geolocation/geolocation_plugin.c:641
-msgid "Saint Kitts And Nevis"
-msgstr ""
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr "Pesan ini telah dirubah. Simpan perubahan terakhir?"
 
-#: src/plugins/geolocation/geolocation_plugin.c:642
-msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+#: src/plugins/managesieve/sieve_editor.c:336
+#, fuzzy
+msgid "_Revert"
+msgstr "Tidak pernah"
 
-#: src/plugins/geolocation/geolocation_plugin.c:643
-msgid "Korea, Republic Of"
-msgstr ""
+#: src/plugins/managesieve/sieve_editor.c:353
+#, fuzzy
+msgid "Script saved successfully."
+msgstr "Pesan terkirim dengan sukses."
 
-#: src/plugins/geolocation/geolocation_plugin.c:644
-msgid "Kuwait"
-msgstr ""
+#: src/plugins/managesieve/sieve_editor.c:370
+#, fuzzy
+msgid "Saving..."
+msgstr "Memuat..."
 
-#: src/plugins/geolocation/geolocation_plugin.c:645
-msgid "Cayman Islands"
-msgstr ""
+#: src/plugins/managesieve/sieve_editor.c:399
+#, fuzzy
+msgid "Checking syntax..."
+msgstr "Memeriksa tandatangan..."
 
-#: src/plugins/geolocation/geolocation_plugin.c:646
-msgid "Kazakhstan"
-msgstr ""
+#: src/plugins/managesieve/sieve_editor.c:432
+#, fuzzy
+msgid "This script has been modified. Save the latest changes?"
+msgstr "Pesan ini telah dirubah. Simpan perubahan terakhir?"
 
-#: src/plugins/geolocation/geolocation_plugin.c:647
-msgid "Lao People'S Democratic Republic"
+#: src/plugins/managesieve/sieve_editor.c:693
+#, c-format
+msgid "%s - Sieve Filter%s"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:648
-msgid "Lebanon"
-msgstr ""
+#: src/plugins/managesieve/sieve_editor.c:742
+#: src/plugins/pdf_viewer/poppler_viewer.c:1275
+msgid "Loading..."
+msgstr "Memuat..."
 
-#: src/plugins/geolocation/geolocation_plugin.c:649
-msgid "Saint Lucia"
+#: src/plugins/managesieve/sieve_manager.c:159
+#: src/plugins/managesieve/sieve_manager.c:241
+msgid "Add Sieve script"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:650
-msgid "Liechtenstein"
-msgstr ""
+#: src/plugins/managesieve/sieve_manager.c:160
+#, fuzzy
+msgid "Enter name for a new Sieve filter script."
+msgstr "Masukkan nama untuk pohon direktori RSS baru."
 
-#: src/plugins/geolocation/geolocation_plugin.c:651
-msgid "Sri Lanka"
-msgstr ""
+#: src/plugins/managesieve/sieve_manager.c:242
+#, fuzzy
+msgid "Enter new name for the script."
+msgstr "Masukkan nama baru untuk '%s':"
 
-#: src/plugins/geolocation/geolocation_plugin.c:652
-msgid "Liberia"
-msgstr ""
+#: src/plugins/managesieve/sieve_manager.c:323
+#, fuzzy, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "Anda akan menghapus akun '%s', Yakin ?"
 
-#: src/plugins/geolocation/geolocation_plugin.c:653
-msgid "Lesotho"
-msgstr ""
+#: src/plugins/managesieve/sieve_manager.c:324
+#, fuzzy
+msgid "Delete filter"
+msgstr "Hapus direktori"
 
-#: src/plugins/geolocation/geolocation_plugin.c:654
-msgid "Lithuania"
-msgstr ""
+#: src/plugins/managesieve/sieve_manager.c:478
+#, fuzzy
+msgid "Active"
+msgstr "Aksi"
 
-#: src/plugins/geolocation/geolocation_plugin.c:655
-msgid "Luxembourg"
+#: src/plugins/managesieve/sieve_manager.c:489
+msgid "An account can only have one active script at a time."
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:656
-msgid "Latvia"
-msgstr ""
+#: src/plugins/managesieve/sieve_manager.c:576
+#, fuzzy
+msgid "Unable to connect"
+msgstr ": Tidak dapat di buka"
 
-#: src/plugins/geolocation/geolocation_plugin.c:657
-msgid "Libyan Arab Jamahiriya"
-msgstr ""
+#: src/plugins/managesieve/sieve_manager.c:620
+#, fuzzy
+msgid "Listing scripts..."
+msgstr "Skrip Python"
 
-#: src/plugins/geolocation/geolocation_plugin.c:658
-msgid "Morocco"
-msgstr ""
+#: src/plugins/managesieve/sieve_manager.c:623
+#, fuzzy
+msgid "Connecting..."
+msgstr "Menyambung"
 
-#: src/plugins/geolocation/geolocation_plugin.c:659
-msgid "Monaco"
+#: src/plugins/managesieve/sieve_manager.c:655
+msgid "Manage Sieve Filters"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:660
-msgid "Moldova, Republic Of"
+#: src/plugins/managesieve/sieve_manager.c:796
+msgid "To use Sieve, enable it in an account's preferences."
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:661
-msgid "Madagascar"
+#: src/plugins/managesieve/sieve_plugin.c:36
+#: src/plugins/managesieve/sieve_plugin.c:154
+msgid "ManageSieve"
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
-msgid "Marshall Islands"
-msgstr "Tandai semua telah dibaca"
-
-#: src/plugins/geolocation/geolocation_plugin.c:663
-msgid "Macedonia, The Former Yugoslav Republic Of"
+#: src/plugins/managesieve/sieve_plugin.c:46
+msgid "Manage Sieve Filters..."
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:664
-msgid "Mali"
+#: src/plugins/managesieve/sieve_plugin.c:114
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr ""
 
-#: src/plugins/geolocation/geolocation_plugin.c:665
+#: src/plugins/managesieve/sieve_prefs.c:149
 #, fuzzy
-msgid "Myanmar"
-msgstr "Unmark"
-
-#: src/plugins/geolocation/geolocation_plugin.c:666
-msgid "Mongolia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:667
-msgid "Macao"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:668
-msgid "Northern Mariana Islands"
-msgstr ""
+msgid "Enable Sieve"
+msgstr "Aktifkan Java"
 
-#: src/plugins/geolocation/geolocation_plugin.c:669
-msgid "Martinique"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:670
-msgid "Mauritania"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:671
-msgid "Montserrat"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:672
-msgid "Malta"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:673
-msgid "Mauritius"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:674
-msgid "Maldives"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:675
-msgid "Malawi"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:676
-msgid "Mexico"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:677
-msgid "Malaysia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:678
-msgid "Mozambique"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:679
-msgid "Namibia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
-msgid "New Caledonia"
-msgstr "Kontak Baru"
-
-#: src/plugins/geolocation/geolocation_plugin.c:681
-msgid "Niger"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:682
-msgid "Norfolk Island"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:683
-msgid "Nigeria"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:684
-msgid "Nicaragua"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:685
-msgid "Netherlands"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
-msgid "Norway"
-msgstr "Teruskan"
-
-#: src/plugins/geolocation/geolocation_plugin.c:687
-msgid "Nepal"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:688
-msgid "Nauru"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:689
-msgid "Niue"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:690
-msgid "New Zealand"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:691
-msgid "Oman"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:692
-msgid "Panama"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:693
-msgid "Peru"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:694
-msgid "French Polynesia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:695
-msgid "Papua New Guinea"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
-msgid "Philippines"
-msgstr "baris"
-
-#: src/plugins/geolocation/geolocation_plugin.c:697
-msgid "Pakistan"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:698
-msgid "Poland"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:699
-msgid "Saint Pierre And Miquelon"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:700
-msgid "Pitcairn"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:701
-msgid "Puerto Rico"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
-msgid "Portugal"
-msgstr "Port"
-
-#: src/plugins/geolocation/geolocation_plugin.c:703
-msgid "Palau"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:704
-msgid "Paraguay"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
-msgid "Qatar"
-msgstr "Wavatar"
-
-#: src/plugins/geolocation/geolocation_plugin.c:706
-msgid "Reunion"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:707
-msgid "Romania"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:708
-msgid "Russian Federation"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:709
-msgid "Rwanda"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:710
-msgid "Saudi Arabia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:711
-msgid "Solomon Islands"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:712
-msgid "Seychelles"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:713
-msgid "Sudan"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:714
-msgid "Sweden"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:715
-msgid "Singapore"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:716
-msgid "Saint Helena"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:717
-msgid "Slovenia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:718
-msgid "Svalbard And Jan Mayen"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:719
-msgid "Slovakia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:720
-msgid "Sierra Leone"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:721
-msgid "San Marino"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:722
-msgid "Senegal"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:723
-msgid "Somalia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
-msgid "Suriname"
-msgstr "Nama pengguna SMTP:"
-
-#: src/plugins/geolocation/geolocation_plugin.c:725
-msgid "Sao Tome And Principe"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:726
-msgid "El Salvador"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:727
-msgid "Syrian Arab Republic"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:728
-msgid "Swaziland"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:729
-msgid "Turks And Caicos Islands"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:730
-msgid "Chad"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:731
-msgid "French Southern Territories"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:732
-msgid "Togo"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
-msgid "Thailand"
-msgstr "Thai"
-
-#: src/plugins/geolocation/geolocation_plugin.c:734
-msgid "Tajikistan"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:735
-msgid "Tokelau"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:736
-msgid "Turkmenistan"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:737
-msgid "Tunisia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:738
-msgid "Tonga"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:739
-msgid "East Timor"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:740
-msgid "Turkey"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:741
-msgid "Trinidad And Tobago"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:742
-msgid "Tuvalu"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:743
-msgid "Taiwan, Province Of China"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:744
-msgid "Tanzania, United Republic Of"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:745
-msgid "Ukraine"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:746
-msgid "Uganda"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:748
-msgid "United States Minor Outlying Islands"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:749
-msgid "United States"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:750
-msgid "Uruguay"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:751
-msgid "Uzbekistan"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:752
-msgid "Holy See (Vatican City State)"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:753
-msgid "Saint Vincent And The Grenadines"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:754
-msgid "Venezuela"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:755
-msgid "Virgin Islands, British"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:756
-msgid "Virgin Islands, U.S."
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
-msgid "Viet Nam"
-msgstr "Nama Berkas"
-
-#: src/plugins/geolocation/geolocation_plugin.c:758
-msgid "Vanuatu"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:759
-msgid "Wallis And Futuna"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:760
-msgid "Samoa"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:761
-msgid "Yemen"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:762
-msgid "Mayotte"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:763
-msgid "Serbia And Montenegro"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:764
-msgid "South Africa"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:765
-msgid "Zambia"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:766
-msgid "Democratic Republic Of The Congo"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:767
-msgid "Zimbabwe"
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:777
-#: src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
-msgid "GeoLocation"
-msgstr "Lokasi:"
-
-#: src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy
-msgid "Could not initialize clutter"
-msgstr "Tidak dapat menginisialisasi pengeja %s."
-
-#: src/plugins/geolocation/geolocation_plugin.c:788
-#: src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
-msgid "Could not create regular expression: %s\n"
-msgstr "Tidak dapat membuat berkas sementara: %s"
-
-#: src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
-msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-msgstr ""
-"Gagal untuk registrasi kaitan perubahan tema pada pengaya Pemberitahuan"
-
-#: src/plugins/geolocation/geolocation_plugin.c:867
-msgid ""
-"This plugin provides GeoLocation functionality for Claws Mail.\n"
-"\n"
-"Warning: It is technically impossible to derive the geographic location of "
-"senders from their E-Mails with any amount of certainty. The results "
-"presented by this plugin are only rough estimates. In particular, mailing "
-"list managers often strip sender information from the mails, so mails from "
-"mailing lists may be assigned to the location of the mailing list server "
-"instead of the mail sender.\n"
-"When in doubt, don't trust the results of this plugin, and don't rely on "
-"this information to divorce your spouse.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
-"quarrels)."
-msgstr ""
-
-#: src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
-msgid "GeoLocation integration"
-msgstr "Integrasi GData"
-
-#: src/plugins/libravatar/libravatar.c:360
-#: src/plugins/libravatar/libravatar.c:431
-#: src/plugins/libravatar/libravatar.c:491
-#: src/plugins/libravatar/libravatar_prefs.c:546
-msgid "Libravatar"
-msgstr "Libravatar"
-
-#: src/plugins/libravatar/libravatar.c:367
-msgid "Failed to register avatar header update hook"
-msgstr "Gagal untuk registrasi kaitan pembaruan header avatar"
-
-#: src/plugins/libravatar/libravatar.c:375
-msgid "Failed to register avatar image render hook"
-msgstr "Gagal untuk registrasi kaitan render gambar avatar"
-
-#: src/plugins/libravatar/libravatar.c:380
-msgid "Failed to create avatar image cache directory"
-msgstr "Gagal untuk membuat direktori tampungan gambar avatar"
-
-#: src/plugins/libravatar/libravatar.c:389
-msgid "Failed to load missing items cache"
-msgstr "Gagal memuat tampungan item yang hilang"
-
-#: src/plugins/libravatar/libravatar.c:441
-msgid ""
-"Display libravatar profiles' images for mail messages. More\n"
-"info about libravatar at http://www.libravatar.org/. If you have\n"
-"a gravatar.com profile but not a libravatar one, those will also\n"
-"be retrieved (when redirections are allowed in plugin config).\n"
-"Plugin config page is available from main window at:\n"
-"/Configuration/Preferences/Plugins/Libravatar.\n"
-"\n"
-"This plugin uses libcurl to retrieve images, so if you're behind a\n"
-"proxy please refer to curl(1) manpage for details on 'http_proxy'\n"
-"configuration. More details about this and others on README file.\n"
-"\n"
-"Feedback to <ricardo at mones.org> is welcome.\n"
-msgstr ""
-"Menampilkan gambar profil libravatar untuk pesan surat. Info\n"
-"lebih lanjut tentang libravatar pada http://www.libravatar.org/.Jika anda "
-"memiliki profil gravatar.com akan ditampilkan juga\n"
-"(jika pengalihan diperbolehkan di konfigurasi pengaya).\n"
-"Halaman konfigurasi Pengaya tersedia pada jendela utama:\n"
-"/Konfigurasi/Preferensi/Pengaya/Libravatar.\n"
-"\n"
-"Pengaya ini menggunakan libcurl untuk mengambil gambar,\n"
-"jika anda berada di belakang proxy, silahkan cek ke halaman\n"
-"man curl(1) untuk konfigurasi detail tentang 'http_proxy'\n"
-"Lebih detail lagi dapat dilihat pada berkas README.\n"
-"\n"
-"Saran ke <ricardo at mones.org> dipersilahkan.\n"
-
-#: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
-msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">Alamat email anda:</span>"
-
-#: src/plugins/libravatar/libravatar_prefs.c:141
-#, c-format
-msgid ""
-"<span color=\"red\">Using %s in %d files, %d directories, %d others and %d "
-"errors</span>"
-msgstr ""
-
-#: src/plugins/libravatar/libravatar_prefs.c:150
-#, c-format
-msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
-
-#: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
-msgid "Clear icon cache"
-msgstr "Tampungan ikon"
-
-#: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
-msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Apakah anda yakin ingin menghapus tema ini?"
-
-#: src/plugins/libravatar/libravatar_prefs.c:178
-msgid "Not enough memory for operation"
-msgstr ""
-
-#: src/plugins/libravatar/libravatar_prefs.c:183
-#, c-format
-msgid ""
-"Icon cache successfully cleared:\n"
-"• %u missing entries removed.\n"
-"• %u files removed."
-msgstr ""
-
-#: src/plugins/libravatar/libravatar_prefs.c:188
-msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
-msgstr ""
-
-#: src/plugins/libravatar/libravatar_prefs.c:191
-#, c-format
-msgid ""
-"Errors clearing icon cache:\n"
-"• %u missing entries removed.\n"
-"• %u files removed.\n"
-"• %u files failed to be read.\n"
-"• %u files couldn't be removed."
-msgstr ""
-
-#: src/plugins/libravatar/libravatar_prefs.c:198
-msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr ""
-
-#: src/plugins/libravatar/libravatar_prefs.c:213
-msgid "_Use cached icons"
-msgstr "_Gunakan ikon di tampungan"
-
-#: src/plugins/libravatar/libravatar_prefs.c:214
-msgid ""
-"Keep icons on disk for reusing instead of making another network request"
-msgstr ""
-"Biarkan ikon pada media untuk penggunaan ulang daripada membuat permintaan "
-"lagi"
-
-#: src/plugins/libravatar/libravatar_prefs.c:229
-msgid "Cache refresh interval"
-msgstr "Interval untuk muat ulang Tampungan"
-
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1486
-#: src/prefs_matcher.c:335
-msgid "hours"
-msgstr "jam"
-
-#: src/plugins/libravatar/libravatar_prefs.c:305
-msgid "Mystery man"
-msgstr "Manusia misteri"
-
-#: src/plugins/libravatar/libravatar_prefs.c:306
-msgid "Identicon"
-msgstr "Identikon"
-
-#: src/plugins/libravatar/libravatar_prefs.c:307
-msgid "MonsterID"
-msgstr "MonsterID"
-
-#: src/plugins/libravatar/libravatar_prefs.c:308
-msgid "Wavatar"
-msgstr "Wavatar"
-
-#: src/plugins/libravatar/libravatar_prefs.c:309
-msgid "Retro"
-msgstr "Retro"
-
-#: src/plugins/libravatar/libravatar_prefs.c:310
-msgid "Custom URL"
-msgstr "URL bebas"
-
-#: src/plugins/libravatar/libravatar_prefs.c:313
-msgid "A blank image"
-msgstr "Gambar kosong"
-
-#: src/plugins/libravatar/libravatar_prefs.c:314
-msgid "The unobtrusive low-contrast greyish silhouette"
-msgstr "Siluet abu-abu berkontras rendah"
-
-#: src/plugins/libravatar/libravatar_prefs.c:315
-msgid "A generated geometric pattern"
-msgstr "Tampilan pola geometrik"
-
-#: src/plugins/libravatar/libravatar_prefs.c:316
-msgid "A generated full-body monster"
-msgstr "Tampilan monster full-body"
-
-#: src/plugins/libravatar/libravatar_prefs.c:317
-msgid "A generated almost unique face"
-msgstr "Tampilan wajah yang hampir unik"
-
-#: src/plugins/libravatar/libravatar_prefs.c:318
-msgid "A generated 8-bit arcade-style pixelated image"
-msgstr "Gambar pixel 8-bit bergaya arcade"
-
-#: src/plugins/libravatar/libravatar_prefs.c:319
-msgid "Redirect to a user provided URL"
-msgstr "pergi ke URL yang disediakan pengguna"
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1090
+msgid "Server information"
+msgstr "Informasi server"
 
-#: src/plugins/libravatar/libravatar_prefs.c:333
-msgid ""
-"Enter the URL you want to be redirected when no user icon is available. "
-"Leave an empty URL to use the default libravatar orange icon."
+#: src/plugins/managesieve/sieve_prefs.c:165
+#, fuzzy
+msgid "Server name"
+msgstr "Nama Server :"
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Connect to this host instead of the host used for receiving mail"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:382
-msgid "_Allow redirects to other sites"
-msgstr "_Perbolehkan pengalihan ke situs lainnya"
+#: src/plugins/managesieve/sieve_prefs.c:178
+#, fuzzy
+msgid "Server port"
+msgstr "Server"
 
-#: src/plugins/libravatar/libravatar_prefs.c:383
-msgid ""
-"Follow redirect responses received from libravatar server to other avatar "
-"services like gravatar.com"
+#: src/plugins/managesieve/sieve_prefs.c:185
+msgid "Connect to this port instead of the default"
 msgstr ""
-"Mengikuti respon yang dialihkan yang diterima dari server libravatar ke "
-"layanan avatar lainnya seperti gravatar.com"
 
-#: src/plugins/libravatar/libravatar_prefs.c:392
-msgid "_Enable federated servers"
-msgstr "_Aktifkan penggabungan server"
+#: src/plugins/managesieve/sieve_prefs.c:189
+#, fuzzy
+msgid "Encryption"
+msgstr "_Enkripsi"
 
-#: src/plugins/libravatar/libravatar_prefs.c:393
-msgid "Try to get avatar from sender's domain libravatar server"
-msgstr "Mencoba untuk mengambil avatar dari domain pengirim server libravatar"
+#: src/plugins/managesieve/sieve_prefs.c:194
+msgid "No TLS"
+msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/managesieve/sieve_prefs.c:196
 #, fuzzy
-msgid "Request timeout"
-msgstr "Waktu sesi habis\n"
-
-#: src/plugins/libravatar/libravatar_prefs.c:410
-#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
-#: src/prefs_summaries.c:496
-msgid "seconds"
-msgstr "detik"
+msgid "Use TLS when available"
+msgstr "tidak tersedia"
 
-#: src/plugins/libravatar/libravatar_prefs.c:411
-msgid ""
-"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
-"than global socket I/O timeout."
+#: src/plugins/managesieve/sieve_prefs.c:198
+msgid "Require TLS"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:455
-msgid "Icon cache"
-msgstr "Tampungan ikon"
+#: src/plugins/managesieve/sieve_prefs.c:206
+#: src/plugins/rssyl/rssyl_feed_props.c:264
+#, fuzzy
+msgid "No authentication"
+msgstr "Gunakan otentifikasi"
 
-#: src/plugins/libravatar/libravatar_prefs.c:459
-msgid "Default missing icon mode"
-msgstr "mode ikon kehilangan standar"
+#: src/plugins/managesieve/sieve_prefs.c:208
+#, fuzzy
+msgid "Use same authentication as for receiving mail"
+msgstr "Gunakan program eksternal untuk menerima surat"
 
-#: src/plugins/libravatar/libravatar_prefs.c:463
-msgid "Network"
-msgstr "Jaringan"
+#: src/plugins/managesieve/sieve_prefs.c:210
+#, fuzzy
+msgid "Specify authentication"
+msgstr "Gunakan otentifikasi"
 
-#: src/plugins/mailmbox/plugin.c:58
-msgid "mailmbox folder (etPan!)"
-msgstr "direktori mailmbox (etPan!)"
+#: 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 "ID Pengguna"
 
-#: src/plugins/mailmbox/plugin.c:63
-msgid "This is a plugin to handle mailboxes in mbox format."
-msgstr "Ini adalah pengaya untuk menangani kotaksurat dalam format mbox."
+#: 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 "Sandi"
 
-#: src/plugins/mailmbox/plugin.c:84
-msgid "MBOX"
-msgstr "MBOX"
+#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
+#: src/prefs_account.c:1770
+msgid "Authentication method"
+msgstr "Metode otentifikasi"
 
-#: src/plugins/mailmbox/plugin_gtk.c:86
-msgid "mbox (etPan!)..."
-msgstr "mbox (etPan!)..."
+#: 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 "Otomatis"
 
-#: src/plugins/mailmbox/plugin_gtk.c:190
-msgid ""
-"Input the location of mailbox.\n"
-"If the existing mailbox is specified, it will be\n"
-"scanned automatically."
+#: src/plugins/managesieve/sieve_prefs.c:391
+msgid "Sieve server must not contain a space."
 msgstr ""
-"Masukkan lokasi kotaksurat.\n"
-"Jika lokasi kotaksurat sudah ada, secara otomatis\n"
-"akan dipindai."
 
-#: src/plugins/mailmbox/plugin_gtk.c:331
-#, c-format
-msgid ""
-"All folder(s) and message(s) under '%s' will be deleted.\n"
-"Do you really want to delete?"
+#: src/plugins/managesieve/sieve_prefs.c:397
+#, fuzzy
+msgid "Sieve server is not entered."
+msgstr "Server SMTP tidak dimasukkan."
+
+#: src/plugins/managesieve/sieve_prefs.c:425
+msgid "Sieve"
 msgstr ""
-"Semua direktori dan pesan di bawah '%s' akan dihapus.\n"
-"Anda benar-benar ingin menghapus?"
 
-#: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
+#: src/plugins/newmail/newmail.c:106 src/plugins/newmail/newmail.c:149
 msgid "NewMail"
 msgstr "SuratBaru"
 
-#: src/plugins/newmail/newmail.c:115
+#: src/plugins/newmail/newmail.c:111
 msgid "Failed to register newmail hook"
 msgstr "Gagal untuk registrasi kaitan suratbaru"
 
-#: src/plugins/newmail/newmail.c:132
+#: src/plugins/newmail/newmail.c:128
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Tidak dapat membuka berkas catatan %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:145
+#: src/plugins/newmail/newmail.c:141
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11589,7 +10893,7 @@ msgstr ""
 "\n"
 "Catatan saat ini adalah %s"
 
-#: src/plugins/newmail/newmail.c:179
+#: src/plugins/newmail/newmail.c:175
 msgid "Log file"
 msgstr "Berkas catatan"
 
@@ -11702,7 +11006,7 @@ msgid "New Calendar message"
 msgstr "Pesan Kalender Baru"
 
 #: src/plugins/notification/notification_popup.c:340
-#: src/plugins/notification/notification_trayicon.c:872
+#: src/plugins/notification/notification_trayicon.c:905
 msgid "A new calendar message arrived"
 msgstr "Sebuah pesan kalender baru diterima"
 
@@ -11711,7 +11015,7 @@ msgid "New RSS feed article"
 msgstr "Artikel baru feed RSS"
 
 #: src/plugins/notification/notification_popup.c:344
-#: src/plugins/notification/notification_trayicon.c:875
+#: src/plugins/notification/notification_trayicon.c:908
 msgid "A new article in a RSS feed arrived"
 msgstr "Sebuah artikel baru pada feed RSS diterima"
 
@@ -11724,7 +11028,7 @@ msgid "Unknown message type arrived"
 msgstr "Tipe pesan tidak diketahui telah diterima"
 
 #: src/plugins/notification/notification_popup.c:381
-#: src/plugins/notification/notification_trayicon.c:644
+#: src/plugins/notification/notification_trayicon.c:677
 msgid "Present main window"
 msgstr "Tampilkan jendela utama"
 
@@ -11749,7 +11053,7 @@ msgid "Calendar message"
 msgstr "Pesan Kalender"
 
 #: src/plugins/notification/notification_popup.c:504
-#: src/plugins/notification/notification_trayicon.c:909
+#: src/plugins/notification/notification_trayicon.c:942
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -11767,7 +11071,7 @@ msgid_plural "%d new articles in a RSS feed arrived"
 msgstr[0] "%d artikel baru pada feed RSS diterima"
 msgstr[1] "%d artikel baru pada feed RSS diterima"
 
-#: src/plugins/notification/notification_popup.c:572
+#: src/plugins/notification/notification_popup.c:574
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -11787,7 +11091,7 @@ msgid "Popup"
 msgstr "Popup"
 
 #: 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 "Perintah"
 
@@ -11803,14 +11107,6 @@ msgstr "SysTrayicon"
 msgid "Indicator"
 msgstr "Indikator"
 
-#: src/plugins/notification/notification_prefs.c:581
-msgid ""
-"\n"
-"Notification Plugin: Failed to write plugin configuration to file\n"
-msgstr ""
-"\n"
-"Pengaya Pemberitahuan: Gagal menulis konfigurasi pengaya ke berkas\n"
-
 #: src/plugins/notification/notification_prefs.c:608
 msgid "Include folder types"
 msgstr "Sertakan tipe direktori"
@@ -11860,13 +11156,13 @@ msgid "Show banner"
 msgstr "Tampilkan banner"
 
 #: src/plugins/notification/notification_prefs.c:767
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:183 src/prefs_summaries.c:462
+#: 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 "Tidak pernah"
 
-#: src/plugins/notification/notification_prefs.c:769 src/prefs_receive.c:181
-#: src/prefs_summaries.c:444 src/prefs_summaries.c:463
+#: 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 "Selalu"
 
@@ -11897,8 +11193,7 @@ msgstr "Kecepatan banner"
 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 "piksel"
 
@@ -11970,8 +11265,9 @@ msgstr "Waktuhabis popup:"
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
-msgid "second(s)"
+#: 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 "detik"
 
 #: src/plugins/notification/notification_prefs.c:1102
@@ -12086,193 +11382,204 @@ msgstr "<alt>N"
 msgid "Toggle minimize"
 msgstr "Tombol minimasi:"
 
-#: src/plugins/notification/notification_trayicon.c:114
+#: src/plugins/notification/notification_trayicon.c:121
 msgid "_Get Mail"
 msgstr "_Ambil Surat"
 
-#: src/plugins/notification/notification_trayicon.c:116
+#: src/plugins/notification/notification_trayicon.c:122
+#, fuzzy
+msgid "_Get Mail from account"
+msgstr "E_mail dari akun"
+
+#: src/plugins/notification/notification_trayicon.c:124
 msgid "_Email"
 msgstr "_Email"
 
-#: src/plugins/notification/notification_trayicon.c:117
+#: src/plugins/notification/notification_trayicon.c:125
 msgid "E_mail from account"
 msgstr "E_mail dari akun"
 
-#: src/plugins/notification/notification_trayicon.c:118
+#: src/plugins/notification/notification_trayicon.c:126
 msgid "Open A_ddressbook"
 msgstr "Buka _buku alamat"
 
-#: src/plugins/notification/notification_trayicon.c:119
+#: src/plugins/notification/notification_trayicon.c:127
 msgid "E_xit Claws Mail"
 msgstr "Keluar Cla_ws Mail"
 
-#: src/plugins/notification/notification_trayicon.c:124
+#: src/plugins/notification/notification_trayicon.c:132
 msgid "_Work Offline"
 msgstr "_Bekerja offline"
 
-#: src/plugins/notification/notification_trayicon.c:126
+#: src/plugins/notification/notification_trayicon.c:134
 msgid "Show Trayicon Notifications"
 msgstr "Perlihatkan Pemberitahuan Trayicon"
 
-#: src/plugins/notification/notification_trayicon.c:269
+#: src/plugins/notification/notification_trayicon.c:277
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Baru %d, Belum dibaca: %d, Total: %d"
 
-#: src/plugins/notification/notification_trayicon.c:822
+#: src/plugins/notification/notification_trayicon.c:855
 msgid "New mail message"
 msgstr "Pesan surat baru"
 
-#: src/plugins/notification/notification_trayicon.c:824
+#: src/plugins/notification/notification_trayicon.c:857
 msgid "New news post"
 msgstr "Kiriman berita baru"
 
-#: src/plugins/notification/notification_trayicon.c:826
+#: src/plugins/notification/notification_trayicon.c:859
 msgid "New calendar message"
 msgstr "Pesan kalender baru"
 
-#: src/plugins/notification/notification_trayicon.c:828
+#: src/plugins/notification/notification_trayicon.c:861
 msgid "New article in RSS feed"
 msgstr "Artikel baru pada feed RSS"
 
-#: src/plugins/notification/notification_trayicon.c:831
+#: src/plugins/notification/notification_trayicon.c:864
 msgid "New messages arrived"
 msgstr "Pesan baru diterima"
 
-#: src/plugins/notification/notification_trayicon.c:887
+#: src/plugins/notification/notification_trayicon.c:920
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] "%d pesan surat baru diterima"
 msgstr[1] "%d pesan surat baru diterima"
 
-#: src/plugins/notification/notification_trayicon.c:898
+#: src/plugins/notification/notification_trayicon.c:931
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] "%d kiriman berita baru diterima"
 msgstr[1] "%d kiriman berita baru diterima"
 
-#: src/plugins/notification/notification_trayicon.c:920
+#: 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"
 msgstr[0] "%d artikel baru pada feed RSS diterima"
 msgstr[1] "%d artikel baru pada feed RSS diterima"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/plugins/pdf_viewer/poppler_viewer.c:702
 msgid "Title:"
 msgstr "Judul:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Author:"
 msgstr "Pengarang:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Creator:"
 msgstr "Pencipta:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Producer:"
 msgstr "Pembuat:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:710
 msgid "Created:"
 msgstr "Dibuat:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:713
+#: src/plugins/pdf_viewer/poppler_viewer.c:714
 msgid "Modified:"
 msgstr "Diubah:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:717
 msgid "Format:"
 msgstr "Format:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:718
-#: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:719
+#: src/plugins/pdf_viewer/poppler_viewer.c:722
 msgid "Optimized:"
 msgstr "Dioptimasi:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1179
+#: src/plugins/pdf_viewer/poppler_viewer.c:1180
 msgid "PDF properties"
 msgstr "Properti PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1276
-msgid "Loading..."
-msgstr "Memuat..."
+#: src/plugins/pdf_viewer/poppler_viewer.c:1326
+#, fuzzy
+msgid "Enter password"
+msgstr "Masukkan sandi"
+
+#: 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:1335
+#: src/plugins/pdf_viewer/poppler_viewer.c:1342
 #, c-format
 msgid "%s Document"
 msgstr "%s Dokumen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1341
+#: src/plugins/pdf_viewer/poppler_viewer.c:1348
 #, c-format
 msgid "of %d"
 msgstr "dari %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1358
+#: src/plugins/pdf_viewer/poppler_viewer.c:1364
 msgid "PDF rendering failed for an unknown reason."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1721
-#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+#: src/plugins/pdf_viewer/poppler_viewer.c:1728
+#: src/plugins/pdf_viewer/poppler_viewer.c:1945
 msgid "Document Index"
 msgstr "Indeks Dokumen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1907
+#: src/plugins/pdf_viewer/poppler_viewer.c:1913
 msgid "First Page"
 msgstr "Halaman Pertama"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1910
+#: src/plugins/pdf_viewer/poppler_viewer.c:1916
 msgid "Previous Page"
 msgstr "Halaman Sebelum"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1913
+#: src/plugins/pdf_viewer/poppler_viewer.c:1919
 msgid "Next Page"
 msgstr "Halaman Berikut"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1922
 msgid "Last Page"
 msgstr "Halaman Terakhir"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom In"
 msgstr "Perbesar"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1927
 msgid "Zoom Out"
 msgstr "Perkecil"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1930
 msgid "Fit Page"
 msgstr "Muat Sehalaman"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1933
 msgid "Fit Page Width"
 msgstr "Selebar Halaman"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1936
 msgid "Rotate Left"
 msgstr "Putar Kiri"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1933
+#: src/plugins/pdf_viewer/poppler_viewer.c:1939
 msgid "Rotate Right"
 msgstr "Putar Kanan"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1942
 msgid "Document Info"
 msgstr "Info Dokumen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1941
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Page Number"
 msgstr "Nomor Halaman"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1943
+#: src/plugins/pdf_viewer/poppler_viewer.c:1949
 msgid "Zoom Factor"
 msgstr "Faktor Perbesaran"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2048
+#: src/plugins/pdf_viewer/poppler_viewer.c:2054
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -12285,13 +11592,13 @@ msgstr ""
 "\n"
 "Saran dan masukan silahkan hubungi: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2054
-#: src/plugins/pdf_viewer/poppler_viewer.c:2062
-#: src/plugins/pdf_viewer/poppler_viewer.c:2082
+#: 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 "Penampil PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2058
+#: src/plugins/pdf_viewer/poppler_viewer.c:2064
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12311,25 +11618,21 @@ msgstr ""
 msgid "Edit perl filter rules (ext)..."
 msgstr ""
 
-#: src/plugins/pgpcore/autocompletion.c:125
+#: src/plugins/pgpcore/autocompletion.c:133
 msgid "Failed to register PGP address autocompletion hook"
 msgstr "Gagal untuk registrasi kaitan pelengkap alamat PGP otomatis"
 
-#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:116
+#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:127
 msgid "Passphrase"
 msgstr "Frasakunci"
 
-#: src/plugins/pgpcore/passphrase.c:249
+#: src/plugins/pgpcore/passphrase.c:248
 msgid "[no user id]"
 msgstr "[Tidak ada id pengguna]"
 
 #: src/plugins/pgpcore/passphrase.c:260
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
-"new key:</span>\n"
-"\n"
-"%.*s\n"
+#, fuzzy
+msgid "Please enter the passphrase for the new key:"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">%sMasukkan frasakunci untuk kunci baru:"
 "</span>\n"
@@ -12340,40 +11643,29 @@ msgstr ""
 msgid "Passphrases did not match.\n"
 msgstr "Frasakunci tidak cocok.\n"
 
-#: src/plugins/pgpcore/passphrase.c:266
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
-"new key:</span>\n"
-"\n"
-"%.*s\n"
+#: src/plugins/pgpcore/passphrase.c:267
+#, fuzzy
+msgid "Please re-enter the passphrase for the new key:"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Masukkan kembali frasakunci untuk "
 "kunci baru:</span>\n"
 "\n"
 "%.*s\n"
 
-#: src/plugins/pgpcore/passphrase.c:270
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-"span>\n"
-"\n"
-"%.*s\n"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sMasukkan frasakunci untuk:</span>\n"
-"\n"
-"%.*s\n"
+#: src/plugins/pgpcore/passphrase.c:272
+#, fuzzy
+msgid "Please enter the passphrase for:"
+msgstr "Silahkan masukkan nama kotaksurat."
 
-#: src/plugins/pgpcore/passphrase.c:273
+#: src/plugins/pgpcore/passphrase.c:275
 msgid "Bad passphrase.\n"
 msgstr "Frasakunci buruk.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:121
+#: src/plugins/pgpcore/pgp_viewer.c:173
 msgid "Key import"
 msgstr "Kunci impor"
 
-#: 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?"
@@ -12381,7 +11673,7 @@ msgstr ""
 "Kunci ini tidak pada Lingkarkunci anda. Apakah anda menginginkan Claws Mail "
 "untuk mencoba dan mengimpornya dari serverkunci?"
 
-#: 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 "
@@ -12389,15 +11681,15 @@ msgstr ""
 "\n"
 " ID Kunci"
 
-#: 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 "   Kunci ini tidak ada dalam lingkarkunci anda.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:133
+#: src/plugins/pgpcore/pgp_viewer.c:185
 msgid "   It should be possible to import it "
 msgstr "   Seharusnya memungkinkan untuk diimpor "
 
-#: src/plugins/pgpcore/pgp_viewer.c:135
+#: src/plugins/pgpcore/pgp_viewer.c:187
 msgid ""
 "when working online,\n"
 "   or "
@@ -12405,7 +11697,7 @@ msgstr ""
 "ketika bekerja secara online,\n"
 "   atau "
 
-#: src/plugins/pgpcore/pgp_viewer.c:136
+#: src/plugins/pgpcore/pgp_viewer.c:188
 msgid ""
 "with the following command: \n"
 "\n"
@@ -12415,7 +11707,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:143
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid ""
 "\n"
 "  Importing key ID "
@@ -12423,19 +11715,19 @@ msgstr ""
 "\n"
 "  Mengimpor ID kunci "
 
-#: 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 "   Kunci ini telah diimpor ke lingkarkunci anda.\n"
 
-#: 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 "   Kunci ini tidak dapat diimpor ke lingkarkunci anda.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:189
+#: src/plugins/pgpcore/pgp_viewer.c:271
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Server kunci terkadang lambat.\n"
 
-#: 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"
@@ -12445,11 +11737,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:195
-msgid "   Key import isn't implemented in Windows.\n"
-msgstr "   Impor kunci tidak diimplementasikan di Windows.\n"
-
-#: src/plugins/pgpcore/pgp_viewer.c:204
+#: src/plugins/pgpcore/pgp_viewer.c:282
 msgid "   This key is in your keyring.\n"
 msgstr "   Kunci ini ada dalam lingkarkunci anda.\n"
 
@@ -12483,140 +11771,156 @@ msgstr ""
 msgid "Core operations"
 msgstr "Operasi inti"
 
-#: src/plugins/pgpcore/prefs_gpg.c:111
+#: src/plugins/pgpcore/prefs_gpg.c:122
 msgid "Automatically check signatures"
 msgstr "Periksa tandatangan secara otomatis"
 
-#: src/plugins/pgpcore/prefs_gpg.c:114
+#: src/plugins/pgpcore/prefs_gpg.c:125
 msgid "Use keyring for address autocompletion"
 msgstr "Gunakan lingkarkunci untuk pelengkap alamat"
 
-#: src/plugins/pgpcore/prefs_gpg.c:119
+#: src/plugins/pgpcore/prefs_gpg.c:130
 msgid "Use gpg-agent to manage passwords"
 msgstr "Menggunakan gpg-agent untuk mengelola sandi"
 
-#: src/plugins/pgpcore/prefs_gpg.c:124
+#: src/plugins/pgpcore/prefs_gpg.c:135
 msgid "Store passphrase in memory"
 msgstr "Letakkan frasakunci pada memori"
 
-#: src/plugins/pgpcore/prefs_gpg.c:134
+#: src/plugins/pgpcore/prefs_gpg.c:145
 msgid "Expire after"
 msgstr "Kadaluarsa setelah"
 
-#: src/plugins/pgpcore/prefs_gpg.c:149
+#: src/plugins/pgpcore/prefs_gpg.c:159
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Atur ke '0' akan meletakkan frasakunci untuk seluruh sesi"
 
-#: src/plugins/pgpcore/prefs_gpg.c:153 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 "menit"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/pgpcore/prefs_gpg.c:173
 msgid "Grab input while entering a passphrase"
 msgstr "Tangkap masukan ketika memberikan frasakunci"
 
-#: src/plugins/pgpcore/prefs_gpg.c:170
+#: src/plugins/pgpcore/prefs_gpg.c:180
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Tampilkan peringatan pada saat memulai, jika GnuPG tidak bekerja"
 
-#: src/plugins/pgpcore/prefs_gpg.c:308
+#: src/plugins/pgpcore/prefs_gpg.c:183
+#, fuzzy
+msgid "Path to GnuPG executable"
+msgstr "Jalur ke aplikasi bsfilter"
+
+#: src/plugins/pgpcore/prefs_gpg.c:188
+msgid ""
+"If left blank the location of the GnuPG executable will be automatically "
+"determined."
+msgstr ""
+
+#: src/plugins/pgpcore/prefs_gpg.c:229
+msgid "Select GnuPG executable"
+msgstr ""
+
+#: src/plugins/pgpcore/prefs_gpg.c:356
 msgid "Sign key"
 msgstr "Kunci sign"
 
-#: src/plugins/pgpcore/prefs_gpg.c:316
+#: src/plugins/pgpcore/prefs_gpg.c:364
 msgid "Use default GnuPG key"
 msgstr "Gunakan kunci GnuPG standar"
 
-#: src/plugins/pgpcore/prefs_gpg.c:327
+#: src/plugins/pgpcore/prefs_gpg.c:375
 msgid "Select key by your email address"
 msgstr "Pilih kunci dengan alamat email anda"
 
-#: src/plugins/pgpcore/prefs_gpg.c:338
+#: src/plugins/pgpcore/prefs_gpg.c:386
 msgid "Specify key manually"
 msgstr "Tentukan kunci secara manual"
 
-#: src/plugins/pgpcore/prefs_gpg.c:348
+#: src/plugins/pgpcore/prefs_gpg.c:396
 msgid "User or key ID:"
 msgstr "ID kunci atau Pengguna:"
 
-#: src/plugins/pgpcore/prefs_gpg.c:389
+#: src/plugins/pgpcore/prefs_gpg.c:437
 msgid "No secret key found."
 msgstr "Tidak ada kunci rahasia yang ditemukan."
 
-#: src/plugins/pgpcore/prefs_gpg.c:392
+#: src/plugins/pgpcore/prefs_gpg.c:440
 msgid "Generate a new key pair"
 msgstr "Hasilkan pasangan kunci baru"
 
-#: src/plugins/pgpcore/prefs_gpg.c:570
+#: src/plugins/pgpcore/prefs_gpg.c:618
 msgid "GPG"
 msgstr "GPG"
 
-#: 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 "Tidak ada yang cocok untuk '%s'; silahkan pilih kunci."
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:97
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Mengumpulkan info untuk '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:145
 msgid "Undefined"
 msgstr "Tidak terdefinisi"
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:146
-#: src/plugins/pgpcore/sgpgme.c:162
+#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:149
+#: src/plugins/pgpcore/sgpgme.c:165
 msgid "Marginal"
 msgstr "Marjinal"
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:150
-#: src/plugins/pgpcore/sgpgme.c:166
+#: src/plugins/pgpcore/select-keys.c:246 src/plugins/pgpcore/sgpgme.c:153
+#: src/plugins/pgpcore/sgpgme.c:169
 msgid "Ultimate"
 msgstr "Ultimate"
 
-#: src/plugins/pgpcore/select-keys.c:368
+#: src/plugins/pgpcore/select-keys.c:367
 msgid "Select Keys"
 msgstr "Pilih kunci"
 
-#: src/plugins/pgpcore/select-keys.c:395
+#: src/plugins/pgpcore/select-keys.c:394
 msgid "Key ID"
 msgstr "ID Kunci"
 
-#: src/plugins/pgpcore/select-keys.c:398
+#: src/plugins/pgpcore/select-keys.c:397
 msgid "Trust"
 msgstr "Percaya"
 
-#: src/plugins/pgpcore/select-keys.c:423
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "_Other"
 msgstr "_Lainnya"
 
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:423
 msgid "Do_n't encrypt"
 msgstr "Janga_n enkripsi"
 
-#: src/plugins/pgpcore/select-keys.c:583
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Add key"
 msgstr "Tambah kunci"
 
-#: src/plugins/pgpcore/select-keys.c:584
+#: src/plugins/pgpcore/select-keys.c:583
 msgid "Enter another user or key ID:"
 msgstr "Masukkan ID kunci atau pengguna lain:"
 
-#: src/plugins/pgpcore/select-keys.c:606
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Enkrip ke %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:607
-#, c-format
+#: src/plugins/pgpcore/select-keys.c:606
+#, fuzzy, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
 "If you choose to encrypt the message with this key, you don't\n"
 "know for sure that it will go to the person you mean it to.\n"
 "\n"
-"Key details: ID %s, primary identity %s <%s>\n"
+"Key details: ID %s, primary identity %s <%s>\n"
 "\n"
 "Do you trust this key enough to use it anyway?"
 msgstr ""
@@ -12629,178 +11933,182 @@ msgstr ""
 "\n"
 "Apakah anda cukup yakin untuk tetap menggunakan kunci ini?"
 
-#: src/plugins/pgpcore/sgpgme.c:80 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 "Tidak ada tandatangan yang ditemukan"
 
-#: src/plugins/pgpcore/sgpgme.c:160
+#: src/plugins/pgpcore/sgpgme.c:163
 msgid "Untrusted"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:219
+#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Tandatangan tidak dapat diperiksa - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:204 src/plugins/pgpcore/sgpgme.c:208
+#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
 msgid "The signature has not been checked."
 msgstr "Tandatangan belum pernah diperiksa."
 
-#: src/plugins/pgpcore/sgpgme.c:214 src/plugins/pgpcore/sgpgme.c:216
+#: src/plugins/pgpcore/sgpgme.c:251
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 "PGP Core: Tidak dapat mengambil kunci - tidak ada gpg-agent yang berjalan."
 
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:269
 #, fuzzy, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Tandatangan yang baik dari %s."
 
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:272
 #, fuzzy, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Tandatangan yang baik dari %s."
 
-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:275
 #, fuzzy, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Tandatangan yang baik dari %s."
 
-#: src/plugins/pgpcore/sgpgme.c:243
+#: src/plugins/pgpcore/sgpgme.c:282
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Tandatangan yang baik dari %s."
 
-#: src/plugins/pgpcore/sgpgme.c:248
+#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:305
+#, fuzzy, c-format
+msgid "Key 0x%s not available to verify this signature"
+msgstr "Kunci 0x%s tidak tersedia untuk verifikasi tandatangan ini."
+
+#: src/plugins/pgpcore/sgpgme.c:292
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Tandatangan kadaluarsa dari %s."
 
-#: src/plugins/pgpcore/sgpgme.c:251
+#: src/plugins/pgpcore/sgpgme.c:295
 #, fuzzy, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Tandatangan yang baik dari %s."
 
-#: src/plugins/pgpcore/sgpgme.c:254
+#: src/plugins/pgpcore/sgpgme.c:298
 #, fuzzy, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Tandatangan yang baik dari %s."
 
-#: src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:301
 #, fuzzy, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Tandatangan buruk dari %s."
 
-#: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Kunci 0x%s tidak tersedia untuk verifikasi tandatangan ini."
-
-#: src/plugins/pgpcore/sgpgme.c:266
+#: src/plugins/pgpcore/sgpgme.c:310
 #, fuzzy
 msgid "The signature has not been checked"
 msgstr "Tandatangan belum pernah diperiksa."
 
-#: src/plugins/pgpcore/sgpgme.c:285
+#: src/plugins/pgpcore/sgpgme.c:329
 msgid "Error checking signature: no status\n"
 msgstr "Kesalahan memeriksa tandatangan: tidak ada status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:303
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Kesalahan memeriksa tandatangan: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:321
+#: src/plugins/pgpcore/sgpgme.c:365
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Tandatangan dibuat pada %s menggunakan %s ID kunci %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:327
+#: src/plugins/pgpcore/sgpgme.c:371
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Tandatangan yang baik dari uid \"%s\" (Keabsahan: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:332
+#: src/plugins/pgpcore/sgpgme.c:376
 #, fuzzy, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Kunci kadaluarsa dari %s."
 
-#: src/plugins/pgpcore/sgpgme.c:337
+#: src/plugins/pgpcore/sgpgme.c:381
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Tandatangan kadaluarsa dari uid \"%s\" (Keabsahan: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:342
+#: src/plugins/pgpcore/sgpgme.c:386
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:391
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Tandatangan buruk dari \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:358
-#, c-format
-msgid "                    uid \"%s\" (Validity: %s)\n"
-msgstr "                    uid \"%s\" (Keabsahan: %s)\n"
+#: src/plugins/pgpcore/sgpgme.c:404
+#, fuzzy, c-format
+msgid "uid \"%s\" (Validity: %s)\n"
+msgstr "Tandatangan yang baik dari uid \"%s\" (Keabsahan: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:360
+#: src/plugins/pgpcore/sgpgme.c:406
 msgid "Revoked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:364
+#: src/plugins/pgpcore/sgpgme.c:411
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:367
+#: src/plugins/pgpcore/sgpgme.c:412
+msgid "No key!"
+msgstr ""
+
+#: src/plugins/pgpcore/sgpgme.c:414
 msgid "Primary key fingerprint:"
 msgstr "Sidikjari kunci utama:"
 
-#: src/plugins/pgpcore/sgpgme.c:385
+#: src/plugins/pgpcore/sgpgme.c:432
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "PERINGATAN: Alamat penandatangan \"%s\" tidak cocok dengan entri DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:391
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Alamat penandatangan terverifikasi adalah \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:425
+#: src/plugins/pgpcore/sgpgme.c:472
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Tidak dapat mengambil data dari pesan, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:441
+#: src/plugins/pgpcore/sgpgme.c:488
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Tidak dapat menginisialisasi data, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:596
+#: src/plugins/pgpcore/sgpgme.c:643
 msgid "Secret key specification is ambiguous"
 msgstr "Spesifikasi kunci rahasia is ambiguous"
 
-#: src/plugins/pgpcore/sgpgme.c:606
+#: src/plugins/pgpcore/sgpgme.c:653
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Kunci rahasia tidak ditemukan (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:666
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Kesalahan mengatur kunci rahasia: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:703
+#: src/plugins/pgpcore/sgpgme.c:759
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Protokol gpgme '%s' tidak dapat digunakan: Mesin '%s' tidak terpasang dengan "
 "baik."
 
-#: src/plugins/pgpcore/sgpgme.c:709
+#: src/plugins/pgpcore/sgpgme.c:765
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12809,12 +12117,12 @@ msgstr ""
 "Protokol gpgme '%s' tidak dapat digunakan: Mesin '%s' versi %s telah "
 "terpasang, namun versi %s dibutuhkan.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:717
+#: src/plugins/pgpcore/sgpgme.c:773
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Protokol gpgme '%s' tidak dapat digunakan (masalah tidak diketahui)"
 
-#: src/plugins/pgpcore/sgpgme.c:733
+#: src/plugins/pgpcore/sgpgme.c:789
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12822,7 +12130,7 @@ msgstr ""
 "GnuPG tidak terpasang dengan benar, atau perlu ditingkatkan.\n"
 "Dukungan OpenPGP dinonaktifkan."
 
-#: src/plugins/pgpcore/sgpgme.c:767
+#: 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"
@@ -12830,11 +12138,11 @@ msgstr ""
 "Anda harus menyimpan informasi akun dengan \"OK\" sebelum dapat menghasilkan "
 "sebuah pasangan kunci.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:772
+#: src/plugins/pgpcore/sgpgme.c:871
 msgid "No PGP key found"
 msgstr "Tidak ada kunci PGP yang ditemukan"
 
-#: src/plugins/pgpcore/sgpgme.c:773
+#: 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"
@@ -12844,12 +12152,12 @@ msgstr ""
 "menandatangani email atau menerima email terenkripsi.\n"
 "Apakah anda ingin membuat pasangan kunci baru sekarang?"
 
-#: src/plugins/pgpcore/sgpgme.c:843 src/plugins/pgpcore/sgpgme.c:859
+#: src/plugins/pgpcore/sgpgme.c:961 src/plugins/pgpcore/sgpgme.c:983
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Tidak dapat menghasilkan pasangan kunci baru: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:850
+#: src/plugins/pgpcore/sgpgme.c:971
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12857,12 +12165,12 @@ msgstr ""
 "Membuat pasangan kunci baru anda... Gerakkan tetikus untuk membantu "
 "menghasikan entropi..."
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:989
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr ""
 "Tidak dapat menghasilkan pasangan kunci baru: kesalahan tidak diketahui"
 
-#: src/plugins/pgpcore/sgpgme.c:869
+#: src/plugins/pgpcore/sgpgme.c:993
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12875,66 +12183,62 @@ msgstr ""
 "\n"
 "Apakah anda ingin mengekspornya ke serverkunci?"
 
-#: src/plugins/pgpcore/sgpgme.c:873
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid "Key generated"
 msgstr "Kunci telah dihasilkan"
 
-#: src/plugins/pgpcore/sgpgme.c:912
+#: src/plugins/pgpcore/sgpgme.c:1073
 msgid "Key exported."
 msgstr "Kunci telah diekspor."
 
-#: src/plugins/pgpcore/sgpgme.c:914
+#: src/plugins/pgpcore/sgpgme.c:1075
 msgid "Couldn't export key."
 msgstr "Tidak dapat mengekspor kunci."
 
-#: src/plugins/pgpcore/sgpgme.c:918
-msgid "Key export isn't implemented in Windows."
-msgstr "Ekspor kunci tidak diimplementasikan di Windows."
-
-#: src/plugins/pgpinline/pgpinline.c:157
+#: src/plugins/pgpinline/pgpinline.c:155
 msgid "Incorrect part"
 msgstr "Bagian yang salah"
 
-#: src/plugins/pgpinline/pgpinline.c:161
+#: src/plugins/pgpinline/pgpinline.c:159
 msgid "Not a text part"
 msgstr "Bukan bagian teks"
 
-#: src/plugins/pgpinline/pgpinline.c:172 src/plugins/pgpinline/pgpinline.c:324
+#: src/plugins/pgpinline/pgpinline.c:170 src/plugins/pgpinline/pgpinline.c:322
 msgid "Couldn't get text data."
 msgstr "Tidak dapat mengambil data teks."
 
-#: src/plugins/pgpinline/pgpinline.c:190
+#: src/plugins/pgpinline/pgpinline.c:188
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Tidak dapat mengkonversi data teks ke any sane charset."
 
-#: src/plugins/pgpinline/pgpinline.c:198 src/plugins/pgpinline/pgpinline.c:520
-#: src/plugins/pgpinline/pgpinline.c:659 src/plugins/pgpinline/pgpinline.c:715
-#: src/plugins/pgpmime/pgpmime.c:74 src/plugins/pgpmime/pgpmime.c:184
-#: src/plugins/pgpmime/pgpmime.c:330 src/plugins/pgpmime/pgpmime.c:510
-#: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:415
+#: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
+#: 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:413
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Tidak dapat menginisialisasi konteks GPG, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:317
+#: src/plugins/pgpinline/pgpinline.c:315
 msgid "Couldn't parse mime part."
 msgstr "Tidak dapat parse bagian mime."
 
-#: src/plugins/pgpinline/pgpinline.c:347 src/plugins/pgpmime/pgpmime.c:353
+#: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Tidak dapat membuka berkas terdekripsi %s"
 
-#: src/plugins/pgpinline/pgpinline.c:364 src/plugins/pgpinline/pgpinline.c:373
-#: src/plugins/pgpinline/pgpinline.c:382 src/plugins/pgpinline/pgpinline.c:390
-#: src/plugins/pgpinline/pgpinline.c:400 src/plugins/pgpinline/pgpinline.c:409
-#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
+#: src/plugins/pgpinline/pgpinline.c:362 src/plugins/pgpinline/pgpinline.c:371
+#: src/plugins/pgpinline/pgpinline.c:380 src/plugins/pgpinline/pgpinline.c:388
+#: src/plugins/pgpinline/pgpinline.c:398 src/plugins/pgpinline/pgpinline.c:407
+#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Tidak dapat menulis ke berkas terdekripsi %s"
 
-#: src/plugins/pgpinline/pgpinline.c:378 src/plugins/pgpinline/pgpinline.c:379
-#: src/plugins/pgpinline/pgpinline.c:380
+#: src/plugins/pgpinline/pgpinline.c:376 src/plugins/pgpinline/pgpinline.c:377
+#: src/plugins/pgpinline/pgpinline.c:378
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12942,51 +12246,51 @@ msgstr ""
 "\n"
 "--- Awal dari data PGP/Inline terenkripsi ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:396 src/plugins/pgpinline/pgpinline.c:397
-#: src/plugins/pgpinline/pgpinline.c:398
+#: src/plugins/pgpinline/pgpinline.c:394 src/plugins/pgpinline/pgpinline.c:395
+#: src/plugins/pgpinline/pgpinline.c:396
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Akhir dari data PGP/Inlin terenkripsi ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:417 src/plugins/pgpmime/pgpmime.c:390
+#: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Tidak dapat menutup berkas terdekripsi %s"
 
-#: src/plugins/pgpinline/pgpinline.c:429
+#: src/plugins/pgpinline/pgpinline.c:427
 msgid "Couldn't scan decrypted file."
 msgstr "Tidak dapat memindai berkas terdekripsi."
 
-#: src/plugins/pgpinline/pgpinline.c:437
+#: src/plugins/pgpinline/pgpinline.c:435
 msgid "Couldn't scan decrypted file parts."
 msgstr "Tidak dapat memindai bagian berkas terdekripsi."
 
-#: src/plugins/pgpinline/pgpinline.c:494 src/plugins/pgpinline/pgpinline.c:686
+#: src/plugins/pgpinline/pgpinline.c:492 src/plugins/pgpinline/pgpinline.c:684
 msgid "Malformed message"
 msgstr "Pesan yang salah format"
 
-#: src/plugins/pgpinline/pgpinline.c:505
+#: src/plugins/pgpinline/pgpinline.c:503
 msgid "Couldn't create temporary file."
 msgstr "Tidak dapat membuat berkas sementara."
 
-#: src/plugins/pgpinline/pgpinline.c:544 src/plugins/pgpmime/pgpmime.c:537
+#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:536
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Penandatanganan data gagal, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:562 src/plugins/pgpmime/pgpmime.c:562
+#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:563
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Penandatanganan data gagal karena penandatangan salah: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:571 src/plugins/pgpmime/pgpmime.c:571
+#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:572
 msgid "Data signing failed, no results."
 msgstr "Penandatanganan data gagal, tidak ada hasil."
 
-#: src/plugins/pgpinline/pgpinline.c:581 src/plugins/pgpmime/pgpmime.c:582
+#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:583
 msgid "Data signing failed, no contents."
 msgstr "Penandatanganan data gagal, tidak ada konten."
 
-#: src/plugins/pgpinline/pgpinline.c:625
+#: src/plugins/pgpinline/pgpinline.c:623
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -12994,22 +12298,22 @@ msgstr ""
 "Perhatikan bahwa lampiran tidak dienkripsi oleh sistem PGP/Inline, demikian "
 "juga kepala email, seperti subyek."
 
-#: src/plugins/pgpinline/pgpinline.c:669 src/plugins/pgpmime/pgpmime.c:661
+#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:662
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Tidak dapat menambah kunci GPG %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:697 src/plugins/pgpmime/pgpmime.c:690
+#: src/plugins/pgpinline/pgpinline.c:695 src/plugins/pgpmime/pgpmime.c:691
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Tidak dapat membuat berkas sementara, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:728 src/plugins/pgpmime/pgpmime.c:717
+#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:718
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Enkripsi gagal, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:797
+#: src/plugins/pgpinline/pgpinline.c:795
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -13042,28 +12346,28 @@ msgstr ""
 "\n"
 "GPGME adalah hakcipta 2001 oleh Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:204
+#: src/plugins/pgpmime/pgpmime.c:203
 msgid "Signature boundary not found."
 msgstr "Lingkup tandatangan tidak ditemukan."
 
-#: src/plugins/pgpmime/pgpmime.c:402 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 "Tidak dapat mem-parse berkas terdekripsi."
 
-#: src/plugins/pgpmime/pgpmime.c:408 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 "Tidak dapat mem-parse bagian berkas terdekripsi."
 
-#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
+#: src/plugins/pgpmime/pgpmime.c:455 src/plugins/pgpmime/pgpmime.c:494
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Tidak dapat membuat berkas sementara: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:595
+#: src/plugins/pgpmime/pgpmime.c:596
 msgid "OpenPGP digital signature"
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:617
+#: src/plugins/pgpmime/pgpmime.c:618
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -13071,7 +12375,7 @@ msgstr ""
 "Perhatikan bahwa kepala email, seperti Subyek, tidak dienkripsi oleh sistem "
 "PGP/Mime."
 
-#: src/plugins/pgpmime/pgpmime.c:789
+#: src/plugins/pgpmime/pgpmime.c:790
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -13112,17 +12416,18 @@ msgid "Show Python console..."
 msgstr "Tampilkan konsol Python..."
 
 #: src/plugins/python/python_plugin.c:503
+#: src/plugins/rssyl/rssyl_feed_props.c:483
 msgid "Refresh"
 msgstr "Perbaharui"
 
-#: 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:1195
-#: src/wizard.c:1610
+#: 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 "Jelajah"
 
 #: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:733
+#: src/plugins/python/python_plugin.c:735
 msgid "Python"
 msgstr "Python"
 
@@ -13130,7 +12435,7 @@ msgstr "Python"
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Gagal registrasi \"kaitan compose create\" pada pengaya Python"
 
-#: src/plugins/python/python_plugin.c:738
+#: src/plugins/python/python_plugin.c:740
 #, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
@@ -13220,7 +12525,7 @@ msgstr ""
 "\n"
 "Saran ke <berndth at gmx.de> dipersilahkan."
 
-#: src/plugins/python/python_plugin.c:789
+#: src/plugins/python/python_plugin.c:791
 msgid "Python integration"
 msgstr "Integrasi Python"
 
@@ -13280,7 +12585,7 @@ msgstr ""
 msgid "RSS feed"
 msgstr "Feed RSS"
 
-#: src/plugins/rssyl/rssyl_add_item.c:295
+#: src/plugins/rssyl/rssyl_add_item.c:296
 #, fuzzy
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
@@ -13290,42 +12595,42 @@ msgstr "(biasanya kosong)"
 msgid "Refresh all feeds"
 msgstr "Perbaharui semua feed"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:65
 msgid "Subscribe feed"
 msgstr "Mendaftar feed"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:67
+#: src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Masukkan URL dari berita feed yang ingin anda daftarkan:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:98
 #, fuzzy, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' tidak dapat dimasukkan dalam nama direktori."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:255
+#: src/plugins/rssyl/rssyl_cb_menu.c:251
 #, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail membutuhkan akses jaringan untuk memperbaharui feed."
 msgstr[1] "Claws Mail membutuhkan akses jaringan untuk memperbaharui feeds."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:318
+#: src/plugins/rssyl/rssyl_cb_menu.c:314
 #, fuzzy, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Yakin mau menghapus pohon direktori '%s'?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:319
+#: src/plugins/rssyl/rssyl_cb_menu.c:315
 #, fuzzy
 msgid "Remove feed tree"
 msgstr "Hapus pohon direktori"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:354
+#: src/plugins/rssyl/rssyl_cb_menu.c:349
 #, fuzzy
 msgid "Select an OPML file"
 msgstr "Pilih berkas .opml"
 
-#: 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
 #, fuzzy, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "Tidak dapat membuat berkas sementara untuk pengiriman berita."
@@ -13370,12 +12675,7 @@ msgstr "Tidak dapat mengekspor bebas/sibuk ke '%s'\n"
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Gunakan otentifikasi"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:274
+#: src/plugins/rssyl/rssyl_feed_props.c:270
 #, fuzzy
 msgid "HTTP Basic authentication"
 msgstr "Gunakan otentifikasi"
@@ -13403,21 +12703,20 @@ msgstr "Ambil komentar jika memungkinkan"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:339
 #, fuzzy
-msgid "Always mark as new"
+msgid "Always mark it as new"
 msgstr "Selalu ditandai sebagai belum dibaca"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:345
-#, fuzzy
-msgid "If only its text changed"
-msgstr "Hanya jika teksnya dirubah"
+msgid "Only mark it as new if its text has changed"
+msgstr ""
 
 #: src/plugins/rssyl/rssyl_feed_props.c:351
 #, fuzzy
-msgid "Never mark as new"
+msgid "Never mark it as new"
 msgstr "Jangan pernah ditandai sebagai belum dibaca"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:356
-msgid "Add item title to top of message"
+msgid "Add item title to the top of message"
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_feed_props.c:363
@@ -13432,54 +12731,59 @@ msgid ""
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_feed_props.c:372
-#: src/plugins/vcalendar/vcal_prefs.c:518
+#: src/plugins/vcalendar/vcal_prefs.c:550
 msgid "Verify SSL certificate validity"
 msgstr "Verifikasi keabsahan sertifikat SSL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:388
-msgid "<b>Source URL:</b>"
-msgstr "<b>URL Sumber:</b>"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:410
+#: src/plugins/rssyl/rssyl_feed_props.c:392
 #, fuzzy
 msgid "User name"
 msgstr "Nama pengguna:"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "Sandi"
+#: src/plugins/rssyl/rssyl_feed_props.c:405
+#, fuzzy
+msgid "Source URL"
+msgstr "<b>URL Sumber:</b>"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:433
-msgid ""
-"<b>Fetch comments on posts aged less than:</b>\n"
-"<small>(In days; set to -1 to fetch all comments)</small>"
+#: src/plugins/rssyl/rssyl_feed_props.c:418
+#, fuzzy
+msgid "Fetch comments on posts aged less than"
+msgstr "Ambil komentar jika memungkinkan"
+
+#: 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 "hari"
+
+#: src/plugins/rssyl/rssyl_feed_props.c:427
+msgid "Set to -1 to fetch all comments"
 msgstr ""
-"<b>Ambil komentar untuk berita yang berumur kurang dari:</b>\n"
-"<small>(dalam hari; atur jadi -1 untuk mengambil seluruh komentar)</small>"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:491
-msgid ""
-"<b>Refresh interval in minutes:</b>\n"
-"<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
+#: src/plugins/rssyl/rssyl_feed_props.c:451
+#, fuzzy
+msgid "If an item changes"
+msgstr "Hanya jika teksnya dirubah"
+
+#: src/plugins/rssyl/rssyl_feed_props.c:456
+msgid "Items"
 msgstr ""
-"<b>Jeda pembaharuan dalam menit:</b>\n"
-"<small>(Atur jadi 0 untuk menonaktifkan pembaharuan otomatis untuk feed "
-"ini)</small>"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:517
+#: src/plugins/rssyl/rssyl_feed_props.c:469
+#, fuzzy
+msgid "Refresh interval"
+msgstr "Interval untuk muat ulang Tampungan"
+
+#: src/plugins/rssyl/rssyl_feed_props.c:477
 #, fuzzy
-msgid "<b>If an item changes, do not mark it as new:</b>"
-msgstr "<b>Jika sebuah isi berubah, jangan ditandai sebagai belum dibaca:</b>"
+msgid "Set to 0 to disable automatic refreshing for this feed"
+msgstr "Atur jadi 0 untuk menonaktifkan pembaharuan otomatis"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:609
+#: src/plugins/rssyl/rssyl_feed_props.c:529
 msgid "_OK"
 msgstr "_OK"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:617
+#: src/plugins/rssyl/rssyl_feed_props.c:537
 msgid "Set feed properties"
 msgstr "Atur pengaturan feed"
 
@@ -13537,7 +12841,7 @@ msgstr ""
 "Mungkin beberapa berkas sudah ada, atau anda tidak memiliki hak menulis "
 "disana?"
 
-#: src/plugins/rssyl/rssyl.h:17
+#: src/plugins/rssyl/rssyl.h:20
 msgid "My Feeds"
 msgstr "Feed saya"
 
@@ -13584,7 +12888,7 @@ msgstr "Me_ndaftar feed baru..."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
 #, fuzzy
-msgid "<b>Feed folder:</b>"
+msgid "Feed folder:"
 msgstr "<b> pada:</b>"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
@@ -13603,17 +12907,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Memperbaharui tampungan untuk %s..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1598
+#: src/plugins/vcalendar/vcal_folder.c:1614
 msgid "401 (Authorisation required)"
 msgstr "401 (Authorisation required)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1601
+#: src/plugins/vcalendar/vcal_folder.c:1617
 msgid "403 (Unauthorised)"
 msgstr "403 (Unauthorised)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1604
+#: src/plugins/vcalendar/vcal_folder.c:1620
 msgid "404 (Not found)"
 msgstr "404 (Not found)"
 
@@ -13632,19 +12936,29 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:140
 #, c-format
 msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:224
+#: src/plugins/rssyl/rssyl_update_feed.c:152
+#, fuzzy
+msgid "Untitled feed"
+msgstr "Tidak ada judul"
+
+#: src/plugins/rssyl/rssyl_update_feed.c:154
+#, fuzzy, c-format
+msgid "RSSyl: Possibly invalid feed without title at %s.\n"
+msgstr "RSSyl: Memperbaharui feed %s\n"
+
+#: src/plugins/rssyl/rssyl_update_feed.c:231
 #, fuzzy, c-format
 msgid "Updating feed '%s'..."
 msgstr "Memuat ulang feed '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:246
+#: src/plugins/rssyl/rssyl_update_feed.c:258
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13653,7 +12967,7 @@ msgid ""
 "Please contact developers, this should not happen."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:330
+#: src/plugins/rssyl/rssyl_update_feed.c:342
 #, fuzzy
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail membutuhkan akses jaringan untuk memperbaharui feed."
@@ -13665,7 +12979,7 @@ msgid ""
 msgstr ""
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:911
+#: src/plugins/smime/smime.c:913
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -13705,20 +13019,20 @@ msgstr ""
 "\n"
 "GPGME adalah hakcipta 2001 oleh Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:423
+#: src/plugins/smime/smime.c:421
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Tidak dapat mengatur protokol GPG, %s"
 
-#: src/plugins/smime/smime.c:451
+#: src/plugins/smime/smime.c:449
 msgid "Couldn't open temporary file"
 msgstr "Tidak dapat membuka berkas sementara"
 
-#: 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 "Tidak dapat menulis ke berkas sementara"
 
-#: src/plugins/smime/smime.c:488
+#: src/plugins/smime/smime.c:486
 msgid "Couldn't close temporary file"
 msgstr "Tidak dapat menutup berkas sementara"
 
@@ -13730,21 +13044,21 @@ msgstr ""
 "Perhatikan bahwa kepala email, seperti Subyek, tidak dienkripsi oleh sistem "
 "S/Mime."
 
-#: src/plugins/spam_report/spam_report.c:293
+#: src/plugins/spam_report/spam_report.c:299
 msgid "Reporting spam..."
 msgstr "Melaporkan spam..."
 
-#: src/plugins/spam_report/spam_report.c:328
+#: src/plugins/spam_report/spam_report.c:334
 msgid "Report spam online..."
 msgstr "Laporkan spam online..."
 
-#: 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 "LaporanSpam"
 
-#: 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"
@@ -13760,24 +13074,24 @@ msgstr ""
 " * spamcop.net\n"
 " * sistem nominasi lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:407
+#: src/plugins/spam_report/spam_report.c:413
 msgid "Spam reporting"
 msgstr "Melaporkan spam"
 
-#: src/plugins/spam_report/spam_report_prefs.c:122
+#: src/plugins/spam_report/spam_report_prefs.c:137
 msgid "Enabled"
 msgstr "Diaktifkan"
 
-#: src/plugins/spam_report/spam_report_prefs.c:149
+#: src/plugins/spam_report/spam_report_prefs.c:169
 msgid "Forward to:"
 msgstr "Teruskan ke:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:165 src/wizard.c:1558
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1573
 msgid "Password:"
 msgstr "Sandi:"
 
 #: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:649
+#: src/plugins/spamassassin/spamassassin_gtk.c:648
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -13808,8 +13122,9 @@ msgstr ""
 "berjalan dan dapat diakses."
 
 #: src/plugins/spamassassin/spamassassin.c:429
+#, fuzzy
 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 ""
 "Claws Mail membutuhkan akses jaringan untuk mengumpan surat ini ke "
@@ -13848,55 +13163,55 @@ msgstr ""
 "\n"
 "Pilihan dapat ditemukan pada /Konfigurasi/Preferensi/Pengaya/SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:90
 msgid "Localhost"
 msgstr "Localhost"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:93
+#: src/plugins/spamassassin/spamassassin_gtk.c:92
 msgid "Unix Socket"
 msgstr "Unix Socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:269
+#: src/plugins/spamassassin/spamassassin_gtk.c:268
 msgid "Enable SpamAssassin plugin"
 msgstr "Aktifkan pengaya SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:273
+#: src/plugins/spamassassin/spamassassin_gtk.c:272
 msgid "Transport"
 msgstr "Transpor"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:281
+#: src/plugins/spamassassin/spamassassin_gtk.c:280
 msgid "Type of transport"
 msgstr "Tipe transpo"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:302
+#: src/plugins/spamassassin/spamassassin_gtk.c:301
 msgid "User"
 msgstr "Pengguna"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:315
+#: src/plugins/spamassassin/spamassassin_gtk.c:314
 msgid "User to use with spamd server"
 msgstr "Pengguna yang menggunakan server spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:317
+#: src/plugins/spamassassin/spamassassin_gtk.c:316
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:335
+#: src/plugins/spamassassin/spamassassin_gtk.c:334
 msgid "Hostname or IP address of spamd server"
 msgstr "Namahost atau alamat IP server spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:346
+#: src/plugins/spamassassin/spamassassin_gtk.c:345
 msgid "Port of spamd server"
 msgstr "port server spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:352
+#: src/plugins/spamassassin/spamassassin_gtk.c:351
 msgid "Path of Unix socket"
 msgstr "Lokasi Unix socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/spamassassin/spamassassin_gtk.c:386
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13976,12 +13291,6 @@ msgstr "Mulai"
 msgid "Show"
 msgstr "Perlihatkan"
 
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:560
-#: src/prefs_matcher.c:336
-msgid "days"
-msgstr "hari"
-
 #: src/plugins/vcalendar/month-view.c:109
 msgid "Monday"
 msgstr "Senin"
@@ -14058,24 +13367,24 @@ msgstr "Nopember"
 msgid "December"
 msgstr "Desember"
 
-#: src/plugins/vcalendar/month-view.c:795
+#: src/plugins/vcalendar/month-view.c:796
 msgid "Week number"
 msgstr "Nomor minggu"
 
-#: src/plugins/vcalendar/month-view.c:886
+#: src/plugins/vcalendar/month-view.c:887
 msgid "Previous month"
 msgstr "Bulan sebelum"
 
-#: src/plugins/vcalendar/month-view.c:906
+#: src/plugins/vcalendar/month-view.c:907
 msgid "Next month"
 msgstr "Bulan berikut"
 
-#: src/plugins/vcalendar/plugin.c:43 src/plugins/vcalendar/plugin.c:64
-#: src/plugins/vcalendar/vcal_prefs.c:681
+#: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
+#: src/plugins/vcalendar/vcal_prefs.c:729
 msgid "vCalendar"
 msgstr "vCalendar"
 
-#: src/plugins/vcalendar/plugin.c:69
+#: src/plugins/vcalendar/plugin.c:73
 msgid ""
 "This plugin enables vCalendar message handling like that produced by "
 "Evolution or Outlook.\n"
@@ -14106,7 +13415,7 @@ msgstr ""
 "kalender anda, publikasikan informasi kesibukan/waktu bebas anda dan "
 "mengambil informasi tersebut dari lainnya."
 
-#: src/plugins/vcalendar/plugin.c:102
+#: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -14147,7 +13456,7 @@ msgstr "Anda memiliki item yg Akandilakukan."
 
 #: src/plugins/vcalendar/vcalendar.c:483 src/plugins/vcalendar/vcalendar.c:490
 #: src/plugins/vcalendar/vcalendar.c:495 src/plugins/vcalendar/vcalendar.c:503
-#: src/plugins/vcalendar/vcalendar.c:512 src/plugins/vcalendar/vcalendar.c:750
+#: src/plugins/vcalendar/vcalendar.c:512 src/plugins/vcalendar/vcalendar.c:753
 msgid "Details follow:"
 msgstr "Detail berikut:"
 
@@ -14167,25 +13476,23 @@ msgstr "Pertemuan yang mana anda telah diundang telah dibatalkan."
 msgid "You have been forwarded an appointment."
 msgstr "Anda telah diterusi sebuah perjanjian."
 
-#: src/plugins/vcalendar/vcalendar.c:564
-#, c-format
-msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-msgstr "%s <span weight=\"bold\">(kegiatan ini rekursif)</span>"
+#: src/plugins/vcalendar/vcalendar.c:565
+msgid "(this event recurs)"
+msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:570
-#, c-format
-msgid ""
-"%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
+#: src/plugins/vcalendar/vcalendar.c:572
+#, fuzzy
+msgid "(this event is part of a recurring event)"
 msgstr ""
 "%s <span weight=\"bold\">(kegiatan ini bagian dari kegiatan yang rekursif)</"
 "span>"
 
-#: src/plugins/vcalendar/vcalendar.c:749
+#: src/plugins/vcalendar/vcalendar.c:752
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr ""
 "Anda telah menerima jawaban terhadap proposal pertemuan yang tidak diketahui."
 
-#: src/plugins/vcalendar/vcalendar.c:753
+#: src/plugins/vcalendar/vcalendar.c:756
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -14194,35 +13501,35 @@ msgstr ""
 "Anda telah menerima jawaban terhadap proposal pertemuan.\n"
 "%s telah %s undangan dengan detail sebagai berikut:"
 
-#: src/plugins/vcalendar/vcalendar.c:832
+#: src/plugins/vcalendar/vcalendar.c:835
 msgid "Error - could not get the calendar MIME part."
 msgstr "Kesalahan - tidak dapat mengambil bagian MIME kalender."
 
-#: src/plugins/vcalendar/vcalendar.c:839
+#: src/plugins/vcalendar/vcalendar.c:842
 msgid "Error - no calendar part found."
 msgstr "Kesalahan - tidak ada bagian kalender yang ditemukan."
 
-#: src/plugins/vcalendar/vcalendar.c:853
+#: src/plugins/vcalendar/vcalendar.c:856
 msgid "Error - Unknown calendar component type."
 msgstr "Kesalahan - Tipe komponen kalender tidak diketahui."
 
-#: src/plugins/vcalendar/vcalendar.c:982
+#: src/plugins/vcalendar/vcalendar.c:985
 msgid "Send a notification to the attendees"
 msgstr "Kirim pemberitahuan ke peserta"
 
-#: src/plugins/vcalendar/vcalendar.c:991
+#: src/plugins/vcalendar/vcalendar.c:994
 msgid "Cancel meeting"
 msgstr "Batalkan pertemuan"
 
-#: src/plugins/vcalendar/vcalendar.c:992
+#: src/plugins/vcalendar/vcalendar.c:995
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Apakah anda yakin ingin membatalkan pertemuan ini?"
 
-#: src/plugins/vcalendar/vcalendar.c:1087
+#: src/plugins/vcalendar/vcalendar.c:1090
 msgid "No account found"
 msgstr "Tidak ada akun yang ditemukan"
 
-#: src/plugins/vcalendar/vcalendar.c:1088
+#: src/plugins/vcalendar/vcalendar.c:1091
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -14230,128 +13537,129 @@ msgstr ""
 "Anda tidak memiliki akun yang cocok dengan setiap peserta.\n"
 "Apakah anda akan tetap membalas?"
 
-#: src/plugins/vcalendar/vcalendar.c:1090
-msgid "+Reply anyway"
+#: src/plugins/vcalendar/vcalendar.c:1093
+#, fuzzy
+msgid "Reply anyway"
 msgstr "+Balas saja"
 
-#: src/plugins/vcalendar/vcalendar.c:1219
+#: src/plugins/vcalendar/vcalendar.c:1222
 msgid "Answer"
 msgstr "Jawab"
 
-#: src/plugins/vcalendar/vcalendar.c:1220
+#: src/plugins/vcalendar/vcalendar.c:1223
 msgid "Edit meeting..."
 msgstr "Sunting pertemuan..."
 
-#: src/plugins/vcalendar/vcalendar.c:1221
+#: src/plugins/vcalendar/vcalendar.c:1224
 msgid "Cancel meeting..."
 msgstr "Batalkan pertemuan..."
 
-#: src/plugins/vcalendar/vcalendar.c:1222
+#: src/plugins/vcalendar/vcalendar.c:1225
 msgid "Launch website"
 msgstr "Luncurkan situs"
 
-#: src/plugins/vcalendar/vcalendar.c:1226
+#: src/plugins/vcalendar/vcalendar.c:1229
 msgid "You are already busy at this time."
 msgstr "Anda sudah sibuk pada waktu ini."
 
-#: src/plugins/vcalendar/vcalendar.c:1265
+#: src/plugins/vcalendar/vcalendar.c:1268
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
 msgid "Event:"
 msgstr "Kegiatan:"
 
-#: src/plugins/vcalendar/vcalendar.c:1266
+#: src/plugins/vcalendar/vcalendar.c:1269
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
 msgid "Organizer:"
 msgstr "Pelaksana:"
 
-#: src/plugins/vcalendar/vcalendar.c:1267
+#: src/plugins/vcalendar/vcalendar.c:1270
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
 msgid "Location:"
 msgstr "Lokasi:"
 
-#: src/plugins/vcalendar/vcalendar.c:1268
+#: src/plugins/vcalendar/vcalendar.c:1271
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
 msgid "Summary:"
 msgstr "Ringkasan:"
 
-#: src/plugins/vcalendar/vcalendar.c:1269
+#: src/plugins/vcalendar/vcalendar.c:1272
 msgid "Starting:"
 msgstr "Mulai:"
 
-#: src/plugins/vcalendar/vcalendar.c:1270
+#: src/plugins/vcalendar/vcalendar.c:1273
 msgid "Ending:"
 msgstr "Selesai:"
 
-#: src/plugins/vcalendar/vcalendar.c:1272
+#: src/plugins/vcalendar/vcalendar.c:1275
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1723
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1733
 msgid "Attendees:"
 msgstr "Peserta:"
 
-#: src/plugins/vcalendar/vcalendar.c:1274
+#: src/plugins/vcalendar/vcalendar.c:1277
 msgid "Action:"
 msgstr "Aksi:"
 
-#: src/plugins/vcalendar/vcal_folder.c:164
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "Pertemua_n baru..."
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "_Ekspor kalender..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to webCal..."
 msgstr "_Langganan ke webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "_Ganti nama..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "_Perbaharui langganan"
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "Tampi_lan daftar"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "Tampilan _minggu"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "Tampilan _bulan"
 
-#: src/plugins/vcalendar/vcal_folder.c:1094
+#: src/plugins/vcalendar/vcal_folder.c:1095
 msgid "Meetings"
 msgstr "Pertemuan"
 
-#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_folder.c:1494
 msgid "in the past"
 msgstr "di masa lalu"
 
-#: src/plugins/vcalendar/vcal_folder.c:1481
+#: src/plugins/vcalendar/vcal_folder.c:1497
 msgid "today"
 msgstr "hari ini"
 
-#: src/plugins/vcalendar/vcal_folder.c:1484
+#: src/plugins/vcalendar/vcal_folder.c:1500
 msgid "tomorrow"
 msgstr "besok"
 
-#: src/plugins/vcalendar/vcal_folder.c:1487
+#: src/plugins/vcalendar/vcal_folder.c:1503
 msgid "this week"
 msgstr "minggu ini"
 
-#: src/plugins/vcalendar/vcal_folder.c:1490
+#: src/plugins/vcalendar/vcal_folder.c:1506
 msgid "later"
 msgstr "nanti"
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1510
 #, c-format
 msgid ""
 "\n"
@@ -14360,17 +13668,17 @@ msgstr ""
 "\n"
 "Berikut ini adalah kegiatan yang direncanakan %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1589
+#: src/plugins/vcalendar/vcal_folder.c:1605
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Waktuhabis (%d detik) menyambung ke %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1607
+#: src/plugins/vcalendar/vcal_folder.c:1623
 #, c-format
 msgid "Error %ld"
 msgstr "Kesalahan %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1804
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14383,7 +13691,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1808
+#: src/plugins/vcalendar/vcal_folder.c:1824
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14396,7 +13704,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1819
+#: src/plugins/vcalendar/vcal_folder.c:1835
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -14407,7 +13715,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1822
+#: src/plugins/vcalendar/vcal_folder.c:1838
 #, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
@@ -14418,42 +13726,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1851
-#: src/plugins/vcalendar/vcal_folder.c:1854
+#: src/plugins/vcalendar/vcal_folder.c:1867
+#: src/plugins/vcalendar/vcal_folder.c:1870
 #, fuzzy, c-format
 msgid "Could not create directory %s"
 msgstr "Tidak dapat membuat direktori tujuan %s."
 
-#: src/plugins/vcalendar/vcal_folder.c:1892
+#: src/plugins/vcalendar/vcal_folder.c:1908
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail membutuhkan akses jaringan untuk memperbaharui feed Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1903
+#: src/plugins/vcalendar/vcal_folder.c:1919
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Mengambil kalender untuk %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1904
+#: src/plugins/vcalendar/vcal_folder.c:1920
 msgid "new subscription"
 msgstr "pendaftaran baru"
 
-#: src/plugins/vcalendar/vcal_folder.c:1915
+#: src/plugins/vcalendar/vcal_folder.c:1931
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail membutuhkan akses jaringan untuk memperbaharui langganan."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Subscribe to WebCal"
 msgstr "Langganan ke WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Enter the WebCal URL:"
 msgstr "Masukkan URL WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Could not parse the URL."
 msgstr "Tidak dapat mengurai URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:1967
+#: src/plugins/vcalendar/vcal_folder.c:1983
 msgid "Do you really want to unsubscribe?"
 msgstr "Apakah anda benar-benar ingin berhenti langganan?"
 
@@ -14509,15 +13817,15 @@ msgstr "Minggu ini"
 msgid "Later"
 msgstr "Nanti"
 
-#: src/plugins/vcalendar/vcal_manager.c:1242
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Diterima:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1244
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Ditolak:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1246
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Diterima Sementara:"
 
@@ -14538,8 +13846,9 @@ msgid "Add..."
 msgstr "Tambah..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#, fuzzy
 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 ""
 "Orang-orang berikut sibuk di waktu yang anda rencanakan untuk pertemuan:\n"
@@ -14725,16 +14034,19 @@ msgid "Check availability"
 msgstr "Periksa ketersediaan"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
-msgid "<b>Starts at:</b> "
+#, fuzzy
+msgid "Starts at:"
 msgstr "<b>Mulai pada:</b> "
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1628
-msgid "<b> on:</b>"
-msgstr "<b> pada:</b>"
+#, fuzzy
+msgid "on:"
+msgstr "hidup"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
-msgid "<b>Ends at:</b> "
+#, fuzzy
+msgid "Ends at:"
 msgstr "<b>Berakhir pada:</b> "
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
@@ -14794,110 +14106,113 @@ msgid_plural "Remind me in %d minutes"
 msgstr[0] "Ingatkan saya dalam %d menit"
 msgstr[1] "Ingatkan saya dalam %d menit"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2034
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2035
 msgid "Empty calendar"
 msgstr "Kalender kosong"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2035
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
 msgid "There is nothing to export."
 msgstr "Tidak ada yang di ekspor."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2075
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2076
 msgid "Could not export the calendar."
 msgstr "Tidak dapat mengekspor kalender."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2092
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2093
 msgid "Export calendar to ICS"
 msgstr "Ekspor kalender ke ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2115
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Tidak dapat mengekspor kalender ke '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2231
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
 msgid "Could not export the freebusy info."
 msgstr "Tidak dapat mengekspor info bebas/sibuk."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2264
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Tidak dapat mengekspor bebas/sibuk ke '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:266
+#: src/plugins/vcalendar/vcal_prefs.c:285
 msgid "Reminders"
 msgstr "Pengingat"
 
-#: src/plugins/vcalendar/vcal_prefs.c:275
+#: src/plugins/vcalendar/vcal_prefs.c:294
 msgid "Alert me"
 msgstr "Beritahu saya"
 
-#: src/plugins/vcalendar/vcal_prefs.c:287
+#: src/plugins/vcalendar/vcal_prefs.c:306
 msgid "minutes before an event"
 msgstr "menit sebelum kegiatan"
 
-#: src/plugins/vcalendar/vcal_prefs.c:299
+#: src/plugins/vcalendar/vcal_prefs.c:318
 msgid "Calendar export"
 msgstr "Ekspor kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:310
+#: src/plugins/vcalendar/vcal_prefs.c:329
 msgid "Automatically export calendar to"
 msgstr "Otomatis mengekspor kalender ke"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425
+#: 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 "Anda dapat mengekspor ke berkas lokal atau URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:321
+#: src/plugins/vcalendar/vcal_prefs.c:340
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Tentukan berkas lokal atau URL (http://server/jalur/berkas.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "ID Pengguna"
-
-#: src/plugins/vcalendar/vcal_prefs.c:351
+#: src/plugins/vcalendar/vcal_prefs.c:370
 msgid "Include webcal subscriptions in export"
 msgstr "Sertakan langganan webcal dalam ekspor"
 
-#: src/plugins/vcalendar/vcal_prefs.c:361
+#: src/plugins/vcalendar/vcal_prefs.c:380
 msgid "Command to run after calendar export"
 msgstr "Perintah untuk dijalankan setelah mengekspor kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:390
+#: src/plugins/vcalendar/vcal_prefs.c:409
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrasi kalender Claws pada jam Orage XFCE"
 
-#: src/plugins/vcalendar/vcal_prefs.c:392
+#: src/plugins/vcalendar/vcal_prefs.c:411
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "Perbolehkan Orage (versi lebih besar dari 4.4) untuk melihat kalender Claws "
 "Mail"
 
-#: src/plugins/vcalendar/vcal_prefs.c:404
+#: src/plugins/vcalendar/vcal_prefs.c:424
+msgid "Export as GNOME shell calendar server"
+msgstr ""
+
+#: 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:436
 msgid "Free/Busy information"
 msgstr "Informasi Bebas/Sibuk"
 
-#: src/plugins/vcalendar/vcal_prefs.c:416
+#: src/plugins/vcalendar/vcal_prefs.c:448
 msgid "Automatically export free/busy status to"
 msgstr "Otomatis ekspor status bebas/sibuk ke"
 
-#: src/plugins/vcalendar/vcal_prefs.c:427
+#: src/plugins/vcalendar/vcal_prefs.c:459
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Tentukan berkas lokal atau URL (http://server/jalur/berkas.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:489
 msgid "Command to run after free/busy status export"
 msgstr "Perintah untuk dijalankan setelah mengekspor status bebas/sibuk"
 
-#: src/plugins/vcalendar/vcal_prefs.c:484
+#: src/plugins/vcalendar/vcal_prefs.c:516
 msgid "Get free/busy status of others from"
 msgstr "Ambil status bebas/sibuk lainnya dari"
 
-#: src/plugins/vcalendar/vcal_prefs.c:492
+#: 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 "
@@ -14906,7 +14221,7 @@ msgstr ""
 "Tentukan berkas lokal atau URL (http://server/jalur/berkas.ifb). Gunakan %u "
 "untuk bagian kiri dari alamat email, %d untuk domain"
 
-#: src/plugins/vcalendar/vcal_prefs.c:506
+#: src/plugins/vcalendar/vcal_prefs.c:538
 msgid "SSL options"
 msgstr "Pilihan SSL"
 
@@ -14961,138 +14276,135 @@ msgstr "Kesalahan terjadi pada sesi POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "Perintah TOP tidak didukung\n"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1450 src/prefs_account.c:2434
-#: src/wizard.c:1506
+#: 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:338 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 "IMAP4"
 
-#: src/prefs_account.c:339
+#: src/prefs_account.c:336
 msgid "News (NNTP)"
 msgstr "Berita (NNTP)"
 
-#: src/prefs_account.c:340 src/wizard.c:1508
+#: src/prefs_account.c:337 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "Berkas mbox lokal"
 
-#: src/prefs_account.c:341
+#: src/prefs_account.c:338
 msgid "None (SMTP only)"
 msgstr "Tidak ada (hanya SMTP)"
 
-#: src/prefs_account.c:1034
+#: src/prefs_account.c:1028
 msgid "Name of account"
 msgstr "Nama akun"
 
-#: src/prefs_account.c:1043
+#: src/prefs_account.c:1037
 msgid "Set as default"
 msgstr "Pasang sebagai standar"
 
-#: src/prefs_account.c:1051
+#: src/prefs_account.c:1045
 msgid "Personal information"
 msgstr "Informasi personal"
 
-#: src/prefs_account.c:1060
+#: src/prefs_account.c:1054
 msgid "Full name"
 msgstr "Nama lengkap"
 
-#: src/prefs_account.c:1066
+#: src/prefs_account.c:1060
 msgid "Mail address"
 msgstr "Alamat surat"
 
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Informasi server"
-
-#: src/prefs_account.c:1129 src/wizard.c:1475
+#: src/prefs_account.c:1123 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Konfigurasi-otomatis"
 
-#: src/prefs_account.c:1131 src/wizard.c:1477
+#: src/prefs_account.c:1125 src/wizard.c:1525
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/prefs_account.c:1147
+#: src/prefs_account.c:1142
+#, fuzzy
 msgid ""
-"<span weight=\"bold\">Warning: this version of Claws Mail\n"
-"has been built without IMAP and News support.</span>"
+"Warning: this version of Claws Mail\n"
+"has been built without IMAP and News support."
 msgstr ""
 "<span weight=\"bold\">Peringatan: versi Claws Mail ini\n"
 "telah dibangun tanpa dukungan IMAP dan Berita.</span>"
 
-#: src/prefs_account.c:1176
+#: src/prefs_account.c:1171
 msgid "This server requires authentication"
 msgstr "Server ini butuh otentifikasi"
 
-#: src/prefs_account.c:1183
+#: src/prefs_account.c:1178
 msgid "Authenticate on connect"
 msgstr "Otentifikasi saat menyambung"
 
-#: src/prefs_account.c:1237
+#: src/prefs_account.c:1232
 msgid "News server"
 msgstr "Server Berita"
 
-#: src/prefs_account.c:1243
+#: src/prefs_account.c:1238
 msgid "Server for receiving"
 msgstr "Server untuk menerima"
 
-#: src/prefs_account.c:1249
+#: src/prefs_account.c:1244
 msgid "Local mailbox"
 msgstr "Kotaksurat lokal"
 
-#: src/prefs_account.c:1256
+#: src/prefs_account.c:1251
 msgid "SMTP server (send)"
 msgstr "Server smtp (kirim)"
 
-#: src/prefs_account.c:1264
+#: src/prefs_account.c:1259
 msgid "Use mail command rather than SMTP server"
 msgstr "Gunakan perintah surat daripada server SMTP"
 
-#: src/prefs_account.c:1273
+#: src/prefs_account.c:1268
 msgid "command to send mails"
 msgstr "perintah untuk mengirim surat"
 
-#: src/prefs_account.c:1338
+#: src/prefs_account.c:1332
 #, c-format
 msgid "Account%d"
 msgstr "Akun%d"
 
-#: src/prefs_account.c:1424
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Lokal"
 
-#: src/prefs_account.c:1430 src/prefs_account.c:1519
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Standar Kotakmasuk"
 
-#: 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 "Pesan tak tersaring akan diletakkan pada direktori ini"
 
-#: src/prefs_account.c:1452
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Gunakan otentifikasi aman (APOP)"
 
-#: src/prefs_account.c:1455
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Hapus pesan pada server ketika telah diterima"
 
-#: src/prefs_account.c:1466
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Hapus setelah"
 
-#: 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 "0 hari dan 0 jam : hapus seketika"
 
-#: src/prefs_account.c:1496
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Terima batasan ukuran"
 
-#: 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."
@@ -15100,86 +14412,83 @@ msgstr ""
 "Pesan yang melebihi batas akan diambil sebagian. Ketika memilihnya anda "
 "dapat mengunduh sepenuhnya atau menghapusnya."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2464
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1546
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr "Jumlah maksimum artikel untuk diunduh"
 
-#: src/prefs_account.c:1556
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "tak terhingga jika 0 diberikan"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "Metode otentifikasi"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Otomatis"
+#: src/prefs_account.c:1585
+#, fuzzy
+msgid "Plain text"
+msgstr "Cari teks:"
 
-#: src/prefs_account.c:1592
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "Direktori server IMAP"
 
-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(biasanya kosong)"
 
-#: src/prefs_account.c:1610
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Tampilkan hanya direktori terdaftar"
 
-#: src/prefs_account.c:1617
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Modus efisien-bandwith (cegah pengambilan penanda remot)"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Modus ini menggunakan lebih sedikit bandwith, namun pada beberapa server "
 "bisa menjadi lambat."
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Saring pesan saat menerima"
 
-#: src/prefs_account.c:1633
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Perbolehkan penyaringan menggunakan pengaya saat menerima"
 
-#: src/prefs_account.c:1637
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ambil Surat' akan memeriksa pesan baru pada akun ini"
 
-#: src/prefs_account.c:1718 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1974 src/prefs_matcher.c:1996
+#: 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 "Header"
 
-#: src/prefs_account.c:1720
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Hasilkan ID-Pesan"
 
-#: src/prefs_account.c:1723
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Kirim akun alamat surat pada Message-Id"
 
-#: src/prefs_account.c:1726
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Tambah header agen pengguna"
 
-#: src/prefs_account.c:1733
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Tambah header definisi-pengguna"
 
-#: src/prefs_account.c:1748
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Otentifikasi SMTP (SMTP AUTH)"
 
-#: 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."
@@ -15187,181 +14496,178 @@ msgstr ""
 "Jika anda membiarkan entri ini kosong, ID pengguna dan sandi yang sama "
 "dengan penerimaan akan digunakan."
 
-#: src/prefs_account.c:1844
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Otentifikasi dengan POP3 sebelum pengiriman"
 
-#: src/prefs_account.c:1859
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Waktu otentifikasi POP habis: "
 
-#: src/prefs_account.c:1867
-msgid "minutes"
-msgstr "menit"
-
-#: src/prefs_account.c:1937 src/prefs_account.c:1983
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Tandatangan"
 
-#: src/prefs_account.c:1940
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Secara otomatis sisipkan tandatangan"
 
-#: src/prefs_account.c:1945
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Pemisah tandatangan"
 
-#: src/prefs_account.c:1970
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Keluaran perintah"
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Secara otomatis pasang alamat berikut"
 
-#: src/prefs_account.c:2055
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Kamus pemeriksa ejaan"
 
-#: src/prefs_account.c:2065 src/prefs_folder_item.c:1092
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Kamus standar"
 
-#: src/prefs_account.c:2078 src/prefs_folder_item.c:1126
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Kamus alternatif standar"
 
-#: src/prefs_account.c:2164 src/prefs_account.c:3288
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1442
-#: src/prefs_folder_item.c:1833 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: 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 "Tulis"
 
-#: src/prefs_account.c:2179 src/prefs_folder_item.c:1470 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 "Balas"
 
-#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1498 src/prefs_quote.c:149 src/toolbar.c:413
+#: 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 "Teruskan"
 
-#: src/prefs_account.c:2241
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Sistem privasi standar"
 
-#: src/prefs_account.c:2270
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Selalu tandatangani pesan"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Selalu enkripsi pesan"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 "Selalu tandatangani pesan ketika membalas kepada pesan yang ditandatangani"
 
-#: src/prefs_account.c:2277
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Selalu enkripsi pesan ketika membalas kepada pesan yang dienkripsi"
 
-#: src/prefs_account.c:2280
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Enkripsi pesan terkirim dengan kunci anda sebagai tambahan pada penerima"
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Simpan pesan enkripsi yang telah terkirim sebagai teks biasa"
 
-#: 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 "Jangan gunakan SSL"
 
-#: src/prefs_account.c:2441
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Gunakan SSL untuk sambungan POP3"
 
-#: 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 "Gunakan perintah STARTTLS untuk memulai sesi SSL"
 
-#: src/prefs_account.c:2456
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Gunakan SSL untuk sambungan IMAP4"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Gunakan SSL untuk sambungan NNTP"
 
-#: src/prefs_account.c:2480
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Kirim (SMTP)"
 
-#: src/prefs_account.c:2484
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Jangan gunakan SSL (namun, jika perlu, gunakan STARTTLS)"
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Gunakan SSL untuk sambungan SMTP"
 
-#: src/prefs_account.c:2495
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Sertifikat klien"
 
-#: src/prefs_account.c:2503
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Sertifikat untuk penerimaan"
 
-#: 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 "Berkas sertifikat klien sebagai berkas PKCS12 atau PEM"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Sertifikat untuk pengiriman"
 
-#: src/prefs_account.c:2558
-msgid "Automatically accept unknown valid SSL certificates"
+#: src/prefs_account.c:2576
+#, fuzzy
+msgid "Automatically accept valid SSL certificates"
 msgstr "Secara otomatis menerima sertifikat SSL sah yang tidak dikenal"
 
-#: src/prefs_account.c:2561
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Gunakan non-blocking SSL"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Matikan jika anda memiliki masalah sambungan SSL"
 
-#: src/prefs_account.c:2691
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:2698
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "Port POP3"
 
-#: src/prefs_account.c:2705
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "Port IMAP4"
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:2718
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Nama domain"
 
-#: 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."
@@ -15369,124 +14675,112 @@ msgstr ""
 "Nama domain akan digunakan pada Id-Pesan yang dihasilkan, dan ketika "
 "menyambung ke server SMTP."
 
-#: src/prefs_account.c:2735
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Gunakan perintah untuk komunikasi dengan server"
 
-#: src/prefs_account.c:2743
-msgid "Move deleted mails to trash and expunge immediately"
-msgstr "Pindahkan surat yang dihapus ke tong sampah dan hilangkan secepatnya"
-
-#: src/prefs_account.c:2745
-msgid ""
-"Moves deleted mails to trash instead of using the \\Deleted flag without "
-"expunging."
-msgstr ""
-"Pindahkan surat yang dihapus ke tong sampah sebagai ganti \\Penanda Hapus "
-"tanpa menghilangkan."
-
-#: src/prefs_account.c:2749
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Tandai pesan cross-posted sebagai telah dibaca dan warna:"
 
-#: src/prefs_account.c:2805
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Letakkan pesan terkirim di"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Letakkan antrian pesan di"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Letakkan konsep pesan di"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Letakkan pesan yang dihapus di"
 
-#: src/prefs_account.c:2871
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Nama akun tidak dimasukkan."
 
-#: src/prefs_account.c:2875
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Alamat surat tidak dimasukkan."
 
-#: src/prefs_account.c:2882
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "Server SMTP tidak dimasukkan."
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "ID Pengguna tidak dimasukkan."
 
-#: src/prefs_account.c:2892
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "Server POP3 tidak dimasukkan."
 
-#: src/prefs_account.c:2912
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Direktori standar Kotakmasuk tidak ada."
 
-#: src/prefs_account.c:2918
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "Server IMAP4 tidak dimasukkan."
 
-#: src/prefs_account.c:2923
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "Server NNTP tidak dimasukkan."
 
-#: src/prefs_account.c:2929
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "nama berkas kotaksurat lokal tidak dimasukkan."
 
-#: src/prefs_account.c:2935
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "perintah surat tidak dimasukkan."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Menerima"
 
-#: src/prefs_account.c:3306 src/prefs_folder_item.c:1849 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Cetakan"
 
-#: src/prefs_account.c:3324
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Privasi"
 
-#: src/prefs_account.c:3435
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Tingkatlanjut"
 
-#: src/prefs_account.c:3726
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Preferensi untuk akun baru"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferensi akun"
 
-#: src/prefs_account.c:3850 src/wizard.c:1374
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Gagal (salah alamat)"
 
-#: src/prefs_account.c:3933
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Pilih berkas tandatangan"
 
-#: src/prefs_account.c:3951 src/prefs_account.c:3968 src/wizard.c:1057
+#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Pilih berkas sertifikat"
 
-#: src/prefs_account.c:4064
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:4204
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (pengaya tidak dimuat)"
@@ -15520,7 +14814,7 @@ msgid "Replace the selected action in list with the action above"
 msgstr "Ganti aksi yang terpilih dalam daftar dengan aksi diatas"
 
 #: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:781 src/prefs_template.c:320
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:779 src/prefs_template.c:320
 #: src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "Ha_pus"
@@ -15547,7 +14841,7 @@ msgstr "Pindahkan aksi terpilih kebawah"
 
 #: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
 #: src/prefs_filtering.c:836 src/prefs_filtering.c:838
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:900
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:896
 #: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Baru)"
@@ -15608,22 +14902,22 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Anda yakin ingin menghapus seluruh aksi?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125
-#: 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 "Entri tidak disimpan"
 
 #: 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 "Entri belum disimpan. Tutup saja?"
 
 #: 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:2127
-#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
-msgid "+_Continue editing"
+#: 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
+#, fuzzy
+msgid "_Continue editing"
 msgstr "+_Lanjutkan menyunting"
 
 #: src/prefs_actions.c:903
@@ -15719,7 +15013,7 @@ msgstr "terapkan aksi penyaringan antara {} pada pesan terpilih"
 msgid "for a literal %"
 msgstr "untuk literal %"
 
-#: src/prefs_actions.c:1004 src/prefs_themes.c:936
+#: src/prefs_actions.c:1004 src/prefs_themes.c:935
 msgid "Actions"
 msgstr "Aksi"
 
@@ -15745,15 +15039,15 @@ msgstr "Aksi sekarang"
 msgid "Action string is not valid."
 msgstr "Larik aksi tidak benar."
 
-#: src/prefs_common.c:220 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Halo,\\n"
 
-#: src/prefs_common.c:296
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Pada %d\\n%f menulis:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:302 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"
@@ -15761,7 +15055,7 @@ msgstr ""
 "\\n\\nAwal pesan yang diteruskan:\\n\\n?d{Tanggal: %d\\n}?f{Dari: %f\\n}?"
 "t{Kepada: %t\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subyek: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:442
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15862,7 +15156,7 @@ msgid "Custom header configuration"
 msgstr "Konfigurasi header bebas"
 
 #: src/prefs_customheader.c:506 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
+#: src/prefs_matcher.c:1594 src/prefs_matcher.c:1609
 msgid "Header name is not set."
 msgstr "Nama header belum di atur."
 
@@ -15956,23 +15250,27 @@ msgstr "Header ini sudah ada dalam daftar."
 msgid "%s will be replaced with file name / URI"
 msgstr "%s akan digantikan dengan nama berkas / URI"
 
-#: src/prefs_ext_prog.c:120
+#: src/prefs_ext_prog.c:110
+msgid "For the text editor, %w will be replaced with GtkSocket ID"
+msgstr ""
+
+#: src/prefs_ext_prog.c:129
 msgid "Use system defaults when possible"
 msgstr "Gunakan standar sistem jika memungkinkan"
 
-#: src/prefs_ext_prog.c:141
+#: src/prefs_ext_prog.c:150
 msgid "Web browser"
 msgstr "Perambah web"
 
-#: src/prefs_ext_prog.c:169
+#: src/prefs_ext_prog.c:178
 msgid "Text editor"
 msgstr "Penyunting teks"
 
-#: src/prefs_ext_prog.c:197
+#: src/prefs_ext_prog.c:210
 msgid "Command for 'Display as text'"
 msgstr "Perintah untuk 'Tampilkan sebagai teks'"
 
-#: src/prefs_ext_prog.c:210
+#: src/prefs_ext_prog.c:223
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -15980,12 +15278,12 @@ msgstr ""
 "Pilihan ini mengaktifkan bagian MIME untuk ditampilkan pada tampilan pesan "
 "melalui program ketika menggunakan menu kontekstual 'Tampilkan sebagai teks'"
 
-#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
+#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
 #: src/prefs_message.c:354
 msgid "Message View"
 msgstr "Tampilan Pesan"
 
-#: src/prefs_ext_prog.c:270
+#: src/prefs_ext_prog.c:283
 msgid "External Programs"
 msgstr "Program Eksternal"
 
@@ -16008,8 +15306,8 @@ msgstr "Sembunyi"
 msgid "Message flags"
 msgstr "Bendera pesan"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summary_column.c:78
-#: src/summaryview.c:2791
+#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
+#: src/prefs_summary_column.c:78 src/summaryview.c:2776
 msgid "Mark"
 msgstr "Tanda"
 
@@ -16034,7 +15332,7 @@ msgstr "Tandai sebagai ham"
 msgid "Execute"
 msgstr "Jalankan"
 
-#: src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:440
 msgid "Color label"
 msgstr "Label warna"
 
@@ -16049,7 +15347,8 @@ msgstr "Redirect"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
 #: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summary_column.c:87 src/summaryview.c:447
+#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87
+#: src/summaryview.c:446
 msgid "Score"
 msgstr "Nilai"
 
@@ -16063,7 +15362,7 @@ msgstr "Pasang nilai"
 
 #: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
 #: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:89 src/summaryview.c:449
+#: src/prefs_summary_column.c:89 src/summaryview.c:448
 msgid "Tags"
 msgstr "Tags"
 
@@ -16132,25 +15431,25 @@ msgstr "Nama penanda kosong."
 msgid "No action was defined."
 msgstr "Tidak ada aksi yang didefinisikan."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2169
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "literal %"
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2178
+#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2169
 msgid "filename (should not be modified)"
 msgstr "nama berkas (sebaiknya tidak dirubah)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2179
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "baris baru"
 
-#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2180
+#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2171
 msgid "escape character for quotes"
 msgstr "karakter escape untuk kutipan"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2181
+#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
 msgid "quote character"
 msgstr "karakter kutip"
 
@@ -16319,8 +15618,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Kolom yang disembunyikan"
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:406
-#: src/prefs_summaries.c:545 src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:290 src/prefs_summaries.c:409
+#: src/prefs_summaries.c:587 src/prefs_summary_column.c:304
 msgid "Displayed columns"
 msgstr "Kolom yang ditampilkan"
 
@@ -16329,18 +15628,19 @@ msgstr "Kolom yang ditampilkan"
 msgid " Use default "
 msgstr " Gunakan standar "
 
-#: src/prefs_folder_item.c:268 src/prefs_folder_item.c:876
-#: src/prefs_folder_item.c:1402
+#: src/prefs_folder_item.c:262 src/prefs_folder_item.c:864
+#: src/prefs_folder_item.c:1390
+#, fuzzy
 msgid ""
-"<i>These preferences will not be saved as this folder is a top-level folder. "
+"These preferences will not be saved as this folder is a top-level folder. "
 "However, you can set them for the whole mailbox tree by using \"Apply to "
-"subfolders\".</i>"
+"subfolders\"."
 msgstr ""
 "<i>Preferensi ini tidak akan disimpan karena direktori ini merupakan tingkat "
 "teratas. Namun anda dapat memasangnya pada seluruh struktur kotaksurat "
 "menggunakan \"Terapkan pada subdirektori\".</i>"
 
-#: src/prefs_folder_item.c:280 src/prefs_folder_item.c:888
+#: src/prefs_folder_item.c:274 src/prefs_folder_item.c:876
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -16348,55 +15648,55 @@ msgstr ""
 "Terapkan pada\n"
 "subdirektori"
 
-#: src/prefs_folder_item.c:305
+#: src/prefs_folder_item.c:299
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:307
+#: src/prefs_folder_item.c:301
 msgid "Outbox"
 msgstr "Kotakkeluar"
 
-#: src/prefs_folder_item.c:323
+#: src/prefs_folder_item.c:317
 msgid "Folder type"
 msgstr "Tipe direktori"
 
-#: src/prefs_folder_item.c:336
+#: src/prefs_folder_item.c:329
 msgid "Simplify Subject RegExp"
 msgstr "Sederhanakan Subyek RegExp"
 
-#: src/prefs_folder_item.c:362
+#: src/prefs_folder_item.c:355
 msgid "Test string:"
 msgstr "Test kata:"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:372
 msgid "Result:"
 msgstr "Hasil:"
 
-#: src/prefs_folder_item.c:394
+#: src/prefs_folder_item.c:387
 msgid "Folder chmod"
 msgstr "Chmod direktori"
 
-#: src/prefs_folder_item.c:420
+#: src/prefs_folder_item.c:413
 msgid "Folder color"
 msgstr "Warna direktori"
 
-#: src/prefs_folder_item.c:433 src/prefs_folder_item.c:1671
+#: src/prefs_folder_item.c:426 src/prefs_folder_item.c:1659
 msgid "Pick color for folder"
 msgstr "Tentukan warna untuk direktori"
 
-#: src/prefs_folder_item.c:451
+#: src/prefs_folder_item.c:444
 msgid "Run Processing rules at start-up"
 msgstr "Jalankan aturan pemrosesan pada saat memulai"
 
-#: src/prefs_folder_item.c:466
+#: src/prefs_folder_item.c:459
 msgid "Run Processing rules when opening"
 msgstr "Jalankan aturan pemrosesan ketika membuka"
 
-#: src/prefs_folder_item.c:480
+#: src/prefs_folder_item.c:473
 msgid "Scan for new mail"
 msgstr "Pindai surat baru"
 
-#: src/prefs_folder_item.c:482
+#: src/prefs_folder_item.c:475
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -16404,11 +15704,11 @@ msgstr ""
 "Aktifkan pilihan ini jika surat diantarkan secara langsung ke direktori ini "
 "oleh penyaringan IMAP pada server atau oleh aplikasi eksternal"
 
-#: src/prefs_folder_item.c:502
+#: src/prefs_folder_item.c:495
 msgid "Select the HTML part of multipart messages"
 msgstr "Pilih bagian HTML dari pesan multibagian"
 
-#: src/prefs_folder_item.c:519
+#: src/prefs_folder_item.c:512
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -16416,66 +15716,62 @@ msgstr ""
 "\"Standar\" akan mengikuti preferensi global (ditemukan pada /Preferensi/"
 "Tampilan Pesan/Teks Pilihan)"
 
-#: src/prefs_folder_item.c:529
+#: src/prefs_folder_item.c:522
 msgid "Synchronise for offline use"
 msgstr "Sinkronkan untuk penggunaan offline"
 
-#: src/prefs_folder_item.c:550
+#: src/prefs_folder_item.c:543
 msgid "Fetch message bodies from the last"
 msgstr "Ambil isi pesan berdasarkan dari akhir"
 
-#: src/prefs_folder_item.c:557
+#: src/prefs_folder_item.c:550
 msgid "0: all bodies"
 msgstr "0: semua isi"
 
-#: src/prefs_folder_item.c:565
+#: src/prefs_folder_item.c:558
 msgid "Remove older messages bodies"
 msgstr "Hapus isi pesan yang lebih tua"
 
-#: src/prefs_folder_item.c:582
+#: src/prefs_folder_item.c:575
 msgid "Discard folder cache"
 msgstr "Batalkan tampungan direktori"
 
-#: src/prefs_folder_item.c:897
+#: src/prefs_folder_item.c:885
 msgid "Request Return Receipt"
 msgstr "Minta Tanda terima Kembali"
 
-#: src/prefs_folder_item.c:912
+#: src/prefs_folder_item.c:900
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Simpan salinan pesan yang keluar pada direktori ini selain dari Terkirim"
 
-#: src/prefs_folder_item.c:925 src/prefs_folder_item.c:948
-#: src/prefs_folder_item.c:972 src/prefs_folder_item.c:995
-#: src/prefs_folder_item.c:1018
+#: src/prefs_folder_item.c:913 src/prefs_folder_item.c:936
+#: src/prefs_folder_item.c:960 src/prefs_folder_item.c:983
+#: src/prefs_folder_item.c:1006
 msgid "Default "
 msgstr "Standar "
 
-#: src/prefs_folder_item.c:949
+#: src/prefs_folder_item.c:937
 msgid " for replies"
 msgstr "untuk balasan"
 
-#: src/prefs_folder_item.c:1041
+#: src/prefs_folder_item.c:1029
 msgid "Default account"
 msgstr "Standar akun"
 
-#: src/prefs_folder_item.c:1684
+#: src/prefs_folder_item.c:1672
 msgid "Discard cache"
 msgstr "Batalkan tampungan"
 
-#: src/prefs_folder_item.c:1685
+#: src/prefs_folder_item.c:1673
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "Anda yakin ingin membatalkan data tampungan lokal direktori ini?"
 
-#: src/prefs_folder_item.c:1687
-msgid "+Discard"
-msgstr "+Batal"
-
-#: src/prefs_folder_item.c:1816
+#: src/prefs_folder_item.c:1803
 msgid "General"
 msgstr "Umum"
 
-#: src/prefs_folder_item.c:1895
+#: src/prefs_folder_item.c:1882
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Properti untuk direktori %s"
@@ -16484,7 +15780,7 @@ msgstr "Properti untuk direktori %s"
 msgid "Folder and Message Lists"
 msgstr "Direktori dan Daftar Pesan"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2046
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2035
 msgid "Message"
 msgstr "Pesan"
 
@@ -16508,7 +15804,7 @@ msgstr "Gunakan huruf berbeda untuk pencetakan"
 msgid "Message Printing"
 msgstr "Pencetakan Pesan"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:678
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:731
 #: src/prefs_themes.c:365
 msgid "Display"
 msgstr "Tampilan"
@@ -16517,7 +15813,7 @@ msgstr "Tampilan"
 msgid "Fonts"
 msgstr "Huruf"
 
-#: src/prefs_gtk.c:939 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:911 src/toolbar.c:213 src/toolbar.c:423
 msgid "Preferences"
 msgstr "Preferensi"
 
@@ -16663,7 +15959,7 @@ msgstr "Pesan kesalahan"
 msgid "Status messages for filtering/processing log"
 msgstr "Status pesan untuk catatan penyaringan/pemrosesan"
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:689
+#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
 msgid "Other"
 msgstr "Lainnya"
 
@@ -16671,157 +15967,157 @@ msgstr "Lainnya"
 msgid "Logging"
 msgstr "Pencatatan"
 
-#: src/prefs_matcher.c:330
+#: src/prefs_matcher.c:331
 msgid "more than"
 msgstr "lebih dari"
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:332
 msgid "less than"
 msgstr "kurang dari"
 
-#: src/prefs_matcher.c:337
+#: src/prefs_matcher.c:338
 msgid "weeks"
 msgstr "minggu"
 
-#: src/prefs_matcher.c:341
+#: src/prefs_matcher.c:342
 msgid "higher than"
 msgstr "lebih tinggi dari"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:343
 msgid "lower than"
 msgstr "lebih rendah dari"
 
-#: src/prefs_matcher.c:343 src/prefs_matcher.c:349
+#: src/prefs_matcher.c:344 src/prefs_matcher.c:350
 msgid "exactly"
 msgstr "tepat"
 
-#: src/prefs_matcher.c:347
+#: src/prefs_matcher.c:348
 msgid "greater than"
 msgstr "lebih besar dari"
 
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:349
 msgid "smaller than"
 msgstr "lebih kecil dari"
 
-#: src/prefs_matcher.c:353
+#: src/prefs_matcher.c:354
 msgid "bytes"
 msgstr "bytes"
 
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:355
 msgid "kilobytes"
 msgstr "kilobytes"
 
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:356
 msgid "megabytes"
 msgstr "megabytes"
 
-#: src/prefs_matcher.c:359
+#: src/prefs_matcher.c:360
 msgid "contains"
 msgstr "mengandung"
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:361
 msgid "doesn't contain"
 msgstr "tidak mengandung"
 
-#: src/prefs_matcher.c:383
+#: src/prefs_matcher.c:385
 msgid "headers part"
 msgstr "bagian header"
 
-#: src/prefs_matcher.c:384
+#: src/prefs_matcher.c:386
 #, fuzzy
 msgid "headers values"
 msgstr "garis header"
 
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:387
 msgid "body part"
 msgstr "bagian isi"
 
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:388
 msgid "whole message"
 msgstr "seluruh pesan"
 
-#: src/prefs_matcher.c:392 src/summaryview.c:6308
+#: src/prefs_matcher.c:394 src/summaryview.c:6282
 msgid "Marked"
 msgstr "Ditandai"
 
-#: src/prefs_matcher.c:393 src/summaryview.c:6306
+#: src/prefs_matcher.c:395 src/summaryview.c:6280
 msgid "Deleted"
 msgstr "Dihapus"
 
-#: src/prefs_matcher.c:394
+#: src/prefs_matcher.c:396
 msgid "Replied"
 msgstr "Dibalas"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6300
+#: src/prefs_matcher.c:397 src/summaryview.c:6274
 msgid "Forwarded"
 msgstr "Diteruskan"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6290 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 "Spam"
 
-#: src/prefs_matcher.c:398
+#: src/prefs_matcher.c:400
 msgid "Has attachment"
 msgstr "Mempunyai lampiran"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6326
+#: src/prefs_matcher.c:401 src/summaryview.c:6300
 msgid "Signed"
 msgstr "Tertanda"
 
-#: src/prefs_matcher.c:403
+#: src/prefs_matcher.c:405
 msgid "set"
 msgstr "pasang"
 
-#: src/prefs_matcher.c:404
+#: src/prefs_matcher.c:406
 msgid "not set"
 msgstr "bongkar"
 
-#: src/prefs_matcher.c:408
+#: src/prefs_matcher.c:410
 msgid "yes"
 msgstr "ya"
 
-#: src/prefs_matcher.c:409
+#: src/prefs_matcher.c:411
 msgid "no"
 msgstr "tidak"
 
-#: src/prefs_matcher.c:413
+#: src/prefs_matcher.c:415
 msgid "Any tags"
 msgstr "Penanda apa saja"
 
-#: src/prefs_matcher.c:414
+#: src/prefs_matcher.c:416
 msgid "Specific tag"
 msgstr "Penanda spesifik"
 
-#: src/prefs_matcher.c:418
+#: src/prefs_matcher.c:420
 msgid "ignored"
 msgstr "diabaikan"
 
-#: src/prefs_matcher.c:419
+#: src/prefs_matcher.c:421
 msgid "not ignored"
 msgstr "tidak diabaikan"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:422
 msgid "watched"
 msgstr "diawasi"
 
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:423
 msgid "not watched"
 msgstr "tidak diawasi"
 
-#: src/prefs_matcher.c:425
+#: src/prefs_matcher.c:427
 msgid "found"
 msgstr "ditemukan"
 
-#: src/prefs_matcher.c:426
+#: src/prefs_matcher.c:428
 msgid "not found"
 msgstr "tidak ditemukan"
 
-#: src/prefs_matcher.c:430
+#: src/prefs_matcher.c:432
 msgid "0 (Passed)"
 msgstr "0 (Lulus)"
 
-#: src/prefs_matcher.c:431
+#: src/prefs_matcher.c:433
 msgid "non-0 (Failed)"
 msgstr "selain-0 (Gagal)"
 
@@ -16865,54 +16161,54 @@ msgstr "Diunduh sebagian"
 msgid "External program test"
 msgstr "Tes program eksternal"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1616 src/prefs_matcher.c:1631
-#: src/prefs_matcher.c:2521
+#: src/prefs_matcher.c:710 src/prefs_matcher.c:1615 src/prefs_matcher.c:1630
+#: src/prefs_matcher.c:2516
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Semua"
 
-#: src/prefs_matcher.c:744
+#: src/prefs_matcher.c:743
 msgid "Use regexp"
 msgstr "Gunakan regexp"
 
-#: src/prefs_matcher.c:821
+#: src/prefs_matcher.c:819
 msgid "Message must match"
 msgstr "Pesan harus tepat"
 
-#: src/prefs_matcher.c:825
+#: src/prefs_matcher.c:823
 msgid "at least one"
 msgstr "setidaknya satu"
 
-#: src/prefs_matcher.c:826
+#: src/prefs_matcher.c:824
 msgid "all"
 msgstr "semua"
 
-#: src/prefs_matcher.c:829
+#: src/prefs_matcher.c:827
 msgid "of above rules"
 msgstr "dari aturan diatas"
 
-#: src/prefs_matcher.c:1534 src/prefs_matcher.c:1600
+#: src/prefs_matcher.c:1533 src/prefs_matcher.c:1599
 msgid "Search pattern is not set."
 msgstr "Pola pencarian tidak di pasang."
 
-#: src/prefs_matcher.c:1543
+#: src/prefs_matcher.c:1542
 msgid "Test command is not set."
 msgstr "Perintah tes tidak di pasang."
 
-#: src/prefs_matcher.c:1617
+#: src/prefs_matcher.c:1616
 msgid "all addresses in all headers"
 msgstr "semua alamat pada semua header"
 
-#: src/prefs_matcher.c:1620
+#: src/prefs_matcher.c:1619
 msgid "any address in any header"
 msgstr "setiap alamat pada setiap header"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1621
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "alamat pada header '%s'"
 
-#: src/prefs_matcher.c:1623
+#: src/prefs_matcher.c:1622
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16925,84 +16221,84 @@ msgstr ""
 "Jika anda ingin mencocokkan %s terhadap seluruh buku alamat, anda harus "
 "memilih '%s' dari daftar drop-down buku/direktori."
 
-#: src/prefs_matcher.c:1842
+#: src/prefs_matcher.c:1841
 msgid "Headers part"
 msgstr "Bagian header"
 
-#: src/prefs_matcher.c:1846
+#: src/prefs_matcher.c:1845
 #, fuzzy
 msgid "Headers values"
 msgstr "Nama Kepala"
 
-#: src/prefs_matcher.c:1850
+#: src/prefs_matcher.c:1849
 msgid "Body part"
 msgstr "Bagian isi"
 
-#: src/prefs_matcher.c:1854
+#: src/prefs_matcher.c:1853
 msgid "Whole message"
 msgstr "Seluruh pesan"
 
-#: src/prefs_matcher.c:1973 src/prefs_matcher.c:2017
+#: src/prefs_matcher.c:1966 src/prefs_matcher.c:2008
 msgid "in"
 msgstr "dalam"
 
-#: src/prefs_matcher.c:1975
+#: src/prefs_matcher.c:1968
 msgid "content is"
 msgstr "konten adalah"
 
-#: src/prefs_matcher.c:1984
+#: src/prefs_matcher.c:1977
 msgid "Age is"
 msgstr "Umur adalah"
 
-#: src/prefs_matcher.c:1989
+#: src/prefs_matcher.c:1982
 msgid "Flag"
 msgstr "Bendera"
 
-#: src/prefs_matcher.c:1990 src/prefs_matcher.c:2007
+#: src/prefs_matcher.c:1983 src/prefs_matcher.c:1998
 msgid "is"
 msgstr "adalah"
 
-#: src/prefs_matcher.c:1995
+#: src/prefs_matcher.c:1988
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/prefs_matcher.c:2006
+#: src/prefs_matcher.c:1997
 msgid "Label"
 msgstr "Label"
 
-#: src/prefs_matcher.c:2012
+#: src/prefs_matcher.c:2003
 msgid "Value:"
 msgstr "Nilai:"
 
-#: src/prefs_matcher.c:2029
+#: src/prefs_matcher.c:2018
 msgid "Score is"
 msgstr "Skor adalah"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2019
 msgid "points"
 msgstr "poin"
 
-#: src/prefs_matcher.c:2040
+#: src/prefs_matcher.c:2029
 msgid "Size is"
 msgstr "Ukuran adalah"
 
-#: src/prefs_matcher.c:2045
+#: src/prefs_matcher.c:2034
 msgid "Scope:"
 msgstr "Cakupan:"
 
-#: src/prefs_matcher.c:2047
+#: src/prefs_matcher.c:2036
 msgid "tags"
 msgstr "penanda"
 
-#: src/prefs_matcher.c:2052
+#: src/prefs_matcher.c:2041
 msgid "type is"
 msgstr "tipe adalah"
 
-#: src/prefs_matcher.c:2056
+#: src/prefs_matcher.c:2045
 msgid "Program returns"
 msgstr "Program mengembalikan"
 
-#: src/prefs_matcher.c:2126
+#: src/prefs_matcher.c:2115
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -17010,11 +16306,11 @@ msgstr ""
 "Entri tidak disimpan.\n"
 "Tutup saja?"
 
-#: src/prefs_matcher.c:2190
+#: src/prefs_matcher.c:2181
 msgid "Match Type: 'Test'"
 msgstr "Tipe yang Cocok: 'Tes'"
 
-#: src/prefs_matcher.c:2191
+#: src/prefs_matcher.c:2182
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -17027,7 +16323,7 @@ msgstr ""
 "\n"
 "Simbol berikut dapat digunakan:"
 
-#: src/prefs_matcher.c:2290
+#: src/prefs_matcher.c:2281
 msgid "Current condition rules"
 msgstr "Kondisi aturan saat ini"
 
@@ -17071,6 +16367,11 @@ msgstr "Pilih bagian HTML dari pesan multibagian/alternatif"
 msgid "Line space"
 msgstr "Ruang baris"
 
+#: src/prefs_message.c:189 src/prefs_message.c:223
+#, fuzzy
+msgid "pixels"
+msgstr "piksel"
+
 #: src/prefs_message.c:195
 msgid "Scroll"
 msgstr "Gulung"
@@ -17107,6 +16408,24 @@ msgstr "Perlakukan karakter ini sebagai tanda kutipan: "
 msgid "Text Options"
 msgstr "Pilihan teks"
 
+#: 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
+#, fuzzy
+msgid "Configuration warning"
+msgstr "Konfigurasi selesai"
+
 #: src/prefs_msg_colors.c:147
 msgid "Message view"
 msgstr "Tampilan pesan"
@@ -17192,7 +16511,7 @@ msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Ambil warna untuk tandatangan"
 
-#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:354
+#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:357
 msgid "Folder list"
 msgstr "Daftar direktori"
 
@@ -17293,15 +16612,15 @@ msgstr "Ambil warna untuk direktori"
 msgid "Colors"
 msgstr "Warna"
 
-#: src/prefs_other.c:97
+#: src/prefs_other.c:107
 msgid "Choose preset keyboard shortcuts"
 msgstr "Pilih preset tombolpintas papan ketik"
 
-#: src/prefs_other.c:111
+#: src/prefs_other.c:121
 msgid "Select preset:"
 msgstr "Pilih preset:"
 
-#: src/prefs_other.c:126
+#: 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."
@@ -17309,35 +16628,35 @@ msgstr ""
 "Anda juga dapat merubah setiap tombolpintas menu dengan menekan\n"
 "tombol apa saja saat memfokuskan penunjuk tetikus pada menu tersebut."
 
-#: src/prefs_other.c:479
+#: src/prefs_other.c:496
 msgid "Add address to destination when double-clicked"
 msgstr "Tambahkan alamat pada tujuan saat di klik ganda"
 
-#: src/prefs_other.c:482
+#: src/prefs_other.c:499
 msgid "On exit"
 msgstr "Saat keluar"
 
-#: src/prefs_other.c:485
+#: src/prefs_other.c:502
 msgid "Confirm on exit"
 msgstr "Konfirmasi saat keluar"
 
-#: src/prefs_other.c:492
+#: src/prefs_other.c:509
 msgid "Empty trash on exit"
 msgstr "Kosongkan tong sampah saat keluar"
 
-#: src/prefs_other.c:495
+#: src/prefs_other.c:512
 msgid "Warn if there are queued messages"
 msgstr "Peringatkan jika ada pesan yang antri"
 
-#: src/prefs_other.c:497
+#: src/prefs_other.c:514
 msgid "Keyboard shortcuts"
 msgstr "Tombolpintas papan ketik"
 
-#: src/prefs_other.c:500
+#: src/prefs_other.c:517
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Aktifkan rekayasa tombolpintas papan ketik"
 
-#: src/prefs_other.c:503
+#: 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"
@@ -17348,15 +16667,15 @@ msgstr ""
 "Hilangkan centang jika anda ingin mengunci seluruh tombolpintas papan ketik "
 "yang ada."
 
-#: src/prefs_other.c:510
+#: src/prefs_other.c:527
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Pilih preset tombolpintas papan ketik..."
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:537
 msgid "Metadata handling"
 msgstr "Penanganan metadata"
 
-#: src/prefs_other.c:521
+#: 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."
@@ -17366,33 +16685,33 @@ msgstr ""
 "hal ini mencegah kehilangan data setelah kerusakan namun membutuhkan "
 "beberapa waktu."
 
-#: src/prefs_other.c:525
+#: src/prefs_other.c:542
 msgid "Safer"
 msgstr "Lebih aman"
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:544
 msgid "Faster"
 msgstr "Lebih cepat"
 
-#: src/prefs_other.c:545
+#: src/prefs_other.c:562
 msgid "Socket I/O timeout"
 msgstr "Soket I/O mengalami waktuhabis"
 
-#: src/prefs_other.c:567
+#: src/prefs_other.c:584
 msgid "Ask before emptying trash"
 msgstr "Tanyakan sebelum mengosongkan tong sampah"
 
-#: src/prefs_other.c:569
+#: src/prefs_other.c:586
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Tanyakan tentang aturan penyaringan spesifik akun ketika melakukan "
 "penyaringan manual"
 
-#: src/prefs_other.c:574
+#: src/prefs_other.c:591
 msgid "Use secure file deletion if possible"
 msgstr "Gunakan penghapusan berkas secara aman jika memungkinkan"
 
-#: src/prefs_other.c:578
+#: src/prefs_other.c:595
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -17400,7 +16719,7 @@ msgstr ""
 "Gunakan penghapusan berkas secara aman jika memungkinkan\n"
 "(program 'shred' tidak tersedia)"
 
-#: src/prefs_other.c:583
+#: 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."
@@ -17409,11 +16728,32 @@ msgstr ""
 "menghapus. Hal ini memperlambat proses penghapusan. Pastikan membaca halaman "
 "bantuan shred untuk pencegahan."
 
-#: src/prefs_other.c:587
+#: src/prefs_other.c:604
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sinkronkan direktori offline secepat mungkin"
 
-#: src/prefs_other.c:690
+#: src/prefs_other.c:607
+#, fuzzy
+msgid "Master passphrase"
+msgstr "Frasakunci buruk.\n"
+
+#: src/prefs_other.c:610
+#, fuzzy
+msgid "Use a master passphrase"
+msgstr "Frasakunci buruk.\n"
+
+#: 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
+#, fuzzy
+msgid "Change master passphrase"
+msgstr "Frasakunci buruk.\n"
+
+#: src/prefs_other.c:778
 msgid "Miscellaneous"
 msgstr "Macam-macam"
 
@@ -17421,71 +16761,71 @@ msgstr "Macam-macam"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Pada %d\\n%f menulis:\\n\\n%q"
 
-#: src/prefs_receive.c:123
+#: src/prefs_receive.c:142
 msgid "External incorporation program"
 msgstr "Program eksternal inkorporasi"
 
-#: src/prefs_receive.c:126
+#: src/prefs_receive.c:145
 msgid "Use external program for receiving mail"
 msgstr "Gunakan program eksternal untuk menerima surat"
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:161
 msgid "Automatic checking"
 msgstr "Pemeriksaan otomatis"
 
-#: src/prefs_receive.c:149
+#: src/prefs_receive.c:168
 msgid "Check for new mail every"
 msgstr "Periksa untuk surat baru setiap"
 
-#: src/prefs_receive.c:167
+#: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
 msgstr "Periksa surat baru setiap memulai"
 
-#: src/prefs_receive.c:170
+#: src/prefs_receive.c:218
 msgid "Dialogs"
 msgstr "Dialogs"
 
-#: src/prefs_receive.c:172
+#: src/prefs_receive.c:220
 msgid "Show receive dialog"
 msgstr "Tampilkan jendela penerimaan"
 
-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:230
 msgid "Only on manual receiving"
 msgstr "Hanya saat penerimaan manual"
 
-#: src/prefs_receive.c:193
+#: src/prefs_receive.c:241
 msgid "Close receive dialog when finished"
 msgstr "Tutup jendela peneriman ketika telah selesai"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:244
 msgid "Don't popup error dialog on receive error"
 msgstr "Jangan tampilkan jendela kesalahan saat terjadi kesalahan penerimaan"
 
-#: src/prefs_receive.c:199
+#: src/prefs_receive.c:247
 msgid "After receiving new mail"
 msgstr "Setelah menerima surat baru"
 
-#: src/prefs_receive.c:201
+#: src/prefs_receive.c:249
 msgid "Go to Inbox"
 msgstr "Ke kotakmasuk"
 
-#: src/prefs_receive.c:203
+#: src/prefs_receive.c:251
 msgid "Update all local folders"
 msgstr "Perbaharui semua direktori lokal"
 
-#: src/prefs_receive.c:205
+#: src/prefs_receive.c:253
 msgid "Run command"
 msgstr "Jalankan perintah"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:258
 msgid "after automatic check"
 msgstr "setelah pemeriksaan otomatis"
 
-#: src/prefs_receive.c:212
+#: src/prefs_receive.c:260
 msgid "after manual check"
 msgstr "setelah pemeriksaan manual"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:268
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -17494,39 +16834,40 @@ msgstr ""
 "Perintah untuk menjalankan:\n"
 "(gunakan %d sebagai jumlah surat baru)"
 
-#: src/prefs_receive.c:343 src/prefs_send.c:358
+#: src/prefs_receive.c:411 src/prefs_send.c:371
 msgid "Mail Handling"
 msgstr "Penanganan Surat"
 
-#: src/prefs_receive.c:344
+#: src/prefs_receive.c:412
 msgid "Receiving"
 msgstr "Penerimaan"
 
-#: src/prefs_send.c:161
-msgid "Save sent messages to Sent folder"
-msgstr "Simpan pesan terikirim pada direktori Terkirim"
-
-#: src/prefs_send.c:164
-msgid "Confirm before sending queued messages"
-msgstr "Konfirmasi sebelum mengirim pesan yang antri"
+#: src/prefs_send.c:159
+#, fuzzy
+msgid "Save sent messages"
+msgstr "Pesan parent"
 
-#: src/prefs_send.c:167
+#: src/prefs_send.c:162
 msgid "Never send Return Receipts"
 msgstr "Jangan pernah kirim Tanda Terima Balasan"
 
-#: src/prefs_send.c:170
+#: src/prefs_send.c:180
+msgid "Confirm before sending queued messages"
+msgstr "Konfirmasi sebelum mengirim pesan yang antri"
+
+#: src/prefs_send.c:183
 msgid "Show send dialog"
 msgstr "Tampilkan jendela kirim"
 
-#: src/prefs_send.c:172
+#: src/prefs_send.c:186
 msgid "Warn when Subject is empty"
 msgstr "Ingatkan saat Subyek kosong"
 
-#: src/prefs_send.c:180
+#: src/prefs_send.c:193
 msgid "Outgoing encoding"
 msgstr "Penyandian Outgoing"
 
-#: 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"
@@ -17534,136 +16875,132 @@ msgstr ""
 "Jika 'Otomatis' terpilih, penyandian optimum untuk lokal yang aktif akan "
 "digunakan"
 
-#: src/prefs_send.c:220
-msgid "Automatic (Recommended)"
-msgstr "Otomatis (Direkomendasikan)"
-
-#: src/prefs_send.c:222
+#: src/prefs_send.c:235
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_send.c:223
+#: src/prefs_send.c:236
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:225
+#: src/prefs_send.c:238
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:239
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_send.c:228
+#: src/prefs_send.c:241
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_send.c:230
+#: src/prefs_send.c:243
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:244
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_send.c:233
+#: src/prefs_send.c:246
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:248
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrew (ISO-8859-8)"
 
-#: src/prefs_send.c:236
+#: src/prefs_send.c:249
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrew (Windows-1255)"
 
-#: src/prefs_send.c:238
+#: src/prefs_send.c:251
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arab (ISO-8859-6)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:252
 msgid "Arabic (Windows-1256)"
 msgstr "Arab (Windows-1256)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:254
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turki (ISO-8859-9)"
 
-#: src/prefs_send.c:243
+#: src/prefs_send.c:256
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:257
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_send.c:245
+#: src/prefs_send.c:258
 #, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:259
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:260
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_send.c:249
+#: src/prefs_send.c:262
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Jepang (ISO-2022-JP)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:264
 msgid "Japanese (EUC-JP)"
 msgstr "Jepang (EUC-JP)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:265
 msgid "Japanese (Shift_JIS)"
 msgstr "Jepang (Shift_JIS)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:268
 msgid "Simplified Chinese (GB18030)"
 msgstr "Simplified China (GB18030)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:269
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified China (GB2312)"
 
-#: src/prefs_send.c:257
+#: src/prefs_send.c:270
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified China (GBK)"
 
-#: src/prefs_send.c:258
+#: src/prefs_send.c:271
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional China (Big5)"
 
-#: src/prefs_send.c:260
+#: src/prefs_send.c:273
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional China (EUC-TW)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:274
 msgid "Chinese (ISO-2022-CN)"
 msgstr "China (ISO-2022-CN)"
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:277
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:279
 msgid "Thai (TIS-620)"
 msgstr "Thailand (TIS-620)"
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:280
 msgid "Thai (Windows-874)"
 msgstr "Thailand (Windows-874)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:284
 msgid "Transfer encoding"
 msgstr "Pemindahan penyandian"
 
-#: src/prefs_send.c:282
+#: src/prefs_send.c:295
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -17671,8 +17008,8 @@ msgstr ""
 "Tentukan Konten-Pemindahan-Penyandian yang digunakan jika isi pesan "
 "mengandung karakter non-ASCII"
 
-#: src/prefs_send.c:359 src/send_message.c:499 src/send_message.c:503
-#: src/send_message.c:508
+#: src/prefs_send.c:372 src/send_message.c:501 src/send_message.c:505
+#: src/send_message.c:510
 msgid "Sending"
 msgstr "Pengiriman"
 
@@ -17724,156 +17061,176 @@ msgstr "Ambil warna untuk kata salah eja. Gunakan hitam untuk garis bawah"
 msgid "Spell Checking"
 msgstr "Pemeriksaan Ejaan"
 
-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153
 msgid "the abbreviated weekday name"
 msgstr "nama mingguan yang disingkat"
 
-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154
 msgid "the full weekday name"
 msgstr "nama mingguan lengkap"
 
-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155
 msgid "the abbreviated month name"
 msgstr "nama singkatan bulan"
 
-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156
 msgid "the full month name"
 msgstr "nama bulan lengkap"
 
-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157
 msgid "the preferred date and time for the current locale"
 msgstr "tanggal dan waktu yang diinginkan untuk lokal saat ini"
 
-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158
 msgid "the century number (year/100)"
 msgstr "angka abad (tahun/100)"
 
-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159
 msgid "the day of the month as a decimal number"
 msgstr "hari bulan sebagai angka desimal"
 
-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "jam sebagai angka desimal menggunakan waktu 24-jam"
 
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:161
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "jam sebagai angka desimal menggunakan waktu 12-jam"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:162
 msgid "the day of the year as a decimal number"
 msgstr "hari tahun sebagai angka desimal"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:163
 msgid "the month as a decimal number"
 msgstr "bulan sebagai angka desimal"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:164
 msgid "the minute as a decimal number"
 msgstr "menit sebagai angka desimal"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:165
 msgid "either AM or PM"
 msgstr "AM atau PM"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:166
 msgid "the second as a decimal number"
 msgstr "detik sebagai angka desimal"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:167
 msgid "the day of the week as a decimal number"
 msgstr "hari mingguan sebagai angka desimal"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:168
 msgid "the preferred date for the current locale"
 msgstr "tanggal yang diinginkan untuk lokal saat ini"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:169
 msgid "the last two digits of a year"
 msgstr "dua digit terakhir dari tahun"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:170
 msgid "the year as a decimal number"
 msgstr "tahun sebagai angka desimal"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:171
 msgid "the time zone or name or abbreviation"
 msgstr "zona waktu atau nama atau singkatan"
 
-#: src/prefs_summaries.c:191 src/prefs_summaries.c:239
-#: src/prefs_summaries.c:519
+#: src/prefs_summaries.c:192 src/prefs_summaries.c:240
+#: src/prefs_summaries.c:561
 msgid "Date format"
 msgstr "Format tanggal"
 
-#: src/prefs_summaries.c:215
+#: src/prefs_summaries.c:216
 msgid "Specifier"
 msgstr "Penentu"
 
-#: src/prefs_summaries.c:257
+#: src/prefs_summaries.c:258
 msgid "Example"
 msgstr "Contoh"
 
-#: src/prefs_summaries.c:360
-msgid "Display message number next to folder name"
+#: src/prefs_summaries.c:363
+#, fuzzy
+msgid "Display message count next to folder name"
 msgstr "Tampilkan jumlah pesan disebelah nama direktori"
 
-#: src/prefs_summaries.c:370
+#: src/prefs_summaries.c:373
 msgid "Unread messages"
 msgstr "Pesan belum dibaca"
 
-#: src/prefs_summaries.c:371
+#: src/prefs_summaries.c:374
 msgid "Unread and Total messages"
 msgstr "Total pesan dan Belum dibaca"
 
-#: src/prefs_summaries.c:381
+#: src/prefs_summaries.c:384
 msgid "Open last opened folder at start-up"
 msgstr "Buka direktori yang terakhir dibuka saat memulai"
 
-#: src/prefs_summaries.c:384
+#: src/prefs_summaries.c:387
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Singkatan nama newsgroup lebih panjang dari"
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:401
 msgid "letters"
 msgstr "huruf"
 
-#: src/prefs_summaries.c:416
+#: src/prefs_summaries.c:419
 msgid "Message list"
 msgstr "Daftar pesan"
 
-#: src/prefs_summaries.c:422
+#: src/prefs_summaries.c:425
+#, fuzzy
+msgid "Sort new folders by"
+msgstr "Peri_ksa direktori baru"
+
+#: src/prefs_summaries.c:433 src/prefs_summary_column.c:86
+msgid "Number"
+msgstr "Nomor"
+
+#: src/prefs_summaries.c:436
+#, fuzzy
+msgid "Thread date"
+msgstr "Berdasar Tanggal thread"
+
+#: src/prefs_summaries.c:447
+#, fuzzy
+msgid "Don't sort"
+msgstr "Jangan _urutkan"
+
+#: src/prefs_summaries.c:464
 msgid "Set default selection when entering a folder"
 msgstr "Atur pilihan standar ketika memasuki sebuah direktori"
 
-#: src/prefs_summaries.c:435
+#: src/prefs_summaries.c:477
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Tampilkan jendela \"tidak ada pesan yang belum dibaca (atau baru)\""
 
-#: src/prefs_summaries.c:445
+#: src/prefs_summaries.c:487
 msgid "Assume 'Yes'"
 msgstr "Asumsi 'Ya'"
 
-#: src/prefs_summaries.c:446
+#: src/prefs_summaries.c:488
 msgid "Assume 'No'"
 msgstr "Asumsi 'Tidak'"
 
-#: src/prefs_summaries.c:454
+#: src/prefs_summaries.c:496
 msgid "Open message when selected"
 msgstr "Buka pesan jika terpilih"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:506
 msgid "When message view is visible"
 msgstr "Ketika tampilan pesan tampak"
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:512
 msgid "Thread using subject in addition to standard headers"
 msgstr "Thread menggunakan subyek sebagai tambahan pada header standar"
 
-#: src/prefs_summaries.c:474
+#: src/prefs_summaries.c:516
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Jalankan secepatnya ketika memindahkan atau menghapus pesan"
 
-#: src/prefs_summaries.c:476
+#: src/prefs_summaries.c:518
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
@@ -17881,41 +17238,41 @@ msgstr ""
 "Tangguhkan pemindahan, penyalinan dan penghapusan pesan sampai anda memilih "
 "'Alat/Jalankan'"
 
-#: src/prefs_summaries.c:479
+#: src/prefs_summaries.c:521
 msgid "Mark message as read"
 msgstr "Tandai pesan sebagai telah dibaca"
 
-#: src/prefs_summaries.c:482
+#: src/prefs_summaries.c:524
 msgid "when selected, after"
 msgstr "ketika terpilih, setelah"
 
-#: src/prefs_summaries.c:502
+#: src/prefs_summaries.c:544
 msgid "only when opened in a new window, or replied to"
 msgstr "hanya ketika dibuka pada jendela baru, atau dibalas ke"
 
-#: src/prefs_summaries.c:509
+#: src/prefs_summaries.c:551
 msgid "Display sender using address book"
 msgstr "Tampilkan pengirim menggunakan buku alamat"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:555
 msgid "Show tooltips"
 msgstr "Tampilkan tips"
 
-#: src/prefs_summaries.c:539
+#: src/prefs_summaries.c:581
 msgid "Date format help"
 msgstr "Bantuan format tanggal"
 
-#: src/prefs_summaries.c:557
+#: src/prefs_summaries.c:599
 msgid "Confirm before marking all messages in a folder as read"
 msgstr ""
 "Konfirmasi sebelum menandai seluruh pesan dalam direktori sebagai telah "
 "dibaca"
 
-#: src/prefs_summaries.c:560
+#: src/prefs_summaries.c:602
 msgid "Translate header names"
 msgstr "Terjemahkan nama header"
 
-#: src/prefs_summaries.c:562
+#: src/prefs_summaries.c:604
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
@@ -17923,14 +17280,10 @@ msgstr ""
 "Tampilan dari header standar (seperti 'Dari:', 'Subyek:') akan diterjemahkan "
 "ke bahasa anda."
 
-#: src/prefs_summaries.c:679
+#: src/prefs_summaries.c:732
 msgid "Summaries"
 msgstr "Ringkasan"
 
-#: src/prefs_summary_column.c:86
-msgid "Number"
-msgstr "Nomor"
-
 #: src/prefs_summary_column.c:226
 msgid "Message list columns configuration"
 msgstr "Konfigurasi kolom daftar pesan"
@@ -18088,7 +17441,7 @@ msgstr "Cetakan aktif"
 msgid "Template"
 msgstr "Cetakan"
 
-#: 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 "Standar tema internal"
 
@@ -18195,54 +17548,54 @@ msgstr ""
 "Berkas %s gagal\n"
 "ketika memasang tema."
 
-#: src/prefs_themes.c:667
+#: src/prefs_themes.c:666
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d tema tersedia (%d pengguna, %d sistem, 1 internal)"
 
-#: src/prefs_themes.c:708
+#: src/prefs_themes.c:707
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Tema internal memiliki %d ikon"
 
-#: src/prefs_themes.c:714
+#: src/prefs_themes.c:713
 msgid "No info file available for this theme"
 msgstr "Tidak ada berkas informasi yang tersedia untuk tema ini"
 
-#: src/prefs_themes.c:732
+#: src/prefs_themes.c:731
 msgid "Error: couldn't get theme status"
 msgstr "Kesalahan: tidak dapat mengambil status tema"
 
-#: src/prefs_themes.c:756
+#: src/prefs_themes.c:755
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d berkas (%d ikon), ukuran: %s"
 
-#: src/prefs_themes.c:804
+#: src/prefs_themes.c:803
 msgid "Selector"
 msgstr "Pemilih"
 
-#: src/prefs_themes.c:815
+#: src/prefs_themes.c:814
 msgid "Install new..."
 msgstr "Pasang baru..."
 
-#: src/prefs_themes.c:820
+#: src/prefs_themes.c:819
 msgid "Get more..."
 msgstr "Ambil lainnya..."
 
-#: src/prefs_themes.c:831
+#: src/prefs_themes.c:830
 msgid "Information"
 msgstr "Informasi"
 
-#: src/prefs_themes.c:845
+#: src/prefs_themes.c:844
 msgid "Author: "
 msgstr "Pembuat: "
 
-#: src/prefs_themes.c:853
+#: src/prefs_themes.c:852
 msgid "URL:"
 msgstr "URL:"
 
-#: src/prefs_themes.c:895
+#: src/prefs_themes.c:894
 msgid "Preview"
 msgstr "Pratayang"
 
@@ -18391,28 +17744,28 @@ msgstr "Tidak ada informasi yang tersedia"
 msgid "No recipient keys defined."
 msgstr "Tidak ada kunci penerima yang ditetapkan."
 
-#: 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 "[Salah menyandikan BASE64]\n"
 
-#: src/procmsg.c:937 src/procmsg.c:940
+#: src/procmsg.c:936 src/procmsg.c:939
 msgid "Already trying to send."
 msgstr "Sudah mencoba untuk kirim."
 
-#: 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 "Tidak dapat membuka berkas %s."
 
-#: src/procmsg.c:1619
+#: src/procmsg.c:1626
 msgid "Queued message header is broken."
 msgstr "Header pesan yang antri rusak."
 
-#: src/procmsg.c:1639
+#: src/procmsg.c:1646
 msgid "An error happened during SMTP session."
 msgstr "Terjadi kesalahan selama sesi SMTP."
 
-#: src/procmsg.c:1653
+#: src/procmsg.c:1660
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -18420,7 +17773,7 @@ msgstr ""
 "Tidak ada akun spesifik yang telah ditemukan untuk kirim, dan terjadi "
 "kesalahan selama sesi SMTP."
 
-#: src/procmsg.c:1661
+#: src/procmsg.c:1668
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -18428,20 +17781,20 @@ msgstr ""
 "Tidak dapat menentukan informasi pengiriman. Mungkin email belum dihasilkan "
 "oleh Claws Mail."
 
-#: src/procmsg.c:1683
+#: src/procmsg.c:1690
 msgid "Couldn't create temporary file for news sending."
 msgstr "Tidak dapat membuat berkas sementara untuk pengiriman berita."
 
-#: src/procmsg.c:1696
+#: src/procmsg.c:1703
 msgid "Error when writing temporary file for news sending."
 msgstr "Salah ketika menulis berkas sementara untuk pengiriman berita."
 
-#: src/procmsg.c:1710
+#: src/procmsg.c:1717
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Kesalahan terjadi ketika mengirimkan pesan ke %s."
 
-#: src/procmsg.c:2262
+#: src/procmsg.c:2269
 msgid "Filtering messages...\n"
 msgstr "Menyaring pesan...\n"
 
@@ -18740,97 +18093,97 @@ msgstr "Pada bagian \"Tanda kutipan\" di cetakan \"Balas\" salah."
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "Pada bagian \"Tanda kutipan\" di cetakan \"Teruskan\" salah."
 
-#: src/quote_fmt_parse.y:509
+#: src/quote_fmt_parse.y:541
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Masukkan teks untuk mengganti '%s'"
 
-#: src/quote_fmt_parse.y:510
+#: src/quote_fmt_parse.y:542
 msgid "Enter variable"
 msgstr "Masukkan variabel"
 
-#: src/send_message.c:152
+#: src/send_message.c:153
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Mengirim pesan menggunakan perintah: %s\n"
 
-#: src/send_message.c:166
+#: src/send_message.c:167
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Tidak dapat menjalankan perintah: %s"
 
-#: src/send_message.c:201
+#: src/send_message.c:202
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Terjadi kesalahan ketika menjalankan perintah: %s"
 
-#: src/send_message.c:348
+#: src/send_message.c:350
 msgid "Connecting"
 msgstr "Menyambung"
 
-#: src/send_message.c:353
+#: src/send_message.c:355
 msgid "Doing POP before SMTP..."
 msgstr "Menjalankan POP sebelum SMTP..."
 
-#: src/send_message.c:356
+#: src/send_message.c:358
 msgid "POP before SMTP"
 msgstr "POP sebelum SMTP"
 
-#: src/send_message.c:361
+#: src/send_message.c:363
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Akun '%s': Menyambung ke server SMTP: %s:%d..."
 
-#: src/send_message.c:418
+#: src/send_message.c:420
 msgid "Mail sent successfully."
 msgstr "Pesan terkirim dengan sukses."
 
-#: src/send_message.c:484
+#: src/send_message.c:486
 msgid "Sending HELO..."
 msgstr "Mengirim HELO..."
 
-#: src/send_message.c:485 src/send_message.c:490 src/send_message.c:495
+#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
 msgid "Authenticating"
 msgstr "Otentifikasi"
 
-#: src/send_message.c:486 src/send_message.c:491
+#: src/send_message.c:488 src/send_message.c:493
 msgid "Sending message..."
 msgstr "Mengirim pesan..."
 
-#: src/send_message.c:489
+#: src/send_message.c:491
 msgid "Sending EHLO..."
 msgstr "Mengirim EHLO..."
 
-#: src/send_message.c:498
+#: src/send_message.c:500
 msgid "Sending MAIL FROM..."
 msgstr "Mengirim MAIL FROM..."
 
-#: src/send_message.c:502
+#: src/send_message.c:504
 msgid "Sending RCPT TO..."
 msgstr "Mengirim RCPT TO..."
 
-#: src/send_message.c:507
+#: src/send_message.c:509
 msgid "Sending DATA..."
 msgstr "Mengirim DATA..."
 
-#: src/send_message.c:511
+#: src/send_message.c:513
 msgid "Quitting..."
 msgstr "Mengakhiri..."
 
-#: src/send_message.c:540
+#: src/send_message.c:542
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Mengirim pesan (%d / %d bytes)"
 
-#: src/send_message.c:593
+#: src/send_message.c:595
 msgid "Sending message"
 msgstr "Mengirim pesan"
 
-#: src/send_message.c:662 src/send_message.c:682
+#: src/send_message.c:664 src/send_message.c:684
 msgid "Error occurred while sending the message."
 msgstr "Terjadi kesalahan ketika mengirimkan pesan."
 
-#: src/send_message.c:665
+#: src/send_message.c:667
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18864,15 +18217,15 @@ msgstr "Sumber dari pesan"
 msgid "%s - Source"
 msgstr "%s - Sumber"
 
-#: src/ssl_manager.c:157
+#: src/ssl_manager.c:156
 msgid "Saved SSL certificates"
 msgstr "Sertifikat SSL yang tersimpan"
 
-#: src/ssl_manager.c:431
+#: src/ssl_manager.c:436
 msgid "Delete certificate"
 msgstr "Hapus sertifikat"
 
-#: src/ssl_manager.c:432
+#: src/ssl_manager.c:437
 msgid "Do you really want to delete this certificate?"
 msgstr "Apakah anda ingin menghapus sertifikat?"
 
@@ -18900,7 +18253,7 @@ msgstr "Kondisi:"
 msgid "Find _all"
 msgstr "C_ari semua"
 
-#: src/summary_search.c:690 src/summaryview.c:1108 src/summaryview.c:1369
+#: src/summary_search.c:690 src/summaryview.c:1086 src/summaryview.c:1347
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Mencari dalam %s... \n"
@@ -18913,272 +18266,287 @@ msgstr "Bagian awal daftar telah dicapai; lanjutkan dari akhir?"
 msgid "End of list reached; continue from beginning?"
 msgstr "Baigan akhir daftar telah dicapai; lanjutkan dari awal?"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:429
 msgid "Create _filter rule"
 msgstr "Buat atu_ran penyaringan"
 
-#: src/summaryview.c:558
+#: src/summaryview.c:557
 msgid "Toggle quick search bar"
 msgstr "Toggle papan pencarian cepat"
 
-#: src/summaryview.c:595
+#: src/summaryview.c:594
 msgid "Toggle multiple selection"
 msgstr "Toggle multi pilihan"
 
-#: src/summaryview.c:1297
+#: src/summaryview.c:1275
 msgid "Process mark"
 msgstr "Tanda proses"
 
-#: src/summaryview.c:1298
+#: src/summaryview.c:1276
 msgid "Some marks are left. Process them?"
 msgstr "Beberapa tanda tertinggal. Proses tanda tersebut?"
 
-#: src/summaryview.c:1348
+#: src/summaryview.c:1326
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Memindai direktori (%s)..."
 
-#: src/summaryview.c:1845 src/summaryview.c:1897
+#: src/summaryview.c:1823 src/summaryview.c:1875
 msgid "No more unread messages"
 msgstr "Tidak ada lagi pesan yang belum dibaca"
 
-#: src/summaryview.c:1846
+#: src/summaryview.c:1824
 msgid "No unread message found. Search from the end?"
 msgstr "Tidak ada pesan yang belum dibaca. Mulai cari dari akhir?"
 
-#: src/summaryview.c:1858 src/summaryview.c:1910 src/summaryview.c:1953
-#: src/summaryview.c:2005 src/summaryview.c:2084
+#: 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 ""
 "Kesalahan internal: nilai yang tidak diharapkan untuk prefs_common."
 "next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1866
+#: src/summaryview.c:1844
 msgid "No unread messages."
 msgstr "Tidak ada pesan yang belum dibaca."
 
-#: src/summaryview.c:1898
+#: src/summaryview.c:1876
 msgid "No unread message found. Go to next folder?"
 msgstr "Tidak ada pesan yang belum dibaca. Ke direktori berikutnya?"
 
-#: src/summaryview.c:1940 src/summaryview.c:1992
+#: src/summaryview.c:1918 src/summaryview.c:1970
 msgid "No more new messages"
 msgstr "Tidak ada lagi pesan baru"
 
-#: src/summaryview.c:1941
+#: src/summaryview.c:1919
 msgid "No new message found. Search from the end?"
 msgstr "Tidak ada pesan baru yang ditemukan. Mulai cari dari akhir?"
 
-#: src/summaryview.c:1961
+#: src/summaryview.c:1939
 msgid "No new messages."
 msgstr "Tidak ada pesan baru."
 
-#: src/summaryview.c:1993
+#: src/summaryview.c:1971
 msgid "No new message found. Go to next folder?"
 msgstr "Tidak ada pesan baru yang ditemukan. Ke direktori berikutnya?"
 
-#: src/summaryview.c:2030 src/summaryview.c:2071
+#: src/summaryview.c:2008 src/summaryview.c:2049
 msgid "No more marked messages"
 msgstr "Tidak ada lagi pesan yang ditandai"
 
-#: src/summaryview.c:2031
+#: src/summaryview.c:2009
 msgid "No marked message found. Search from the end?"
 msgstr "Tidak ada pesan ditandai yang ditemukan. Mulai cari dari akhir?"
 
-#: src/summaryview.c:2040
+#: src/summaryview.c:2018
 msgid "No marked messages."
 msgstr "Tidak ada pesan ditandai."
 
-#: src/summaryview.c:2072
+#: src/summaryview.c:2050
 msgid "No marked message found. Go to next folder?"
 msgstr "Tidak ada pesan ditandai yang ditemukan. Ke direktori berikutnya?"
 
-#: src/summaryview.c:2109 src/summaryview.c:2134
+#: src/summaryview.c:2087 src/summaryview.c:2112
 msgid "No more labeled messages"
 msgstr "Tidak ada lagi pesan dilabeli"
 
-#: src/summaryview.c:2110
+#: src/summaryview.c:2088
 msgid "No labeled message found. Search from the end?"
 msgstr "Tidak ada pesan dilabeli yang ditemukan. Mulai cari dari akhir?"
 
-#: src/summaryview.c:2119 src/summaryview.c:2144
+#: src/summaryview.c:2097 src/summaryview.c:2122
 msgid "No labeled messages."
 msgstr "Tidak ada pesan dilabeli."
 
-#: src/summaryview.c:2135
+#: src/summaryview.c:2113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Tidak ada pesan dilabeli yang ditemukan. Mulai cari dari awal?"
 
-#: src/summaryview.c:2449
+#: src/summaryview.c:2427
 msgid "Attracting messages by subject..."
 msgstr "Menarik pesan berdasar subyek..."
 
-#: src/summaryview.c:2634
+#: src/summaryview.c:2612
 #, c-format
 msgid "%d deleted"
 msgstr "%d dihapus"
 
-#: src/summaryview.c:2638
+#: src/summaryview.c:2616
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d dipindahkan"
 
-#: src/summaryview.c:2639 src/summaryview.c:2646
+#: src/summaryview.c:2617 src/summaryview.c:2624
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:2644
+#: src/summaryview.c:2622
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d disalin"
 
-#: src/summaryview.c:2658
-msgid " item selected"
-msgid_plural " items selected"
-msgstr[0] " item yg dipilih"
-msgstr[1] " item yg dipilih"
+#: src/summaryview.c:2636
+msgid " item selected"
+msgid_plural " items selected"
+msgstr[0] " item yg dipilih"
+msgstr[1] " item yg dipilih"
+
+#: src/summaryview.c:2654 src/summaryview.c:2697
+#, c-format
+msgid "%d new, %d unread, %d total (%s)"
+msgstr "%d baru, %d belum dibaca, %d total (%s)"
+
+#: src/summaryview.c:2672
+#, fuzzy
+msgid "Message summary"
+msgstr "Bagian pesan"
+
+#: src/summaryview.c:2673
+msgid "New:"
+msgstr ""
+
+#: src/summaryview.c:2674
+#, fuzzy
+msgid "Unread:"
+msgstr "Belum dibaca"
+
+#: src/summaryview.c:2675
+#, fuzzy
+msgid "Total:"
+msgstr "Total"
+
+#: src/summaryview.c:2677
+#, fuzzy
+msgid "Marked:"
+msgstr "Ditandai"
+
+#: src/summaryview.c:2678
+#, fuzzy
+msgid "Replied:"
+msgstr "Dibalas"
+
+#: src/summaryview.c:2679
+#, fuzzy
+msgid "Forwarded:"
+msgstr "Diteruskan"
 
-#: src/summaryview.c:2676 src/summaryview.c:2712
-#, c-format
-msgid "%d new, %d unread, %d total (%s)"
-msgstr "%d baru, %d belum dibaca, %d total (%s)"
+#: src/summaryview.c:2680
+#, fuzzy
+msgid "Locked:"
+msgstr "Dikunci"
 
-#: src/summaryview.c:2683
-#, c-format
-msgid ""
-"<b>Message summary</b>\n"
-"<b>New:</b> %d\n"
-"<b>Unread:</b> %d\n"
-"<b>Total:</b> %d\n"
-"<b>Size:</b> %s\n"
-"\n"
-"<b>Marked:</b> %d\n"
-"<b>Replied:</b> %d\n"
-"<b>Forwarded:</b> %d\n"
-"<b>Locked:</b> %d\n"
-"<b>Ignored:</b> %d\n"
-"<b>Watched:</b> %d"
-msgstr ""
-"<b>Ringkasan pesan</b>\n"
-"<b>Baru:</b> %d\n"
-"<b>Belum dibaca:</b> %d\n"
-"<b>Total:</b> %d\n"
-"<b>Ukuran:</b> %s\n"
-"\n"
-"<b>Ditandai:</b> %d\n"
-"<b>Dibalas:</b> %d\n"
-"<b>Diteruskan:</b> %d\n"
-"<b>Dikunci:</b> %d\n"
-"<b>Diabaikan:</b> %d\n"
-"<b>Diawasi:</b> %d"
+#: src/summaryview.c:2681
+#, fuzzy
+msgid "Ignored:"
+msgstr "diabaikan"
+
+#: src/summaryview.c:2682
+#, fuzzy
+msgid "Watched:"
+msgstr "diawasi"
 
-#: src/summaryview.c:2707
+#: src/summaryview.c:2692
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d dipilih (%s/%s), %d belum dibaca"
 
-#: src/summaryview.c:2989
+#: src/summaryview.c:2972
 msgid "Sorting summary..."
 msgstr "Mengurutkan ringkasan..."
 
-#: src/summaryview.c:3128
+#: src/summaryview.c:3111
 msgid "Setting summary from message data..."
 msgstr "Mengatur ringkasan dari data pesan..."
 
-#: src/summaryview.c:3333
+#: src/summaryview.c:3316
 msgid "(No Date)"
 msgstr "(Tanpa Tanggal)"
 
-#: src/summaryview.c:3385
+#: src/summaryview.c:3368
 msgid "(No Recipient)"
 msgstr "(Tanpa Penerima)"
 
-#: src/summaryview.c:3420
+#: src/summaryview.c:3403
 #, c-format
-msgid ""
-"%s\n"
-"<span color='%s' style='italic'>From: %s, on %s</span>"
+msgid "From: %s, on %s"
 msgstr ""
-"%s\n"
-"<span color='%s' style='italic'>Dari: %s, pada %s</span>"
 
-#: src/summaryview.c:3427
+#: src/summaryview.c:3412
 #, c-format
-msgid ""
-"%s\n"
-"<span color='%s' style='italic'>To: %s, on %s</span>"
+msgid "To: %s, on %s"
 msgstr ""
-"%s\n"
-"<span color='%s' style='italic'>Kepada: %s, pada %s</span>"
 
-#: src/summaryview.c:4304
+#: src/summaryview.c:4291
 msgid "You're not the author of the article.\n"
 msgstr "Anda bukan pengarang artikel tersebut.\n"
 
-#: src/summaryview.c:4397
+#: 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] "Apakah anda ingin menghapus pesan terpilih?"
 msgstr[1] "Apakah anda ingin menghapus %d pesan terpilih?"
 
-#: src/summaryview.c:4400
-msgid "Delete message(s)"
-msgstr "Hapus pesan"
+#: src/summaryview.c:4384
+#, fuzzy
+msgid "Delete message"
+msgid_plural "Delete messages"
+msgstr[0] "Hapus Pesan"
+msgstr[1] "Hapus Pesan"
 
-#: src/summaryview.c:4563
+#: src/summaryview.c:4548
 msgid "Destination is same as current folder."
 msgstr "Tujuannya sama dengan direktori aktif."
 
-#: src/summaryview.c:4661
+#: src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Tujuan penyalinan sama dengan direktori aktif."
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4818
 msgid "Append or Overwrite"
 msgstr "Tambah atau Timpa"
 
-#: src/summaryview.c:4824
+#: src/summaryview.c:4819
 msgid "Append or overwrite existing file?"
 msgstr "Tambah atau timpa berkas yang ada?"
 
-#: src/summaryview.c:4825
+#: src/summaryview.c:4820
 msgid "_Append"
 msgstr "_Tambah"
 
-#: src/summaryview.c:4825
+#: src/summaryview.c:4820
 msgid "_Overwrite"
 msgstr "T_impa"
 
-#: src/summaryview.c:4866
+#: src/summaryview.c:4861
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 "Anda akan mencetak %d pesan, satu per satu. Apakah anda akan melanjutkan?"
 
-#: src/summaryview.c:5345
+#: src/summaryview.c:5321
 msgid "Building threads..."
 msgstr "Membangun utas..."
 
-#: src/summaryview.c:5593
+#: src/summaryview.c:5569
 msgid "Skip these rules"
 msgstr "Abaikan aturan ini"
 
-#: src/summaryview.c:5596
+#: src/summaryview.c:5572
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Terapkan aturan berikut tanpa memperhatikan akun"
 
-#: src/summaryview.c:5599
+#: src/summaryview.c:5575
 msgid "Apply these rules if they apply to the current account"
 msgstr "Terapkan aturan berikut jika hanya berlaku untuk akun aktif"
 
-#: src/summaryview.c:5628
+#: src/summaryview.c:5604
 msgid "Filtering"
 msgstr "Penyaringan"
 
-#: src/summaryview.c:5629
+#: src/summaryview.c:5605
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19186,59 +18554,55 @@ msgstr ""
 "Terdapat beberapa aturan penyaringan yang menjadi milik sebuah akun.\n"
 "Silahkan pilih yang akan dilakukan oleh aturan berikut:"
 
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_Saring"
-
-#: src/summaryview.c:5659
+#: src/summaryview.c:5635
 msgid "Filtering..."
 msgstr "Penyaringan..."
 
-#: src/summaryview.c:5738
+#: src/summaryview.c:5714
 msgid "Processing configuration"
 msgstr "Konfigurasi pemrosesan"
 
-#: src/summaryview.c:6286
+#: src/summaryview.c:6260
 msgid "Ignored thread"
 msgstr "Thread diabaikan"
 
-#: src/summaryview.c:6288
+#: src/summaryview.c:6262
 msgid "Watched thread"
 msgstr "Thread diawasi"
 
-#: src/summaryview.c:6296
+#: src/summaryview.c:6270
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Telah dibalas dan juga diteruskan - klik untuk melihat balasan"
 
-#: src/summaryview.c:6298
+#: src/summaryview.c:6272
 msgid "Replied - click to see reply"
 msgstr "Terbalas - klik untuk melihat balasan"
 
-#: src/summaryview.c:6310
+#: src/summaryview.c:6284
 msgid "To be moved"
 msgstr "Akan dipindah"
 
-#: src/summaryview.c:6312
+#: src/summaryview.c:6286
 msgid "To be copied"
 msgstr "Akan disalin"
 
-#: src/summaryview.c:6324
+#: src/summaryview.c:6298
 msgid "Signed, has attachment(s)"
 msgstr "Tertanda, memiliki lampiran"
 
-#: src/summaryview.c:6328
+#: src/summaryview.c:6302
 msgid "Encrypted, has attachment(s)"
 msgstr "Terenkripsi, memiliki lampiran"
 
-#: src/summaryview.c:6330
+#: src/summaryview.c:6304
 msgid "Encrypted"
 msgstr "Terenkripsi"
 
-#: src/summaryview.c:6332
+#: src/summaryview.c:6306
 msgid "Has attachment(s)"
 msgstr "Memiliki lampiran"
 
-#: src/summaryview.c:7940
+#: src/summaryview.c:7953
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19247,39 +18611,39 @@ msgstr ""
 "Kesalahan ekspresi reguler (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8045
+#: src/summaryview.c:8056
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Kembali ke daftar direktori (Anda memiliki pesan yang belum dibaca)"
 
-#: src/summaryview.c:8050
+#: src/summaryview.c:8061
 msgid "Go back to the folder list"
 msgstr "Kembali ke daftar direktori"
 
-#: src/textview.c:232
+#: src/textview.c:231
 msgid "_Open in web browser"
 msgstr "_Buka di perambah web"
 
-#: src/textview.c:233
+#: src/textview.c:232
 msgid "Copy this _link"
 msgstr "Salin _tautan ini"
 
-#: src/textview.c:240
+#: src/textview.c:239
 msgid "_Reply to this address"
 msgstr "_Balas ke alamat ini"
 
-#: src/textview.c:241
+#: src/textview.c:240
 msgid "Add to _Address book"
 msgstr "Tambah ke Buku _Alamat"
 
-#: src/textview.c:242
+#: src/textview.c:241
 msgid "Copy this add_ress"
 msgstr "Salin alama_t ini"
 
-#: src/textview.c:248
+#: src/textview.c:247
 msgid "_Open image"
 msgstr "_Buka gambar"
 
-#: src/textview.c:249
+#: src/textview.c:248
 msgid "_Save image..."
 msgstr "_Simpan gambar..."
 
@@ -19293,7 +18657,7 @@ msgstr "[%s  %s (%d bytes)]"
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
-#: src/textview.c:904
+#: src/textview.c:914
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19307,68 +18671,68 @@ msgstr ""
 "\n"
 "  Gunakan "
 
-#: src/textview.c:909
+#: src/textview.c:919
 msgid "'Network Log'"
 msgstr "'Catatan Jaringan'"
 
-#: src/textview.c:910
+#: src/textview.c:920
 msgid " in the Tools menu for more information."
 msgstr " dalam menu Alat untuk informasi lebih lanjut."
 
-#: src/textview.c:973
+#: src/textview.c:983
 msgid "  The following can be performed on this part\n"
 msgstr "  Hal berikut dapat dilakukan pada bagian ini\n"
 
-#: src/textview.c:975
+#: src/textview.c:985
 msgid "  by right-clicking the icon or list item:"
 msgstr "  dengan klik kanan ikon atau daftar item:"
 
-#: src/textview.c:979
+#: src/textview.c:989
 msgid "     - To save, select "
 msgstr "     - Untuk simpan, pilih "
 
-#: src/textview.c:980
+#: src/textview.c:990
 msgid "'Save as...'"
 msgstr "'Simpan sebagai...'"
 
-#: src/textview.c:982 src/textview.c:994 src/textview.c:1006
-#: src/textview.c:1016
+#: src/textview.c:992 src/textview.c:1004 src/textview.c:1016
+#: src/textview.c:1026
 msgid " (Shortcut key: '"
 msgstr " (Tombol pintas: '"
 
-#: src/textview.c:990
+#: src/textview.c:1000
 msgid "     - To display as text, select "
 msgstr "     - Untuk ditampilkan sebagai teks, pilih "
 
-#: src/textview.c:991
+#: src/textview.c:1001
 msgid "'Display as text'"
 msgstr "'Tampilkan sebagai teks'"
 
-#: src/textview.c:1002
+#: src/textview.c:1012
 msgid "     - To open with an external program, select "
 msgstr "     - Untuk membuka dengan program eksternal, pilih "
 
-#: src/textview.c:1003
+#: src/textview.c:1013
 msgid "'Open'"
 msgstr "'Buka'"
 
-#: src/textview.c:1011
+#: src/textview.c:1021
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (secara alternatif klik ganda, atau klik tengah "
 
-#: src/textview.c:1012
+#: src/textview.c:1022
 msgid "mouse button)\n"
 msgstr "tombol tetikus)\n"
 
-#: src/textview.c:1014
+#: src/textview.c:1024
 msgid "     - Or use "
 msgstr "     - Atau gunakan "
 
-#: src/textview.c:1015
+#: src/textview.c:1025
 msgid "'Open with...'"
 msgstr "'Buka dengan...'"
 
-#: src/textview.c:1127
+#: src/textview.c:1139
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -19379,20 +18743,13 @@ msgstr ""
 "    %s\n"
 "Kode keluar %d\n"
 
-#: src/textview.c:2172
+#: src/textview.c:2188
 msgid "Tags: "
 msgstr "Tags: "
 
-#: src/textview.c:2874
-#, c-format
-msgid ""
-"The real URL is different from the displayed URL.\n"
-"\n"
-"<b>Displayed URL:</b> %s\n"
-"\n"
-"<b>Real URL:</b> %s\n"
-"\n"
-"Open it anyway?"
+#: src/textview.c:2894
+#, fuzzy
+msgid "The real URL is different from the displayed URL."
 msgstr ""
 "URL sebenarnya berbeda dengan URL yang ditampilkan.\n"
 "\n"
@@ -19402,11 +18759,26 @@ msgstr ""
 "\n"
 "Tetap buka saja?"
 
-#: src/textview.c:2883
+#: src/textview.c:2895
+#, fuzzy
+msgid "Displayed URL:"
+msgstr "Tampilan"
+
+#: src/textview.c:2896
+#, fuzzy
+msgid "Real URL:"
+msgstr "URL:"
+
+#: src/textview.c:2897
+#, fuzzy
+msgid "Open it anyway?"
+msgstr "Lanjutkan pengiriman?"
+
+#: src/textview.c:2898
 msgid "Phishing attempt warning"
 msgstr "Peringatan percobaan phishing"
 
-#: src/textview.c:2884
+#: src/textview.c:2899
 msgid "_Open URL"
 msgstr "_Buka URL"
 
@@ -19838,23 +19210,26 @@ msgstr "Silahkan masukkan server SMTP anda."
 msgid "Please enter your SMTP username."
 msgstr "Silahkan masukkan nama pengguna SMTP anda."
 
-#: src/wizard.c:969
-msgid "<span weight=\"bold\">Your name:</span>"
-msgstr "<span weight=\"bold\">Nama anda:</span>"
+#: src/wizard.c:975
+#, fuzzy
+msgid "Your name:"
+msgstr "Nama pencarian:"
 
-#: src/wizard.c:979
-msgid "<span weight=\"bold\">Your email address:</span>"
-msgstr "<span weight=\"bold\">Alamat email anda:</span>"
+#: src/wizard.c:986
+#, fuzzy
+msgid "Your email address:"
+msgstr "Alamat surat"
 
-#: src/wizard.c:989
+#: src/wizard.c:997
 msgid "Your organization:"
 msgstr "Organisasi anda:"
 
-#: src/wizard.c:1022
-msgid "<span weight=\"bold\">Mailbox name:</span>"
-msgstr "<span weight=\"bold\">Nama kotaksurat:</span>"
+#: src/wizard.c:1031
+#, fuzzy
+msgid "Mailbox name:"
+msgstr "Kotaksurat"
 
-#: src/wizard.c:1030
+#: src/wizard.c:1039
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19862,7 +19237,7 @@ msgstr ""
 "Anda dapat juga menentukan lokasi absolut, contoh: \"/rumah/john/Dokumen/"
 "Surat\""
 
-#: src/wizard.c:1101
+#: src/wizard.c:1110
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19870,55 +19245,60 @@ msgstr ""
 "Anda dapat menentukan nomor port dengan menambahkannya di akhir:\"surat."
 "contoh.com:25\""
 
-#: src/wizard.c:1104
-msgid "<span weight=\"bold\">SMTP server address:</span>"
-msgstr "<span weight=\"bold\">alamat server SMTP:</span>"
+#: src/wizard.c:1113
+#, fuzzy
+msgid "SMTP server address:"
+msgstr "Server smtp (kirim)"
 
-#: src/wizard.c:1110
+#: src/wizard.c:1119
 msgid "Use authentication"
 msgstr "Gunakan otentifikasi"
 
-#: src/wizard.c:1118
-msgid "<span size=\"small\">(empty to use the same as receive)</span>"
+#: src/wizard.c:1128
+#, fuzzy
+msgid "(empty to use the same as receive)"
 msgstr "<span size=\"small\">(kosongkan jika sama dengan terima)</span>"
 
-#: src/wizard.c:1132
+#: src/wizard.c:1142
 msgid "SMTP username:"
 msgstr "Nama pengguna SMTP:"
 
-#: src/wizard.c:1143
+#: src/wizard.c:1153
 msgid "SMTP password:"
 msgstr "Sandi SMTP:"
 
-#: src/wizard.c:1156
+#: src/wizard.c:1166
 msgid "Use SSL to connect to SMTP server"
 msgstr "Gunakan SSL untuk menyambung ke server SMTP"
 
-#: src/wizard.c:1167 src/wizard.c:1582
+#: src/wizard.c:1177 src/wizard.c:1597
 msgid "Use SSL via STARTTLS"
 msgstr "Gunakan SSL melalui STARTTLS"
 
-#: src/wizard.c:1179 src/wizard.c:1594
+#: src/wizard.c:1189 src/wizard.c:1609
 msgid "Client SSL certificate (optional)"
 msgstr "Sertifikat SSL klien (pilihan)"
 
-#: src/wizard.c:1246 src/wizard.c:1276 src/wizard.c:1530
-msgid "<span weight=\"bold\">Server address:</span>"
-msgstr "<span weight=\"bold\">Alamat server:</span>"
+#: src/wizard.c:1257 src/wizard.c:1289 src/wizard.c:1544
+#, fuzzy
+msgid "Server address:"
+msgstr "Nama Server :"
 
-#: src/wizard.c:1306
-msgid "<span weight=\"bold\">Local mailbox:</span>"
-msgstr "<span weight=\"bold\">Kotaksurat lokal:</span>"
+#: src/wizard.c:1321
+#, fuzzy
+msgid "Local mailbox:"
+msgstr "Kotaksurat lokal"
 
-#: src/wizard.c:1497
-msgid "<span weight=\"bold\">Server type:</span>"
-msgstr "<span weight=\"bold\">Tipe server:</span>"
+#: src/wizard.c:1490
+#, fuzzy
+msgid "Server type:"
+msgstr "Nama Server :"
 
-#: src/wizard.c:1507
+#: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1541
+#: src/wizard.c:1555
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19926,39 +19306,36 @@ msgstr ""
 "Anda dapat menentukan nomor port dengan menambahkan di akhir: \"surat.contoh."
 "com:110\""
 
-#: src/wizard.c:1546
-msgid "<span weight=\"bold\">Username:</span>"
-msgstr "<span weight=\"bold\">Nama pengguna:</span>"
-
-#: src/wizard.c:1571
+#: src/wizard.c:1586
 msgid "Use SSL to connect to receiving server"
 msgstr "Gunakan SSL untuk menyambung ke server penerimaan"
 
-#: src/wizard.c:1636
+#: src/wizard.c:1651
 msgid "IMAP server directory:"
 msgstr "Direktori server IMAP:"
 
-#: src/wizard.c:1647
+#: src/wizard.c:1662
 msgid "Show only subscribed folders"
 msgstr "Tampilkan direktori terdaftar saja"
 
-#: src/wizard.c:1655
+#: src/wizard.c:1670
+#, fuzzy
 msgid ""
-"<span weight=\"bold\">Warning: this version of Claws Mail\n"
-"has been built without IMAP support.</span>"
+"Warning: this version of Claws Mail\n"
+"has been built without IMAP support."
 msgstr ""
 "<span weight=\"bold\">Peringatan: versi Claws Mail ini\n"
 "telah dibangun tanpa dukungan IMAP.</span>"
 
-#: src/wizard.c:1773
+#: src/wizard.c:1788
 msgid "Claws Mail Setup Wizard"
 msgstr "Pengaturan berpandu Claws Mail"
 
-#: src/wizard.c:1807
+#: src/wizard.c:1822
 msgid "Welcome to Claws Mail"
 msgstr "Selamat datang di Claws Mail"
 
-#: src/wizard.c:1815
+#: src/wizard.c:1829
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19972,31 +19349,31 @@ msgstr ""
 "dan pilihan umum surat anda sehingga anda dapat mulai menggunakan Claws Mail "
 "dalam kurang dari lima menit."
 
-#: src/wizard.c:1828
+#: src/wizard.c:1842
 msgid "About You"
 msgstr "Tentang Anda"
 
-#: src/wizard.c:1836 src/wizard.c:1851 src/wizard.c:1866 src/wizard.c:1882
+#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
 msgid "Bold fields must be completed"
 msgstr "Kolom tebal harus diisi"
 
-#: src/wizard.c:1843
+#: src/wizard.c:1857
 msgid "Receiving mail"
 msgstr "Menerima surat"
 
-#: src/wizard.c:1858
+#: src/wizard.c:1872
 msgid "Sending mail"
 msgstr "Mengirim surat"
 
-#: src/wizard.c:1874
+#: src/wizard.c:1888
 msgid "Saving mail on disk"
 msgstr "Menyimpan surat pada disk"
 
-#: src/wizard.c:1890
+#: src/wizard.c:1904
 msgid "Configuration finished"
 msgstr "Konfigurasi selesai"
 
-#: src/wizard.c:1898
+#: src/wizard.c:1911
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -20005,6 +19382,446 @@ msgstr ""
 "Klik Simpan untuk memulai."
 
 #, fuzzy
+#~ msgid "Failed to register avatars internal rendering hook"
+#~ msgstr "Gagal untuk registrasi kaitan render gambar avatar"
+
+#~ msgid "%s: host lookup timed out.\n"
+#~ msgstr "%s: waktu pencarian host habis.\n"
+
+#~ msgid "%s: unknown host.\n"
+#~ msgstr "%s: host tidak diketahui.\n"
+
+#~ msgid "+_Insert"
+#~ msgstr "+_Sisip"
+
+#~ msgid "+_Send"
+#~ msgstr "+_Kirim"
+
+#, fuzzy
+#~ msgid "<i>%s</i>"
+#~ msgstr "Dari: <i>%s</i>"
+
+#~ msgid "+_Save to Drafts"
+#~ msgstr "+-Simpan sebagai Konsep"
+
+#~ msgid ""
+#~ ">. \n"
+#~ "\n"
+#~ msgstr ""
+#~ ">. \n"
+#~ "\n"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Ganti \"%s\" dengan: </span>"
+
+#~ msgid "IMAP error on %s: authenticated\n"
+#~ msgstr "Kesalahan IMAP pada %s: diotentifikasi\n"
+
+#~ msgid "IMAP error on %s: not authenticated\n"
+#~ msgstr "Kesalahan IMAP pada %s: tidak diotentifikasi\n"
+
+#~ msgid "IMAP error on %s: stream error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan stream\n"
+
+#~ msgid "IMAP error on %s: connection refused\n"
+#~ msgstr "kesalahan IMAP pada %s: sambungan ditolak\n"
+
+#~ msgid "IMAP error on %s: memory error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan memori\n"
+
+#~ msgid "IMAP error on %s: fatal error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan fatal\n"
+
+#~ msgid "IMAP error on %s: APPEND error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan APPEND\n"
+
+#~ msgid "IMAP error on %s: NOOP error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan NOOP\n"
+
+#~ msgid "IMAP error on %s: LOGOUT error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan LOGOUT\n"
+
+#~ msgid "IMAP error on %s: CHECK error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan CHECK\n"
+
+#~ msgid "IMAP error on %s: CLOSE error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan CLOSE\n"
+
+#~ msgid "IMAP error on %s: EXPUNGE error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan EXPUNGE\n"
+
+#~ msgid "IMAP error on %s: COPY error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan COPY\n"
+
+#~ msgid "IMAP error on %s: UID COPY error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan UID COPY\n"
+
+#~ msgid "IMAP error on %s: CREATE error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan CREATE\n"
+
+#~ msgid "IMAP error on %s: DELETE error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan DELETE\n"
+
+#~ msgid "IMAP error on %s: EXAMINE error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan EXAMINE\n"
+
+#~ msgid "IMAP error on %s: FETCH error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan FETCH\n"
+
+#~ msgid "IMAP error on %s: LIST error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan LIST\n"
+
+#~ msgid "IMAP error on %s: LOGIN error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan LOGIN\n"
+
+#~ msgid "IMAP error on %s: LSUB error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan LSUB\n"
+
+#~ msgid "IMAP error on %s: RENAME error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan RENAME\n"
+
+#~ msgid "IMAP error on %s: SEARCH error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan SEARCH\n"
+
+#~ msgid "IMAP error on %s: SELECT error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan SELECT\n"
+
+#~ msgid "IMAP error on %s: STATUS error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan STATUS\n"
+
+#~ msgid "IMAP error on %s: STORE error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan STORE\n"
+
+#~ msgid "IMAP error on %s: STARTTLS error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan STARTTLS\n"
+
+#~ msgid "IMAP error on %s: INVAL error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan INVAL\n"
+
+#~ msgid "IMAP error on %s: SASL error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan SASL\n"
+
+#~ msgid "IMAP error on %s: SSL error\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan SSL\n"
+
+#~ msgid "IMAP error on %s: Unknown error [%d]\n"
+#~ msgstr "Kesalahan IMAP pada %s: kesalahan tidak dikenal [%d]\n"
+
+#~ msgid "New folder name must not contain the namespace path separator"
+#~ msgstr "Nama direktori baru tidak boleh mengandung pemisah nama lokasi"
+
+#~ msgid "+_Unsubscribe"
+#~ msgstr "+_Unsubscribe"
+
+#~ msgid "Failed to register folder item update hook"
+#~ msgstr "Gagal untuk registrasi item direktori kaitan baru"
+
+#~ msgid "Failed to register folder update hook"
+#~ msgstr "Gagal untuk registrasi direktori kaitan baru"
+
+#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
+#~ msgstr "Sylpheed-Claws 2.6.0 (atau lebih lama)"
+
+#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
+#~ msgstr "Sylpheed-Claws 1.9.15 (atau lebih lama)"
+
+#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
+#~ msgstr "Sylpheed-Claws 1.0.5 (atau lebih lama)"
+
+#~ msgid "_Other folder..."
+#~ msgstr "Direkt_ori lain..."
+
+#~ msgid "can't copy message %s to %s\n"
+#~ msgstr "tidak dapat menyalin pesan %s ke %s\n"
+
+#~ msgid "<b>Type: </b>"
+#~ msgstr "<b>Tipe: </b>"
+
+#~ msgid "<b>Size: </b>"
+#~ msgstr "<b>Ukuran: </b>"
+
+#~ msgid "<b>Filename: </b>"
+#~ msgstr "<b>Namaberkas: </b>"
+
+#~ msgid "failed to write Fetchinfo configuration to file\n"
+#~ msgstr "Gagal menulis konfigurasi PengambilInfo ke berkas\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "GData Plugin: Failed to write plugin configuration to file\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Pengaya GData: Gagal untuk menulis konfigurasi pengaya ke dalam berkas\n"
+
+#, fuzzy
+#~ msgid "Could not resolve location of IP address "
+#~ msgstr "Tidak dapat membaca indeks alamat"
+
+#, fuzzy
+#~ msgid "Try to locate sender"
+#~ msgstr "nama depan pengirim"
+
+#, fuzzy
+#~ msgid "Argentina"
+#~ msgstr "Magenta"
+
+#, fuzzy
+#~ msgid "China"
+#~ msgstr "China"
+
+#, fuzzy
+#~ msgid "Colombia"
+#~ msgstr "Warna"
+
+#, fuzzy
+#~ msgid "Denmark"
+#~ msgstr "Unmark"
+
+#, fuzzy
+#~ msgid "Western Sahara"
+#~ msgstr "Eropa Barat"
+
+#, fuzzy
+#~ msgid "France"
+#~ msgstr "Batal"
+
+#, fuzzy
+#~ msgid "Gibraltar"
+#~ msgstr "Libravatar"
+
+#, fuzzy
+#~ msgid "Greenland"
+#~ msgstr "Hijau"
+
+#, fuzzy
+#~ msgid "Greece"
+#~ msgstr "Hijau"
+
+#, fuzzy
+#~ msgid "India"
+#~ msgstr "Indikator"
+
+#, fuzzy
+#~ msgid "Japan"
+#~ msgstr "Jepang"
+
+#, fuzzy
+#~ msgid "Comoros"
+#~ msgstr "besok"
+
+#, fuzzy
+#~ msgid "Marshall Islands"
+#~ msgstr "Tandai semua telah dibaca"
+
+#, fuzzy
+#~ msgid "Myanmar"
+#~ msgstr "Unmark"
+
+#, fuzzy
+#~ msgid "New Caledonia"
+#~ msgstr "Kontak Baru"
+
+#, fuzzy
+#~ msgid "Norway"
+#~ msgstr "Teruskan"
+
+#, fuzzy
+#~ msgid "Philippines"
+#~ msgstr "baris"
+
+#, fuzzy
+#~ msgid "Portugal"
+#~ msgstr "Port"
+
+#, fuzzy
+#~ msgid "Qatar"
+#~ msgstr "Wavatar"
+
+#, fuzzy
+#~ msgid "Suriname"
+#~ msgstr "Nama pengguna SMTP:"
+
+#, fuzzy
+#~ msgid "Thailand"
+#~ msgstr "Thai"
+
+#, fuzzy
+#~ msgid "Viet Nam"
+#~ msgstr "Nama Berkas"
+
+#, fuzzy
+#~ msgid "GeoLocation"
+#~ msgstr "Lokasi:"
+
+#, fuzzy
+#~ msgid "Could not initialize clutter"
+#~ msgstr "Tidak dapat menginisialisasi pengeja %s."
+
+#, fuzzy
+#~ msgid "Could not create regular expression: %s\n"
+#~ msgstr "Tidak dapat membuat berkas sementara: %s"
+
+#, fuzzy
+#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
+#~ msgstr ""
+#~ "Gagal untuk registrasi kaitan perubahan tema pada pengaya Pemberitahuan"
+
+#, fuzzy
+#~ msgid "GeoLocation integration"
+#~ msgstr "Integrasi GData"
+
+#, fuzzy
+#~ msgid "<span color=\"red\">Error reading cache stats</span>"
+#~ msgstr "<span weight=\"bold\">Alamat email anda:</span>"
+
+#~ msgid "mbox (etPan!)..."
+#~ msgstr "mbox (etPan!)..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Notification Plugin: Failed to write plugin configuration to file\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Pengaya Pemberitahuan: Gagal menulis konfigurasi pengaya ke berkas\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
+#~ "span>\n"
+#~ "\n"
+#~ "%.*s\n"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">%sMasukkan frasakunci untuk:</"
+#~ "span>\n"
+#~ "\n"
+#~ "%.*s\n"
+
+#~ msgid "   Key import isn't implemented in Windows.\n"
+#~ msgstr "   Impor kunci tidak diimplementasikan di Windows.\n"
+
+#~ msgid "minute(s)"
+#~ msgstr "menit"
+
+#~ msgid "                    uid \"%s\" (Validity: %s)\n"
+#~ msgstr "                    uid \"%s\" (Keabsahan: %s)\n"
+
+#~ msgid "Key export isn't implemented in Windows."
+#~ msgstr "Ekspor kunci tidak diimplementasikan di Windows."
+
+#~ msgid ""
+#~ "<b>Fetch comments on posts aged less than:</b>\n"
+#~ "<small>(In days; set to -1 to fetch all comments)</small>"
+#~ msgstr ""
+#~ "<b>Ambil komentar untuk berita yang berumur kurang dari:</b>\n"
+#~ "<small>(dalam hari; atur jadi -1 untuk mengambil seluruh komentar)</small>"
+
+#~ msgid ""
+#~ "<b>Refresh interval in minutes:</b>\n"
+#~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
+#~ msgstr ""
+#~ "<b>Jeda pembaharuan dalam menit:</b>\n"
+#~ "<small>(Atur jadi 0 untuk menonaktifkan pembaharuan otomatis untuk feed "
+#~ "ini)</small>"
+
+#, fuzzy
+#~ msgid "<b>If an item changes, do not mark it as new:</b>"
+#~ msgstr ""
+#~ "<b>Jika sebuah isi berubah, jangan ditandai sebagai belum dibaca:</b>"
+
+#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
+#~ msgstr "%s <span weight=\"bold\">(kegiatan ini rekursif)</span>"
+
+#~ msgid "<b> on:</b>"
+#~ msgstr "<b> pada:</b>"
+
+#~ msgid "Move deleted mails to trash and expunge immediately"
+#~ msgstr ""
+#~ "Pindahkan surat yang dihapus ke tong sampah dan hilangkan secepatnya"
+
+#~ msgid ""
+#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
+#~ "expunging."
+#~ msgstr ""
+#~ "Pindahkan surat yang dihapus ke tong sampah sebagai ganti \\Penanda Hapus "
+#~ "tanpa menghilangkan."
+
+#~ msgid "+Discard"
+#~ msgstr "+Batal"
+
+#~ msgid "Save sent messages to Sent folder"
+#~ msgstr "Simpan pesan terikirim pada direktori Terkirim"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Otomatis (Direkomendasikan)"
+
+#~ msgid ""
+#~ "<b>Message summary</b>\n"
+#~ "<b>New:</b> %d\n"
+#~ "<b>Unread:</b> %d\n"
+#~ "<b>Total:</b> %d\n"
+#~ "<b>Size:</b> %s\n"
+#~ "\n"
+#~ "<b>Marked:</b> %d\n"
+#~ "<b>Replied:</b> %d\n"
+#~ "<b>Forwarded:</b> %d\n"
+#~ "<b>Locked:</b> %d\n"
+#~ "<b>Ignored:</b> %d\n"
+#~ "<b>Watched:</b> %d"
+#~ msgstr ""
+#~ "<b>Ringkasan pesan</b>\n"
+#~ "<b>Baru:</b> %d\n"
+#~ "<b>Belum dibaca:</b> %d\n"
+#~ "<b>Total:</b> %d\n"
+#~ "<b>Ukuran:</b> %s\n"
+#~ "\n"
+#~ "<b>Ditandai:</b> %d\n"
+#~ "<b>Dibalas:</b> %d\n"
+#~ "<b>Diteruskan:</b> %d\n"
+#~ "<b>Dikunci:</b> %d\n"
+#~ "<b>Diabaikan:</b> %d\n"
+#~ "<b>Diawasi:</b> %d"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<span color='%s' style='italic'>Dari: %s, pada %s</span>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<span color='%s' style='italic'>Kepada: %s, pada %s</span>"
+
+#~ msgid "Delete message(s)"
+#~ msgstr "Hapus pesan"
+
+#~ msgid "<span weight=\"bold\">Your name:</span>"
+#~ msgstr "<span weight=\"bold\">Nama anda:</span>"
+
+#~ msgid "<span weight=\"bold\">Your email address:</span>"
+#~ msgstr "<span weight=\"bold\">Alamat email anda:</span>"
+
+#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
+#~ msgstr "<span weight=\"bold\">Nama kotaksurat:</span>"
+
+#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
+#~ msgstr "<span weight=\"bold\">alamat server SMTP:</span>"
+
+#~ msgid "<span weight=\"bold\">Server address:</span>"
+#~ msgstr "<span weight=\"bold\">Alamat server:</span>"
+
+#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
+#~ msgstr "<span weight=\"bold\">Kotaksurat lokal:</span>"
+
+#~ msgid "<span weight=\"bold\">Server type:</span>"
+#~ msgstr "<span weight=\"bold\">Tipe server:</span>"
+
+#~ msgid "<span weight=\"bold\">Username:</span>"
+#~ msgstr "<span weight=\"bold\">Nama pengguna:</span>"
+
+#, fuzzy
 #~ msgid "Claws Mail is a fast, powerful and very extensible email client."
 #~ msgstr "Claws Mail telah diregistrasi sebagai klien standar."
 
@@ -20154,9 +19971,6 @@ msgstr ""
 #~ msgid "Default refresh interval in minutes"
 #~ msgstr "Standar jeda pembaharuan dalam menit"
 
-#~ msgid "Set to 0 to disable automatic refreshing"
-#~ msgstr "Atur jadi 0 untuk menonaktifkan pembaharuan otomatis"
-
 #~ msgid "Default number of expired items to keep"
 #~ msgstr "Standar jumlah item kadaluarsa yang dipertahankan"
 
@@ -20165,6 +19979,3 @@ msgstr ""
 
 #~ msgid "Use this"
 #~ msgstr "Gunakan ini"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "TIdak dapat mengenkripsi email: %s"
diff --git a/po/it.po b/po/it.po
index d146073..a303159 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,7 +12,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-02 11:49+0200\n"
 "Last-Translator: Luigi Votta <luigi.vtt at gmail.com>\n"
 "Language-Team: Italian <luigi.vtt at gmail.com>\n"
@@ -85,7 +85,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ricevi' preleva la posta dagli account selezionati"
 
 #: 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
@@ -98,7 +98,7 @@ msgstr "'Ricevi' preleva la posta dagli account selezionati"
 msgid "Name"
 msgstr "Nome"
 
-#: 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 "Protocollo"
 
@@ -817,8 +817,8 @@ msgstr "Rubriche"
 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 "Cartella"
 
@@ -958,18 +958,18 @@ msgstr "Aggiorna indirizzo(i)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aggiornamento fallito. Cambiamenti non salvati in Directory."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Avviso"
 
-#: 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 "Attenzione"
 
-#: 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 "Errore"
@@ -1002,66 +1002,66 @@ msgstr "Nome LDAP"
 msgid "Attribute Value"
 msgstr "Valore dell'attributo"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Nulla"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "un visualizzatore"
 
-#: 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 "cartelle"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "filtraggio"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "un'interfaccia per la privacy"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "un notificatore"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "una utility"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "cose"
 
-#: 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 "Questo plugin fornisce %s (%s), che è già fornito dal plugin %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Plugin già caricato"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Errore durante l'allocazione di memoria per il 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 ""
 "Questo modulo non è rilasciato con licenza compatibile GPL v3 o successiva."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Questo modulo è per 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 "
@@ -1070,7 +1070,7 @@ msgstr ""
 "La versione di Claws Mail è più nuova della versione con cui il plugin '%s' "
 "è stato compilato."
 
-#: 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."
@@ -1078,12 +1078,12 @@ msgstr ""
 "La versione di Claws Mail è più nuova della versione con cui il plugin è "
 "stato compilato."
 
-#: 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 versione di Claws Mail è troppo vecchia per il 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 "La versione di Claws Mail è troppo vecchia per il plugin."
 
@@ -1253,212 +1253,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 "Domenica"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lunedì"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Venerdì"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sabato"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Gennaio"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febbraio"
 
-#: 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 "Aprile"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maggio"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Giugno"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Luglio"
 
-#: 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 "Settembre"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Ottobre"
 
-#: 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 "Dicembre"
 
-#: 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 "Mer"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Gio"
 
-#: 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 "Sab"
 
-#: 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 "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 "Mag"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Giu"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Lug"
 
-#: 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 "Set"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Ott"
 
-#: 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"
@@ -1472,7 +1472,7 @@ msgstr "_Aggiungi..."
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
@@ -1914,7 +1914,7 @@ msgstr "Si sta per inserire un file di %s nel corpo del messaggio. Continuare?"
 msgid "Are you sure?"
 msgstr "Continuare?"
 
-#: 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 "_Inserisci"
 
@@ -1969,7 +1969,7 @@ msgstr ""
 "E` necessario selezionare un account di posta prima di inviare."
 
 #: 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 "Invia"
 
@@ -1977,8 +1977,8 @@ msgstr "Invia"
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "L'unico destinatario è l'indirizzo CC predefinito. Inviare comunque?"
 
-#: 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 "_Invia"
@@ -2012,7 +2012,7 @@ msgstr "Accodare comunque?"
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: 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"
@@ -2022,7 +2022,7 @@ msgstr ""
 "\n"
 "Errore nella conversione del set di caratteri."
 
-#: 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"
@@ -2032,7 +2032,7 @@ msgstr ""
 "\n"
 "Non è stato possibile ottenere la chiave di cifratura 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"
@@ -2077,7 +2077,7 @@ msgstr ""
 "Utilizzare \"Invia messaggi in coda\" dalla finestra principale per "
 "riprovare."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2088,7 +2088,7 @@ msgstr ""
 "nel set di caratteri %s specificato.\n"
 "Inviare come %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2101,72 +2101,72 @@ msgstr ""
 "\n"
 "Inviare comunque?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Non è stato possibile cifrare la mail: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Avviso di cifratura"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "_Continua"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Nessun account di posta disponibile!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "L'account selezionato non è NNTP: l'invio è impossibile."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "L'allegato %s non esiste più. Ignorare?"
 
-#: 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 "Annulla invio"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ignora allegato"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Originale %s parti"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Aggiungi alla _rubrica"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Elimina contenuti"
 
-#: 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 "Usare <tab> per completare automaticamente da rubrica"
 
-#: 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 "Dimensione"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Salva Messaggio in "
 
-#: 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
@@ -2177,23 +2177,23 @@ msgstr "Salva Messaggio in "
 msgid "_Browse"
 msgstr "_Sfoglia"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "Intes_tazione"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Allegati"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "A_ltro"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "O_ggetto:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2202,19 +2202,19 @@ msgstr ""
 "Impossibile avviare il correttore ortografico.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_Da:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Account da usare per questo messaggio"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Indirizzo mittente da usare"
 
-#: 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 "
@@ -2223,68 +2223,68 @@ msgstr ""
 "Non è possibile caricare il sistema di privacy '%s'. Non sarà possibile "
 "firmare o cifrare questo messaggio."
 
-#: 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 "_Nessuno"
 
-#: 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 "Il corpo del modello contiene un errore alla riga %d."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Errore di formato in From del modello."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Errore di formato in To del modello."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Errore di formato in Cc del modello."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Errore di formato in Ccn del modello."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Errore di formato in In-Risposta-a del modello."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Errore di formato in Oggetto del modello."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Proprietà"
 
-#: 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 "Codifica"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Nome file"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2295,16 +2295,16 @@ msgstr ""
 "Forzare la conclusione del processo?\n"
 "group id del processo: %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 necessita di una connessione di rete per poter inviare mail."
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2315,15 +2315,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Impossibile salvare la bozza."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Impossibile salvare la bozza"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2331,24 +2331,24 @@ msgstr ""
 "Impossibile salvare la bozza.\n"
 "Annullare la chiusura o scartare il messaggio?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Annulla chiusura"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Scarta messaggio"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Seleziona file"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Impossibile leggere il file '%s'."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2357,54 +2357,54 @@ msgstr ""
 "Il file '%s' contiene caratteri non validi\n"
 "per la codifica corrente, l'inserzione potrebbe non essere corretta."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Scarta messaggio"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Il messaggio è stato modificato. Scartarlo?"
 
-#: 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 "_Scarta"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "_Salva nelle Bozze"
 
-#: 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 "Salva modifiche"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Il messaggio è stato modificato. Salvare le ultime modifiche?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Non salvare"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Applicare il modello '%s'?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Applica modello"
 
-#: 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 "_Sostituisci"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Inserire o allegare?"
 
-#: 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?"
@@ -2412,16 +2412,16 @@ msgstr ""
 "Inserire il contenuto del (dei) file nel corpo del messaggio, o allegarlo "
 "alla mail?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Allega"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Errore di formato per carattere di citazione alla riga %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 "
@@ -2638,7 +2638,7 @@ msgid " Check File "
 msgstr "Verifica File"
 
 #: 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 "File"
@@ -2787,7 +2787,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"
 
@@ -2968,7 +2968,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Massimo numero di record da restituire nella ricerca."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Generale"
 
@@ -3682,61 +3682,61 @@ msgstr "La cartella '%s' esiste già."
 msgid "Can't create the folder '%s'."
 msgstr "Impossibile creare la cartella '%s'."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Contrassegna tu_tti come letti"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Contrassegna ricorsi_vamente tutti come letti"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "Esegui reg_ole di elaborazione"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Cerca cartella..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "_Elaborazione..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Svuota _cestino..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "_Invia coda..."
 
-#: 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 "Nuovi"
 
-#: 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 letti"
 
-#: 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 "Totale"
 
 #. 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 "Impostazione informazione di cartella..."
 
-#: 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?"
@@ -3744,99 +3744,99 @@ msgstr ""
 "Contrassegnare come letti tutti i messaggi nella cartella e sue sotto-"
 "cartelle?"
 
-#: 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 "Contrassegnare come letti tutti i messaggi nella cartella?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Contrassegna tutti come letti"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Scansione cartella %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 "Analisi cartella %s..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Ricostruisci albero di cartelle"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "La ricostruzione dell'albero di cartelle cancellerà le cache locali. "
 "Continuare?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Ricostruzione albero di cartelle in corso..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Scansione albero di cartelle..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Non è stato possibile scansionare la cartella %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Chiusura cartella %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Apertura cartella %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Non è stato possibile aprire la cartella."
 
-#: 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 "Svuota cestino"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Eliminare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Svuota cestino"
 
-#: 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 "Avviso Offline"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Attualmente in modalità offline. Cambiare modalità?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Invia i messaggi in coda"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Inviare i messaggi in coda?"
 
-#: 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 "Verificati alcuni errori durante l'invio dei messaggi in coda."
 
-#: 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"
@@ -3845,64 +3845,64 @@ msgstr ""
 "Verificati alcuni errori durante l'invio dei messaggi in coda:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Copiare la cartella '%s' in '%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 "Spostare la cartella '%s' in una sotto-cartella di '%s'?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Copia cartella"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Sposta cartella"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copia di %s in %s in corso."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Spostamento di %s in %s in corso."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Sorgente e destinazione coincidono."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Non è possibile copiare una cartella in una sua sottocartella."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Non è possibile spostare una cartella in una sua sottocartella."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Non è possibile spostare cartelle tra diverse caselle di posta."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Copia fallita!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Spostamento fallito!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Elaborazione configurazione della cartella %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 cartella di destinazione può essere usata solo per contenere sutto-"
@@ -4249,63 +4249,63 @@ msgstr "_Note di rilascio"
 msgid "_Statistics"
 msgstr "_Statistiche"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Arancione"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rosso"
 
-#: 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 "Azzurro"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Blu"
 
-#: 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 "Marrone"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Grigio"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Marrone chiaro"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Rosso scuro"
 
-#: 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 scuro"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Blu metallizzato"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Oro"
 
-#: 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 chiaro"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5046,7 +5046,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 "Plugin"
 
@@ -5090,9 +5090,9 @@ msgid "_Hide"
 msgstr "_Nascondi"
 
 #: 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"
@@ -5801,8 +5801,8 @@ msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "La connessione IMAP4 con %s è stata interrotta. Nuova connessione in corso.\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 richiede una connessione di rete per accedere al server IMAP."
@@ -5844,85 +5844,85 @@ msgstr "Impossibile connettersi al server IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server 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 "Impossibile avviare una sessione TLS.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Non è stato possibile effettuare il login al server IMAP %s.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Non è stato possibile effettuare il login al server IMAP %s."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Aggiunta dei messaggi in corso."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Copia dei messaggi in corso."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "impossibile impostare flag eliminati\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Ricerca cartelle non sottoscritte in %s in corso"
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ricerca sotto-cartelle di %s in corso"
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la casella di posta: fallito LIST\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "impossibile creare la casella di posta\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la casella di posta %s in %s\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la casella di posta\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "Fallito LIST\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Applicazione flag ai messaggi in corso."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Il server richiede il TLS per il login.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossibile aggiornare le capabilities.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5931,20 +5931,20 @@ msgstr ""
 "La connessione con %s è fallita: il server richiede il TLS, ma Claws Mail è "
 "stato compilato senza supporto TLS.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Il login al server è disabilitato.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Prelievo del messaggio in corso."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "impossibile impostare i flag eliminati: %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"
@@ -7879,7 +7879,7 @@ msgstr "Sovrascrivi file mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Il file esiste già. Sovrascriverlo?"
 
-#: 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 "Sovrascrivi"
@@ -7929,7 +7929,7 @@ msgstr "Ricerca terminata"
 msgid "Compose _new message"
 msgstr "Componi _nuovo messaggio"
 
-#: 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 messaggio"
 
@@ -7968,47 +7968,47 @@ msgstr ""
 "indirizzato ufficialmente a te.\n"
 "Si raccomanda di non inviare la ricevuta di ritorno."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Prelievo del messaggio in corso (%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 "Non è stato possibile decifrare: %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 ""
 "Messaggio non conforme allo standard MIME. Potrebbe essere visualizzato male."
 
-#: 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 "Salva come"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Sovrascrivere il file esistente?"
 
-#: 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 "Non è stato possibile salvare il file '%s'."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Mostra tutti %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Solo il primo megabyte di testo è mostrato."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1950
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8016,19 +8016,19 @@ msgstr ""
 "È arrivata la ricevuta di ritorno per questo messaggio: il destinatario l'ha "
 "visualizzato."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Per questo messaggio è stata richiesta una ricevuta di ritorno."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Questo messaggio richiede una ricevuta di ritorno"
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Invia ricevuta"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8036,7 +8036,7 @@ msgstr ""
 "Questo messaggio è stato ricevuto parzialmente,\n"
 "ed è stato cancellato dal server."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8045,15 +8045,15 @@ msgstr ""
 "Questo messaggio è stato ricevuto parzialmente;\n"
 "è %s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Contrassegna per il download"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Contrassegna per l'eliminazione"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8062,12 +8062,12 @@ msgstr ""
 "Questo messaggio è stato ricevuto parzialmente;\n"
 "è %s e verrà scaricato."
 
-#: 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 "Togli contrassegno"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8076,11 +8076,11 @@ msgstr ""
 "Questo messaggio è stato ricevuto parzialmente;\n"
 "è %s e verrà cancellato."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Ricevuta di ritorno"
 
-#: 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"
@@ -8090,19 +8090,19 @@ msgstr ""
 "Più di un account usa l'indirizzo a cui è stato inviato il messaggio.\n"
 "Selezionare quale account utilizzare per inviare la ricevuta di ritorno:"
 
-#: 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 "_Annulla"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Invia ricevuta"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Non è possibile stampare: il messaggio non contiene alcun testo."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8110,7 +8110,7 @@ msgstr ""
 "\n"
 "  Non ci sono messaggi in questa cartella"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8118,7 +8118,7 @@ msgstr ""
 "\n"
 "  Il messaggio è stato eliminato"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8126,7 +8126,7 @@ msgstr ""
 "\n"
 "  Il messaggio è stato eliminato o spostato  in un'altra cartella"
 
-#: 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 "Si è verificato un errore durante l'apprendimento.\n"
@@ -8361,34 +8361,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "non è stato possibile selezionare il gruppo: %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 "non è stato possibile impostare il gruppo: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervallo di articoli non valido: %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 "non è stato possibile ricevere l'xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "ricezione in corso di xover %d - %d in %s\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "non è stato possibile ricevere l'xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "riga xover non valida\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"
@@ -9358,7 +9358,7 @@ msgstr "I messaggi più grandi non verranno controllati"
 
 #: 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"
 
@@ -9934,7 +9934,7 @@ msgstr "Il CSS in questo file sarà applicato a tutte le parti di 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 "_Sfoglia"
@@ -10240,7 +10240,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Plugin GData: Tentativo di refresh autorizzazione in corso\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 "Autenticazione"
 
@@ -10418,7 +10418,7 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Intervallo di refresh della 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 "ore"
@@ -10800,7 +10800,7 @@ msgstr "Specifica qutenticazione"
 #: 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 utente"
 
@@ -10808,18 +10808,18 @@ msgstr "ID utente"
 #: 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 "Password"
 
-#: 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 "Metodo di autenticazione"
 
-#: 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 "Automatico"
 
@@ -11741,7 +11741,7 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Impostando a '0' manterrà la passphrase per l'intera sessione"
 
 #: 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 "minuti"
@@ -12372,8 +12372,8 @@ msgstr "Mostra terminale di Python..."
 msgid "Refresh"
 msgstr "Refresh"
 
-#: 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 "Sfoglia"
@@ -12710,7 +12710,7 @@ msgstr "Preleva i commenti ai post di età inferiore 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 "giorni"
 
@@ -13339,7 +13339,7 @@ msgid "Next month"
 msgstr "Mese successivo"
 
 #: 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"
 
@@ -13773,15 +13773,15 @@ msgstr "Questa settimana"
 msgid "Later"
 msgstr "Più tardi"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Accettato: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Declinato: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Accettato con riserva: "
 
@@ -14236,12 +14236,12 @@ msgstr "errore durante la sessione POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "comando TOP non supportato\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"
 
@@ -14330,40 +14330,40 @@ msgstr "comando per inviare mail"
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Locale"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Cartella `In arrivo' predefinita"
 
-#: 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 "I messaggi non filtrati verrano conservati in questa cartella"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Uas autenticazione sicura (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Cancella i messaggi sul server dopo la ricezione"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Rimuovi dopo"
 
-#: 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 giorni e 0 ore : rimuovi immeditamente"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Dimensione limite di ricezione"
 
-#: 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."
@@ -14371,82 +14371,82 @@ msgstr ""
 "I messaggi che superano questo limite verranno ricevuti parzialmenti. "
 "Selezionandoli sarà possibile scaricarli completamente o cancellarli."
 
-#: 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 "Numero massimo di articoli da scaricare"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "senza limite se è specificato 0"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Testo"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "Directory server IMAP"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(solitamente vuoto)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Mostra solo le cartelle sottoscritte"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Modalità banda-efficiente (impedisce il prelievo dei tag remoti)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Questa modalità utilizza meno banda, ma può essere più lenta con alcuni "
 "server."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Filtra messaggi in ricezione"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permetti filtraggio in ricezione usando i plugin"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ricevi Mail' controlla se ci sono nuove mail su questo account"
 
-#: 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 "Intestazione"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Genera ID di messaggio"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Invia indirizzo e-mail dell'account nell'ID di messaggio"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Aggiungi intestazione dello user agent"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Aggiungi intestazione definita da utente"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticazione SMTP (SMTP AUT)"
 
-#: 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."
@@ -14454,177 +14454,177 @@ msgstr ""
 "Se si lasciano vuoti questi campi, verranno usati lo stesso ID utente e "
 "password della ricezione."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentica con POP3 prima dell'invio"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Scadenza autenticazione 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 "Inserisci automaticamente la firma"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Separatore firma"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Command output"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Dizionari per controllo ortografico"
 
-#: 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 "Dizionario predefinito"
 
-#: 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 "Dizionario alternativo predefinito"
 
-#: 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 "Composizione"
 
-#: 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 "Risposta"
 
-#: 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 "Inoltro"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Sistema di privacy predefinito"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Firma sempre i messaggi"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Cifra sempre i messaggi"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Firma sempre i messaggi in risposta ad un messaggio firmato"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Cifra sempre i messaggi in risposta ad un messaggio cifrato"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifra i messaggi inviati con la propria chiave oltre a quella del "
 "destinatario."
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salva in chiaro, i messaggi cifrati inviati"
 
-#: 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 "Non usare SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Usa SSL per connessione 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 il comando STARTTLS per avviare sessione SSL"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usa SSL per connessione IMAP4"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Usa SSL per connessione NNTP"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Invio (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Non usare SSL (ma, se necessario usa STARTTLS)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Usa SSL per connessione SMTP"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Certificati client"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Certificati per ricezione"
 
-#: 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 "File di certificato del client come un file PKCS12 o PEM"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Certificato per invio"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Accetta automaticamente certificati SSL validi"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Usa SSL non-bloccante"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Disabilitare se si hanno problemi di connessione SSL"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "Porta SMTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "Porta POP3"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "Porta NNTP"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Nome 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."
@@ -14632,112 +14632,112 @@ msgstr ""
 "Il nome dominio verrà usato nell'ID di messaggio generato, e nelle "
 "connessioni con server SMTP."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Usa comando per comunicare col server"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Contrassegna i messaggi cross-posted come letti e con colore:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Metti messaggi inviati in"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Metti messaggi in coda in"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Metti bozze in"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Metti messaggi eliminati in"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Non è stato inserito il nome account."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Non è stato inserito l'indirizzo di posta."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "Non è stato inserito il server SMTP."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Non è stato inserito l'ID utente."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "Non è stato inserito il server POP3."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Non esiste la cartella predefinita 'In arrivo'."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "Non è stato inserito il server IMAP4."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "Non è stato inserito il server NNTP."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "Non è stato inserito il nome di file della cartella di posta."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "Non è stato inserito il comando mail."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Ricezione"
 
-#: 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 "Modelli"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Preferenze per nuovo account"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferenze account"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Fallito (indirizzo errato)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Selezionare file di 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 "Selezionare file di certificato"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin non caricato)"
@@ -15000,15 +15000,15 @@ msgstr "Azioni correnti"
 msgid "Action string is not valid."
 msgstr "La stringa di azione non è valida."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Ciao,\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Il giorno %d\\n%f ha scritto:\\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"
@@ -15016,7 +15016,7 @@ msgstr ""
 "\\n\\nInizio messaggio inoltrato:\\n\\n?d{Data: %d\\n}?f{Da: %f\\n}?t{A: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroup: %n\\n}?s{Oggetto: %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/nb.po b/po/nb.po
index 1acf0d9..4516c99 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 2.4.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-12-19 08:08+0100\n"
 "Last-Translator: Petter Adsen <petter at synth.no>\n"
 "Language-Team: Bokmål, Norwegian; Norwegian Bokmål <>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.7\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."
@@ -30,15 +30,15 @@ msgstr ""
 "Du har åpne redigeringsvinduer.\n"
 "Disse må lukkes før du kan gjøre endringer i kontoinnstillingene."
 
-#: src/account.c:437
+#: src/account.c:441
 msgid "Can't create folder."
 msgstr "Mappen kan ikke opprettes."
 
-#: src/account.c:724
+#: src/account.c:728
 msgid "Edit accounts"
 msgstr "Endre kontoinnstillinger"
 
-#: 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 "
@@ -48,78 +48,78 @@ msgstr ""
 "er oppført. Avkrysningsfeltet angir hvilke kontoer som regnes med. "
 "Standardkontoen står i fetstil. "
 
-#: src/account.c:812
+#: src/account.c:816
 msgid " _Set as default account "
 msgstr "Bruk som _standardkonto"
 
-#: src/account.c:904
+#: src/account.c:908
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Kontoer med fjernmapper kan ikke kopieres."
 
-#: src/account.c:911
+#: src/account.c:915
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopi av %s"
 
-#: src/account.c:1071
+#: src/account.c:1075
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vil du virkelig slette kontoen '%s'?"
 
-#: src/account.c:1073
+#: src/account.c:1077
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: src/account.c:1074
+#: src/account.c:1078
 msgid "Delete account"
 msgstr "Slett konto"
 
-#: src/account.c:1554
+#: src/account.c:1562
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1560
+#: src/account.c:1568
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hent epost' henter epost fra de avkryssede kontoer"
 
-#: 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 "Navn"
 
-#: 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 "Protokoll"
 
-#: src/account.c:1583 src/ssl_manager.c:102
+#: src/account.c:1591 src/ssl_manager.c:100
 msgid "Server"
 msgstr "Tjener"
 
-#: src/action.c:383
+#: src/action.c:382
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Kunne ikke hente epostfilen %d"
 
-#: src/action.c:420
+#: src/action.c:419
 msgid "Could not get message part."
 msgstr "Kunne ikke hente del av melding."
 
-#: src/action.c:437
+#: src/action.c:436
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Kunne ikke hente en del av flerdelt melding: %s"
 
-#: src/action.c:609
+#: src/action.c:608
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -128,11 +128,11 @@ msgstr ""
 "Den valgte handlingen kan ikke brukes i redigeringsvinduet\n"
 "fordi den inneholder %%f, %%F, %%as eller %%p."
 
-#: src/action.c:721
+#: src/action.c:720
 msgid "There is no filtering action set"
 msgstr "Ingen filterhandling er angitt"
 
-#: src/action.c:723
+#: src/action.c:722
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -141,7 +141,7 @@ msgstr ""
 "Ugyldig(e) filterhandling(er):\n"
 "%s"
 
-#: src/action.c:988
+#: src/action.c:987
 #, 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 "Ukjent feil"
 
-#: src/action.c:1208 src/action.c:1373
+#: src/action.c:1207 src/action.c:1372
 msgid "Completed"
 msgstr "Fullført"
 
-#: src/action.c:1244
+#: src/action.c:1243
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Pågår: %s\n"
 
-#: src/action.c:1248
+#: src/action.c:1247
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Avsluttet: %s\n"
 
-#: src/action.c:1281
+#: src/action.c:1280
 msgid "Action's input/output"
 msgstr "Handlingens input og resultat"
 
-#: 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' blir erstattet med argumentet)\n"
 "  %s"
 
-#: src/action.c:1614
+#: src/action.c:1613
 msgid "Action's hidden user argument"
 msgstr "Handlingens skjulte brukerargument"
 
-#: 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' blir erstattet med argumentet)\n"
 "  %s"
 
-#: src/action.c:1623
+#: src/action.c:1622
 msgid "Action's user argument"
 msgstr "Handlingens brukerargument"
 
@@ -223,7 +223,7 @@ msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 "Kan ikke flytte en mappe til seg selv eller til en av sine egne undermapper."
 
-#: 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 "Gruppe"
@@ -361,7 +361,7 @@ msgid "Duplicate email addresses"
 msgstr "Epostadresse-dubletter "
 
 #: 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 "Adresse"
 
@@ -393,8 +393,8 @@ msgstr "Før inn i adressebok"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: 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 "Kommentarer"
 
@@ -402,16 +402,16 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Velg mappe for adressebøker"
 
-#: 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 "Legg til adresse(r)"
 
-#: src/addressadd.c:536
+#: src/addressadd.c:535
 msgid "Can't add the specified address"
 msgstr "Kan ikke legge til den angitte adresse"
 
-#: 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 "Epostadresse"
@@ -421,18 +421,18 @@ msgid "_Book"
 msgstr "_Bok"
 
 #: 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 "_Endre"
 
-#: 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 "V_erktøy"
 
-#: 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 "_Hjelp"
 
@@ -464,20 +464,20 @@ msgstr "_Rediger bok"
 msgid "_Delete book"
 msgstr "_Slett bok"
 
-#: 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 "_Lagre"
 
-#: 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 "_Lukk"
 
-#: 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 "Velg _alt"
 
@@ -486,13 +486,13 @@ msgid "C_ut"
 msgstr "_Klipp ut"
 
 #: 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 "_Kopier"
 
 #: 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 "_Sett inn"
 
@@ -536,8 +536,8 @@ msgstr "Finn dubletter..."
 msgid "Edit custom attributes..."
 msgstr "Rediger tilpassede attributter..."
 
-#: 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 "_Om"
 
@@ -546,10 +546,10 @@ msgid "_Browse Entry"
 msgstr "_Bla igjennom"
 
 #: 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 "Ukjent"
 
@@ -653,12 +653,12 @@ msgstr "Sterk(ere) autentisering kreves"
 msgid "Sources"
 msgstr "Kilder"
 
-#: 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 "Adressebok"
 
-#: src/addressbook.c:1112 src/editldap.c:779
+#: src/addressbook.c:1112 src/editldap.c:780
 msgid "Search"
 msgstr "Søk"
 
@@ -682,18 +682,18 @@ msgstr "Kan ikke sette inn. Adresseboken du vil bruke er skrivebeskyttet."
 msgid "Cannot paste into an address group."
 msgstr "Kan ikke sette inn i en adressegruppe."
 
-#: src/addressbook.c:2914
+#: src/addressbook.c:2913
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Vil du virkelig slette søkeresultatene og adressene i '%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 "Slett"
 
-#: 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 "
@@ -702,21 +702,21 @@ msgstr ""
 "Vil du slette '%s'? Hvis du bare sletter mappen, vil adressene den "
 "inneholder flyttes til den overordnede mappen."
 
-#: 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 "Slett mappe"
 
-#: src/addressbook.c:2930
+#: src/addressbook.c:2929
 msgid "Delete _folder only"
 msgstr "Slett bare _mappen"
 
-#: src/addressbook.c:2930
+#: src/addressbook.c:2929
 msgid "Delete folder and _addresses"
 msgstr "Slett mappe og _adresser"
 
-#: src/addressbook.c:2941
+#: src/addressbook.c:2940
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -725,7 +725,7 @@ msgstr ""
 "Vil du slette '%s'?\n"
 "Adressene den inneholder går ikke tapt."
 
-#: src/addressbook.c:2948
+#: src/addressbook.c:2947
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -734,28 +734,28 @@ msgstr ""
 "Vil du slette '%s'?\n"
 "Adressene den inneholder blir også slettet."
 
-#: src/addressbook.c:3062
+#: src/addressbook.c:3061
 #, c-format
 msgid "Search '%s'"
 msgstr "Søk etter '%s'"
 
-#: src/addressbook.c:3200 src/addressbook.c:3249
+#: src/addressbook.c:3199 src/addressbook.c:3248
 msgid "New Contacts"
 msgstr "Nye kontakter"
 
-#: src/addressbook.c:4088
+#: src/addressbook.c:4087
 msgid "New user, could not save index file."
 msgstr "Ny bruker, kunne ikke lagre indeksfil."
 
-#: src/addressbook.c:4092
+#: src/addressbook.c:4091
 msgid "New user, could not save address book files."
 msgstr "Ny bruker, kunne ikke lagre adressebokfiler."
 
-#: src/addressbook.c:4102
+#: src/addressbook.c:4101
 msgid "Old address book converted successfully."
 msgstr "Konvertering av gammel adressebok vellykket."
 
-#: src/addressbook.c:4107
+#: src/addressbook.c:4106
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -763,7 +763,7 @@ msgstr ""
 "Gammel adressebok konvertert,\n"
 "kunne ikke lagre ny adresseindeks-fil."
 
-#: src/addressbook.c:4120
+#: src/addressbook.c:4119
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -771,7 +771,7 @@ msgstr ""
 "Kunne ikke konvertere adressebok, men\n"
 "opprettet nye, tomme adressebokfiler."
 
-#: src/addressbook.c:4126
+#: src/addressbook.c:4125
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -779,7 +779,7 @@ msgstr ""
 "Kunne ikke konvertere adressebok, kunne heller\n"
 "ikke opprette ny adresseindeksfil."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4130
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -787,57 +787,62 @@ msgstr ""
 "Kunne ikke konvertere adresseboken, og kunne ikke\n"
 "opprette nye adressebokfiler."
 
-#: src/addressbook.c:4138 src/addressbook.c:4144
+#: src/addressbook.c:4137 src/addressbook.c:4143
 msgid "Addressbook conversion error"
 msgstr "Feil ved konvertering av adressebok"
 
-#: src/addressbook.c:4258
+#: src/addressbook.c:4257
 msgid "Addressbook Error"
 msgstr "Feil ved adressebok"
 
-#: src/addressbook.c:4259
+#: src/addressbook.c:4258
 msgid "Could not read address index"
 msgstr "Kunne ikke lese adresseindeks"
 
-#: src/addressbook.c:4590
+#: src/addressbook.c:4589
 msgid "Busy searching..."
 msgstr "Søker..."
 
-#: src/addressbook.c:4899
+#: src/addressbook.c:4898 src/prefs_send.c:188
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: 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 "Adressebok"
 
-#: src/addressbook.c:4923
+#: src/addressbook.c:4922
 msgid "Person"
 msgstr "Person"
 
-#: 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 "Mappe"
 
-#: src/addressbook.c:4971
+#: src/addressbook.c:4970
 msgid "vCard"
 msgstr "vKort"
 
-#: 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-tjenere"
 
-#: src/addressbook.c:5019
+#: src/addressbook.c:5018
 msgid "LDAP Query"
 msgstr "LDAP-spørring"
 
-#: 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 "Adressebok"
+
+#: 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
@@ -929,44 +934,43 @@ msgstr "Hent epost-adresser fra valgte meldinger"
 msgid "Collect email addresses from folder"
 msgstr "Hent epost-adresser fra mappe"
 
-#: src/addrindex.c:123
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Ofte brukte adresser"
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Private adresser"
 
-#: src/addrindex.c:130
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Ofte brukt adresse"
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Privat adresse"
 
-#: src/addrindex.c:1827
+#: src/addrindex.c:1830
 msgid "Address(es) update"
 msgstr "Oppdatering av adresse(r)"
 
-#: src/addrindex.c:1828
+#: src/addrindex.c:1831
 msgid "Update failed. Changes not written to Directory."
 msgstr "Oppdatering mislyktes. Endringer ble ikke lagret i registeret."
 
-#: src/alertpanel.c:146 src/compose.c:9482
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "NB"
 
-#: 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 "Advarsel"
 
-#: 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 "Feil"
 
@@ -998,43 +1002,43 @@ msgstr "LDAP-navn"
 msgid "Attribute Value"
 msgstr "Attributtverdi"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Ingenting"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "fremviser"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "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 "et "
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "en varsler"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "et verktøy"
 
-#: 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."
@@ -1042,25 +1046,25 @@ msgstr ""
 "Dette programtillegg muliggjøre %s (%s), som allerede tilbys av "
 "programtillegget %s."
 
-#: src/common/plugin.c:434
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Programtillegget er allerede innlest"
 
-#: src/common/plugin.c:445
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Kunne ikke allokere minne for programtillegget"
 
-#: 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 ""
 "Denne modulen er ikke utgitt under en lisens kompatibel med GPL v3 eller "
 "senere."
 
-#: src/common/plugin.c:488
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Denne modulen er for 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 "
@@ -1069,7 +1073,7 @@ msgstr ""
 "Din versjon av Claws Mail er nyere enn den versjon programtillegget '%s' ble "
 "bygget for."
 
-#: 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."
@@ -1077,16 +1081,16 @@ msgstr ""
 "Din versjon av Claws Mail er nyere enn den versjonen programtillegget ble "
 "bygget for."
 
-#: 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 "Din versjon av Claws Mail er for gammel for programtillegget '%s'."
 
-#: src/common/plugin.c:784
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Din versjon av Claws Mail er for gammel for programtillegget."
 
-#: src/common/session.c:183 src/imap.c:1189
+#: src/common/session.c:183 src/imap.c:1213
 msgid "SSL handshake failed\n"
 msgstr "Feil ved SSL-oppkobling\n"
 
@@ -1098,24 +1102,24 @@ msgstr "SMTP AUTH ikke tilgjengelig\n"
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Ønsket SMTP AUTH-metode er ikke tilgjengelig\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 respons\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 "feil oppstod i SMTP-sesjonen\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 "feil oppstod ved autentisering\n"
 
-#: src/common/smtp.c:589
+#: src/common/smtp.c:585
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Meldingen er for stor (Maksimum størrelse 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 "kan ikke starte TLS-sesjon\n"
 
@@ -1147,81 +1151,81 @@ msgstr "%s:%s: oppslag hos verten mislyktes (%s).\n"
 msgid "write on fd%d: %s\n"
 msgstr "skriv på 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 "Kan ikke avgjøre filstatus for P12-sertifikatsfilen (%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 "Kan ikke innlese P12-sertifikatsfil (%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 "Kan ikke importere P12-sertifikatsfil (%s)\n"
 
-#: src/common/ssl_certificate.c:630
+#: src/common/ssl_certificate.c:628
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: src/common/ssl_certificate.c:635
+#: src/common/ssl_certificate.c:633
 msgid "Uncheckable"
 msgstr "Ukontrollerbar"
 
-#: src/common/ssl_certificate.c:639
+#: src/common/ssl_certificate.c:637
 msgid "Self-signed certificate"
 msgstr "Egensignert sertifikat"
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:640
 msgid "Revoked certificate"
 msgstr "Tilbakekalt sertifikat"
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:642
 msgid "No certificate issuer found"
 msgstr "Ingen sertifikatsutsteder funnet"
 
-#: src/common/ssl_certificate.c:646
+#: src/common/ssl_certificate.c:644
 msgid "Certificate issuer is not a CA"
 msgstr "Utsteder av sertifikatet er ikke en CA"
 
-#: src/common/ssl_certificate.c:871
+#: src/common/ssl_certificate.c:869
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "Kan ikke åpne sertifikatfil %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 "Sertifikatfil %s mangler (%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 "Kan ikke åpne nøkkelfil %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 "Nøkkelfil %s mangler (%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 "Kunne ikke lese P12-sertifikatsfil %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 "Kan ikke åpne P12-sertifikatsfil %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-sertifikatsfil %s mangler (%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
@@ -1232,647 +1236,647 @@ msgstr "<ikke i sertifikatet>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Emne nullstilt av regulært uttrykk)"
 
-#: src/common/utils.c:257
+#: src/common/utils.c:259
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:258
+#: src/common/utils.c:260
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:261
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:260
+#: src/common/utils.c:262
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4806
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "søndag"
 
-#: src/common/utils.c:4807
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "mandag"
 
-#: src/common/utils.c:4808
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "tirsdag"
 
-#: src/common/utils.c:4809
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "torsdag"
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "fredag"
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "lørdag"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januar"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februar"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "mars"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "april"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "mai"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "juni"
 
-#: src/common/utils.c:4820
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "juli"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "august"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "september"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "oktober"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "november"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "desember"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "søn"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "man"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "tir"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "ons"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "tor"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "fre"
 
-#: src/common/utils.c:4833
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "lør"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "jan"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "feb"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "mar"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "apr"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "mai"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "jun"
 
-#: src/common/utils.c:4841
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "aug"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "sep"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "okt"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "nov"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "des"
 
-#: src/common/utils.c:4857
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4858
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4859
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4860
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:576
+#: src/compose.c:575
 msgid "_Add..."
 msgstr "_Legg til..."
 
-#: 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 "_Slett"
 
-#: src/compose.c:579 src/folderview.c:241
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: 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 "_Melding"
 
-#: src/compose.c:589
+#: src/compose.c:588
 msgid "_Spelling"
 msgstr "Stave_kontroll"
 
-#: src/compose.c:591 src/compose.c:658
+#: src/compose.c:590 src/compose.c:657
 msgid "_Options"
 msgstr "_Innstillinger"
 
-#: src/compose.c:595
+#: src/compose.c:594
 msgid "S_end"
 msgstr "S_end"
 
-#: src/compose.c:596
+#: src/compose.c:595
 msgid "Send _later"
 msgstr "Send _senere"
 
-#: src/compose.c:599
+#: src/compose.c:598
 msgid "_Attach file"
 msgstr "_Vedlegg fil"
 
-#: src/compose.c:600
+#: src/compose.c:599
 msgid "_Insert file"
 msgstr "_Sett inn fil"
 
-#: src/compose.c:601
+#: src/compose.c:600
 msgid "Insert si_gnature"
 msgstr "Sett inn si_gnatur"
 
-#: src/compose.c:602
+#: src/compose.c:601
 msgid "_Replace signature"
 msgstr "E_rstatt signatur"
 
-#: src/compose.c:606
+#: src/compose.c:605
 msgid "_Print"
 msgstr "_Skriv ut"
 
-#: 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 "_Angre"
 
-#: 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 "_Gjenta"
 
-#: 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 "_Klipp ut"
 
-#: src/compose.c:619
+#: src/compose.c:618
 msgid "_Special paste"
 msgstr "_Sett inn spesial"
 
-#: src/compose.c:620
+#: src/compose.c:619
 msgid "As _quotation"
 msgstr "Som _sitat"
 
-#: src/compose.c:621
+#: src/compose.c:620
 msgid "_Wrapped"
 msgstr "Med _ombrytning"
 
-#: src/compose.c:622
+#: src/compose.c:621
 msgid "_Unwrapped"
 msgstr "_Uten ombrytning"
 
-#: 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 "_Velg alt"
 
-#: src/compose.c:626
+#: src/compose.c:625
 msgid "A_dvanced"
 msgstr "_Avansert"
 
-#: src/compose.c:627
+#: src/compose.c:626
 msgid "Move a character backward"
 msgstr "Gå ett tegn bakover"
 
-#: src/compose.c:628
+#: src/compose.c:627
 msgid "Move a character forward"
 msgstr "Gå ett tegn framover"
 
-#: src/compose.c:629
+#: src/compose.c:628
 msgid "Move a word backward"
 msgstr "Gå ett ord bakover"
 
-#: src/compose.c:630
+#: src/compose.c:629
 msgid "Move a word forward"
 msgstr "Gå et ord framover"
 
-#: src/compose.c:631
+#: src/compose.c:630
 msgid "Move to beginning of line"
 msgstr "Gå til begynnelsen av linjen"
 
-#: src/compose.c:632
+#: src/compose.c:631
 msgid "Move to end of line"
 msgstr "Gå til linjeslutt"
 
-#: src/compose.c:633
+#: src/compose.c:632
 msgid "Move to previous line"
 msgstr "Gå til forrige linje"
 
-#: src/compose.c:634
+#: src/compose.c:633
 msgid "Move to next line"
 msgstr "Gå til neste linje"
 
-#: src/compose.c:635
+#: src/compose.c:634
 msgid "Delete a character backward"
 msgstr "Slett forrige tegn"
 
-#: src/compose.c:636
+#: src/compose.c:635
 msgid "Delete a character forward"
 msgstr "Slett neste tegn"
 
-#: src/compose.c:637
+#: src/compose.c:636
 msgid "Delete a word backward"
 msgstr "Slett forrige ord"
 
-#: src/compose.c:638
+#: src/compose.c:637
 msgid "Delete a word forward"
 msgstr "Slett neste ord"
 
-#: src/compose.c:639
+#: src/compose.c:638
 msgid "Delete line"
 msgstr "Slett linje"
 
-#: src/compose.c:640
+#: src/compose.c:639
 msgid "Delete to end of line"
 msgstr "Slett til linjeslutt"
 
-#: 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 "_Finn"
 
-#: src/compose.c:646
+#: src/compose.c:645
 msgid "_Wrap current paragraph"
 msgstr "_Ombryt avsnittet"
 
-#: src/compose.c:647
+#: src/compose.c:646
 msgid "Wrap all long _lines"
 msgstr "Ombryt alle lange _linjer"
 
-#: src/compose.c:649
+#: src/compose.c:648
 msgid "Edit with e_xternal editor"
 msgstr "Rediger med e_ksternt program"
 
-#: src/compose.c:652
+#: src/compose.c:651
 msgid "_Check all or check selection"
 msgstr "_Stavekontroll av hele teksten eller markeringen"
 
-#: src/compose.c:653
+#: src/compose.c:652
 msgid "_Highlight all misspelled words"
 msgstr "_Fremhev alle feilstavede ord"
 
-#: src/compose.c:654
+#: src/compose.c:653
 msgid "Check _backwards misspelled word"
 msgstr "Stavekontroll _bakover"
 
-#: src/compose.c:655
+#: src/compose.c:654
 msgid "_Forward to next misspelled word"
 msgstr "Gå til _neste feilstavede ord"
 
-#: src/compose.c:663
+#: src/compose.c:662
 msgid "Reply _mode"
 msgstr "Svartype"
 
-#: src/compose.c:665
+#: src/compose.c:664
 msgid "Privacy _System"
 msgstr "Personverns_ystem"
 
-#: src/compose.c:670
+#: src/compose.c:669
 msgid "_Priority"
 msgstr "_Prioritet"
 
-#: 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 "Tegn_koding"
 
-#: 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 "Vesteuropeisk"
 
-#: 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 "Baltisk"
 
-#: 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 "Hebraisk"
 
-#: 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 "Arabisk"
 
-#: 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 "Kyrillisk (KOI8-R)"
 
-#: 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 "Japansk (EUC-JP)"
 
-#: 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 "Kinesisk"
 
-#: 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 "Koreansk"
 
-#: 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 "Thai"
 
-#: 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 "_Adressebok"
 
-#: src/compose.c:690
+#: src/compose.c:689
 msgid "_Template"
 msgstr "_Mal"
 
-#: 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 "_Handlinger"
 
-#: src/compose.c:701
+#: src/compose.c:700
 msgid "Aut_o wrapping"
 msgstr "Automatisk linjebryting"
 
-#: src/compose.c:702
+#: src/compose.c:701
 msgid "Auto _indent"
 msgstr "Auto-_innrykning (av/på)"
 
-#: src/compose.c:703
+#: src/compose.c:702
 msgid "Si_gn"
 msgstr "Si_gner"
 
-#: src/compose.c:704
+#: src/compose.c:703
 msgid "_Encrypt"
 msgstr "_Kryptering"
 
-#: src/compose.c:705
+#: src/compose.c:704
 msgid "_Request Return Receipt"
 msgstr "Be om kvittering"
 
-#: src/compose.c:706
+#: src/compose.c:705
 msgid "Remo_ve references"
 msgstr "Fjern _referanser"
 
-#: src/compose.c:707
+#: src/compose.c:706
 msgid "Show _ruler"
 msgstr "Vis linjal"
 
-#: src/compose.c:712 src/compose.c:722
+#: src/compose.c:711 src/compose.c:721
 msgid "_Normal"
 msgstr "_Normal"
 
-#: 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 "_Alle"
 
-#: 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 "Av_sender"
 
-#: src/compose.c:715
+#: src/compose.c:714
 msgid "_Mailing-list"
 msgstr "Svar til _liste"
 
-#: src/compose.c:720
+#: src/compose.c:719
 msgid "_Highest"
 msgstr "Høyest"
 
-#: src/compose.c:721
+#: src/compose.c:720
 msgid "Hi_gh"
 msgstr "Høy"
 
-#: src/compose.c:723
+#: src/compose.c:722
 msgid "Lo_w"
 msgstr "Lav"
 
-#: src/compose.c:724
+#: src/compose.c:723
 msgid "_Lowest"
 msgstr "Lavest"
 
-#: 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 "_Automatisk"
 
-#: 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 "7 bits asc_ii (US-ASCII)"
 
-#: 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 "Unicode (_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 "Sentraleuropeisk (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 "Gresk (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 "Tyrkisk (ISO-8859-_9)"
 
-#: src/compose.c:1072
+#: src/compose.c:1071
 msgid "New message From format error."
 msgstr "Feil i feltet 'Fra' i ny melding."
 
-#: src/compose.c:1164
+#: src/compose.c:1163
 msgid "New message subject format error."
 msgstr "Feil i emnefeltet i ny melding."
 
-#: 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 "Meldingsteksten i \"Ny melding\"-malen har en feil i linje %d.\t"
 
-#: src/compose.c:1456
+#: src/compose.c:1455
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Kunne ikke svare. Den opprinnelige meldingen finnes antakelig ikke."
 
-#: 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 "\"Fra\"-feltet i \"Svar\"-malen inneholder en ugyldig epost-adresse."
 
-#: 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 "Meldingsteksten i \"Svar\"-malen har en feil i linje %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 ""
 "\"Fra\"-feltet i malen \"Videresend\" inneholder en ugyldig epost-adresse."
 
-#: 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 "Hovedteksten i malen \"Videresend\" har en feil på linje %d."
 
-#: src/compose.c:2057
+#: src/compose.c:2056
 msgid "Fw: multiple emails"
 msgstr "Sv: flere meldinger"
 
-#: src/compose.c:2537
+#: src/compose.c:2539
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Hovedteksten i malen \"Omdiriger\" har en feil på linje %d."
 
-#: src/compose.c:2604 src/gtk/headers.h:14
+#: src/compose.c:2606 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopi-Til:"
 
-#: src/compose.c:2607 src/gtk/headers.h:15
+#: src/compose.c:2609 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Blindkopi-Til:"
 
-#: src/compose.c:2610 src/gtk/headers.h:12
+#: src/compose.c:2612 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Svar-Til:"
 
-#: src/compose.c:2613 src/compose.c:4944 src/compose.c:4946
+#: src/compose.c:2615 src/compose.c:4946 src/compose.c:4948
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Nyhetsgrupper:"
 
-#: src/compose.c:2616 src/gtk/headers.h:34
+#: src/compose.c:2618 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Oppfølger-Til:"
 
-#: src/compose.c:2619 src/gtk/headers.h:17
+#: src/compose.c:2621 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Som-Svar-På:"
 
-#: 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 "Til:"
 
-#: src/compose.c:2832
+#: src/compose.c:2834
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Kunne ikke vedlegge fil (feil i tegnsettkonvertering)."
 
-#: src/compose.c:2838
+#: src/compose.c:2840
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1887,16 +1891,16 @@ msgstr[1] ""
 "Følgende filer er blitt vedlagt: \n"
 "%s"
 
-#: src/compose.c:3111
+#: src/compose.c:3113
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Malens \"Anførselstegn\" er ugyldig."
 
-#: src/compose.c:3611
+#: src/compose.c:3613
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kunne ikke avgjøre størrelsen på filen '%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 "
@@ -1905,57 +1909,57 @@ msgstr ""
 "Du er i ferd med å sette inn en fil på %s i meldingsteksten. Er du sikker på "
 "at det er det du vil?"
 
-#: src/compose.c:3625
+#: src/compose.c:3627
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: 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 "Sett _inn"
 
-#: src/compose.c:3750
+#: src/compose.c:3752
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:3751
+#: src/compose.c:3753
 msgid "Empty file"
 msgstr "Tom fil"
 
-#: src/compose.c:3752
+#: src/compose.c:3754
 msgid "_Attach anyway"
 msgstr "_Vedlegg likevel"
 
-#: src/compose.c:3761
+#: src/compose.c:3763
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan ikke lese %s."
 
-#: src/compose.c:3788
+#: src/compose.c:3790
 #, c-format
 msgid "Message: %s"
 msgstr "Melding: %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 " [Endret]"
 
-#: 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 - Skriv melding%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 "[intet tema] - Skriv melding%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 "Skriv ny melding"
 
-#: 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."
@@ -1963,51 +1967,51 @@ msgstr ""
 "Det er ikke angitt hvilken konto meldingen skal sendes fra.\n"
 "Velg konto før du går videre."
 
-#: 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 "Send"
 
-#: src/compose.c:5041
+#: src/compose.c:5043
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Eneste mottaker er forvalgt 'Kopi-Til'-adresse. Send likevel?"
 
-#: 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 "_Send"
 
-#: src/compose.c:5073
+#: src/compose.c:5075
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Eneste mottaker er forvalgt 'Blindkopi-Til'-adresse. Send likevel?"
 
-#: src/compose.c:5090
+#: src/compose.c:5092
 msgid "Recipient is not specified."
 msgstr "Mottaker er ikke angitt."
 
-#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Kø"
 
-#: src/compose.c:5110
+#: src/compose.c:5112
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Emnefeltet er tomt. %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 "Send likevel?"
 
-#: 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 "Sett i køen likevel?"
 
-#: src/compose.c:5114 src/toolbar.c:425
+#: src/compose.c:5116 src/toolbar.c:425
 msgid "Send later"
 msgstr "Send senere"
 
-#: 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"
@@ -2017,7 +2021,7 @@ msgstr ""
 "\n"
 "Tegnsettkonvertering mislyktes."
 
-#: 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"
@@ -2027,7 +2031,7 @@ msgstr ""
 "\n"
 "Fant ikke mottagerens krypteringsnøkkel."
 
-#: 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"
@@ -2038,7 +2042,7 @@ msgstr ""
 "\n"
 "Signatur mislyktes: %s"
 
-#: src/compose.c:5179
+#: src/compose.c:5181
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2049,11 +2053,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5181
+#: src/compose.c:5183
 msgid "Could not queue message for sending."
 msgstr "Kunne ikke legge meldingen i sendekøen."
 
-#: 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."
@@ -2061,7 +2065,7 @@ msgstr ""
 "Meldingen er lagt i køen, men kunne ikke sendes.\n"
 "Velg \"Send meldinger i køen\" fra hovedvinduet for å forsøke på nytt."
 
-#: src/compose.c:5252
+#: src/compose.c:5254
 #, c-format
 msgid ""
 "%s\n"
@@ -2070,7 +2074,7 @@ msgstr ""
 "%s\n"
 "Velg \"Send meldinger i køen\" fra hovedvinduet for å forsøke på nytt."
 
-#: src/compose.c:5627
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2081,7 +2085,7 @@ msgstr ""
 "tegnsettet %s.\n"
 "Send meldingen som %s?"
 
-#: src/compose.c:5685
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2094,74 +2098,73 @@ msgstr ""
 "\n"
 "Send likevel?"
 
-#: src/compose.c:5796
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Kunne ikke kryptere meldingen: %s"
 
-#: src/compose.c:5917
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Krypteringsadvarsel"
 
-#: src/compose.c:5918
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "_Fortsett"
 
-#: src/compose.c:5967
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Ingen konto tilgjengelig å sende epost fra!"
 
-#: src/compose.c:5976
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Den valgte konto er ikke NNTP: det er ikke mulig å poste."
 
-#: src/compose.c:6211
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Vedlegget %s finnes ikke lenger. Ignorer?"
 
-#: 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 "Avbryt sending"
 
-#: src/compose.c:6212
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ignorer vedlegg"
 
 # Context or note needed
-#: src/compose.c:6252
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Opprinnelig %s del"
 
-#: src/compose.c:6834
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Føy til i adresse_boken"
 
-#: src/compose.c:6995
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Slett innhold"
 
-#: 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 "Bruk <tab> for autofullføring ut fra adresseboken"
 
-#: src/compose.c:7221
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "MIME-type"
 
-#: 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 "Størrelse"
 
-#: src/compose.c:7290
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Lagre melding i"
 
-#: 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
@@ -2172,23 +2175,23 @@ msgstr "Lagre melding i"
 msgid "_Browse"
 msgstr "_Bla"
 
-#: src/compose.c:7800
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "Brevho_de"
 
-#: src/compose.c:7805
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Vedlegg"
 
-#: src/compose.c:7819
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "_Andre"
 
-#: src/compose.c:7834
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "_Emne:"
 
-#: src/compose.c:8058
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2197,19 +2200,19 @@ msgstr ""
 "Stavekontroll kunne ikke startes.\n"
 "%s"
 
-#: src/compose.c:8197
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_Fra:"
 
-#: src/compose.c:8214
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Konto som skal brukes for denne meldingen"
 
-#: src/compose.c:8216
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Tjeneradresse for sending"
 
-#: 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 "
@@ -2218,68 +2221,68 @@ msgstr ""
 "Personvernsystemet '%s' kan ikke innlastes. Du vil ikke kunne signere eller "
 "kryptere denne meldingen."
 
-#: 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 "_Ingen"
 
-#: 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 "Hovedteksten i malen har en feil ved linje %d."
 
-#: src/compose.c:8700
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Formatfeil i malens 'Fra'-felt."
 
-#: src/compose.c:8718
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Formatfeil i malens 'Til'-felt."
 
-#: src/compose.c:8736
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Formatfeil i malens 'Kopi-Til'-felt."
 
-#: src/compose.c:8754
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Formatfeil i malens 'Blindkopi-Til'-felt."
 
-#: src/compose.c:8772
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Formatfeil i malens 'Svar-Til'-felt."
 
-#: src/compose.c:8791
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Formatfeil i malens emnefelt."
 
-#: src/compose.c:9060
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME-type."
 
-#: src/compose.c:9075
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Filen eksisterer ikke, eller den er tom."
 
-#: src/compose.c:9149
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:9166
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: src/compose.c:9207
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Tegnkoding"
 
-#: src/compose.c:9227
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:9228
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Filnavn"
 
-#: src/compose.c:9479
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2290,15 +2293,15 @@ msgstr ""
 "Skal prosessen tvangsavbrytes?\n"
 "Prosessens gruppe-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 må ha nettadgang for å kunne sende epost."
 
-#: src/compose.c:9994
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Kunne ikke sette meldingen i kø."
 
-#: src/compose.c:9996
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2309,15 +2312,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10174
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Kunne ikke lagre utkast."
 
-#: src/compose.c:10178
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Kunne ikke lagre utkast"
 
-#: src/compose.c:10179
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2325,24 +2328,24 @@ msgstr ""
 "Kunne ikke lagre utkast.\n"
 "Vil du avbryte lukningen eller kassere denne meldingen? "
 
-#: src/compose.c:10181
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Avbryt lukning."
 
-#: src/compose.c:10181
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Kassér epost"
 
-#: src/compose.c:10341 src/compose.c:10355
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Velg fil"
 
-#: src/compose.c:10369
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunne ikke leses."
 
-#: src/compose.c:10371
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2351,54 +2354,54 @@ msgstr ""
 "Filen '%s' inneholder tegn som ikke er gyldige i\n"
 "den aktuelle tegnkodingen; de kan ha blitt feilaktig innsatt."
 
-#: src/compose.c:10458
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Kassér melding"
 
-#: src/compose.c:10459
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Meldingen er endret. Skal den kasseres?"
 
-#: src/compose.c:10460 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:10460 src/compose.c:10464
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "Lagre til _Utkast"
 
-#: src/compose.c:10462 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "_Lagre endringer"
 
-#: src/compose.c:10463
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Meldingen er endret. Skal endringene lagres?"
 
-#: src/compose.c:10464
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Ikke lagre"
 
-#: src/compose.c:10535
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vil du bruke malen '%s'?"
 
-#: src/compose.c:10537
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Bruk mal"
 
-#: src/compose.c:10538 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 "_Erstatt"
 
-#: src/compose.c:11396
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Sett inn eller vedlegg?"
 
-#: src/compose.c:11397
+#: 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 +2409,16 @@ msgstr ""
 "Vil du sette innholdet av filen(e) direkte inn i meldingsteksten, eller skal "
 "det sendes som separate vedlegg?"
 
-#: src/compose.c:11399
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Vedlegg"
 
-#: src/compose.c:11616
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Feil format på siteringstegnet i linje %d."
 
-#: src/compose.c:11911
+#: src/compose.c:11914
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2462,11 +2465,11 @@ msgstr "Opprett en feilrapport"
 msgid "Save crash information"
 msgstr "Lagre krasjinformasjon"
 
-#: src/editaddress.c:156 src/editaddress.c:232
+#: src/editaddress.c:155 src/editaddress.c:231
 msgid "Add New Person"
 msgstr "Legg til ny person"
 
-#: 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"
@@ -2492,7 +2495,7 @@ msgstr ""
 "Klikk OK for å fortsette å redigere kontakten.\n"
 "Klikk Avbryt for å lukke uten å lagre."
 
-#: 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"
@@ -2514,35 +2517,35 @@ msgstr ""
 "Klikk OK for å fortsette å redigere kontakten.\n"
 "Klikk Avbryt for å lukke uten å lagre."
 
-#: src/editaddress.c:233
+#: src/editaddress.c:232
 msgid "Edit Person Details"
 msgstr "Endre persondetaljer"
 
-#: src/editaddress.c:411
+#: src/editaddress.c:410
 msgid "An Email address must be supplied."
 msgstr "En epostadresse må angis."
 
-#: 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 "Et navn og en verdi må angis."
 
-#: src/editaddress.c:676 src/prefs_folder_item.c:1675
+#: src/editaddress.c:675 src/prefs_folder_item.c:1675
 msgid "Discard"
 msgstr "Kassér"
 
-#: src/editaddress.c:677
+#: src/editaddress.c:676
 msgid "Apply"
 msgstr "Bruk"
 
-#: src/editaddress.c:707 src/editaddress.c:756
+#: src/editaddress.c:706 src/editaddress.c:755
 msgid "Edit Person Data"
 msgstr "Endre persondata"
 
-#: src/editaddress.c:785
+#: src/editaddress.c:784
 msgid "Choose a picture"
 msgstr "Velg et bilde"
 
-#: src/editaddress.c:804
+#: src/editaddress.c:803
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2551,58 +2554,58 @@ msgstr ""
 "Kunne ikke importere bilde: \n"
 "%s"
 
-#: src/editaddress.c:846
+#: src/editaddress.c:845
 msgid "_Set picture"
 msgstr "_Angi bilde"
 
-#: src/editaddress.c:847
+#: src/editaddress.c:846
 msgid "_Unset picture"
 msgstr "_Fravelg bilde"
 
-#: src/editaddress.c:905
+#: src/editaddress.c:904
 msgid "Photo"
 msgstr "Bilde"
 
-#: 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 "Vist navn"
 
-#: 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 "Etternavn"
 
-#: 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 "Fornavn"
 
-#: src/editaddress.c:970 src/editaddress.c:972
+#: src/editaddress.c:969 src/editaddress.c:971
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: src/editaddress.c:1056 src/editaddress.c:1124
+#: src/editaddress.c:1055 src/editaddress.c:1123
 msgid "Alias"
 msgstr "Alias"
 
-#: 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 "Verdi"
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1425
 msgid "_User Data"
 msgstr "_Brukerdata"
 
-#: src/editaddress.c:1427
+#: src/editaddress.c:1426
 msgid "_Email Addresses"
 msgstr "_Epostadresser"
 
-#: src/editaddress.c:1430 src/editaddress.c:1433
+#: src/editaddress.c:1429 src/editaddress.c:1432
 msgid "O_ther Attributes"
 msgstr "Andre attributter"
 
-#: src/editaddress.c:1584
+#: src/editaddress.c:1583
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2632,8 +2635,8 @@ msgid " Check File "
 msgstr " Kontroller 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: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 "Fil"
 
@@ -2681,12 +2684,12 @@ msgstr "Endre mappe"
 msgid "Input the new name of folder:"
 msgstr "Angi nytt navn for mappen:"
 
-#: 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 "Ny mappe"
 
-#: 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 "Angi navnet på den nye mappen:"
@@ -2715,16 +2718,16 @@ msgstr "Nytt JPilot-felt"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Endre LDAP - Velg søkedatabase"
 
-#: src/editldap_basedn.c:156 src/editldap.c:440
+#: src/editldap_basedn.c:156 src/editldap.c:441
 msgid "Hostname"
 msgstr "Tjenernavn"
 
-#: 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 "Port"
 
-#: src/editldap_basedn.c:176 src/editldap.c:501
+#: src/editldap_basedn.c:176 src/editldap.c:502
 msgid "Search Base"
 msgstr "Søk i database"
 
@@ -2736,35 +2739,35 @@ msgstr "Tilgjengelig(e) søkedatabase(r) "
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Kunne ikke finne søkedatabase(r) på tjeneren - angi dette manuelt "
 
-#: 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 "Fikk ikke forbindelse til tjeneren"
 
-#: src/editldap.c:151
+#: src/editldap.c:152
 msgid "A Name must be supplied."
 msgstr "Et navn må angis."
 
-#: src/editldap.c:163
+#: src/editldap.c:164
 msgid "A Hostname must be supplied for the server."
 msgstr "Et vertsnavn må angis for tjeneren."
 
-#: src/editldap.c:176
+#: src/editldap.c:177
 msgid "At least one LDAP search attribute should be supplied."
 msgstr "Minst ett LDAP-søkeattributt må angis."
 
-#: src/editldap.c:277
+#: src/editldap.c:278
 msgid "Connected successfully to server"
 msgstr "Forbindelsen til tjeneren vellykket"
 
-#: src/editldap.c:335 src/editldap.c:973
+#: src/editldap.c:336 src/editldap.c:970
 msgid "Edit LDAP Server"
 msgstr "Rediger LDAP-tjener"
 
-#: src/editldap.c:436
+#: src/editldap.c:437
 msgid "A name that you wish to call the server."
 msgstr "Hva vil du kalle tjeneren?"
 
-#: 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 "
@@ -2776,15 +2779,15 @@ msgstr ""
 "Kjører LDAP-tjeneren på samme maskin som Claws Mail, kan du angi \"localhost"
 "\"."
 
-#: src/editldap.c:469
+#: src/editldap.c:470
 msgid "TLS"
 msgstr "TLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3343
+#: src/editldap.c:471 src/prefs_account.c:3396
 msgid "SSL"
 msgstr "SSL"
 
-#: 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 "
@@ -2794,7 +2797,7 @@ msgstr ""
 "innstillingene i ldap.conf (feltene TLS_CACERT og TLS_CACERTDIR) hvis "
 "tilkoblingen mislykkes."
 
-#: 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 "
@@ -2804,19 +2807,19 @@ msgstr ""
 "innstillingene i ldap.conf (feltene TLS_CACERTDIR og TLS_REQCERT) hvis "
 "tilkoblingen mislykkes."
 
-#: src/editldap.c:490
+#: src/editldap.c:491
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "Portnummeret tjeneren lytter på. Port 389 er standardverdien."
 
-#: src/editldap.c:493
+#: src/editldap.c:494
 msgid " Check Server "
 msgstr "Kontroller tjener"
 
-#: src/editldap.c:497
+#: src/editldap.c:498
 msgid "Press this button to test the connection to the server."
 msgstr "Klikk her for å teste forbindelsen til tjeneren."
 
-#: 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"
@@ -2830,17 +2833,17 @@ msgstr ""
 " ou=people,dc=domainname,dc=com\n"
 " o=Organization 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 "Klikk her for å lete etter tilgjengelige mappenavn på tjeneren."
 
-#: src/editldap.c:577
+#: src/editldap.c:578
 msgid "Search Attributes"
 msgstr "Søkeattributter"
 
-#: 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."
@@ -2848,11 +2851,11 @@ msgstr ""
 "En liste med LDAP-attributtnavn som skal søkes når man leter etter navn "
 "eller adresser."
 
-#: src/editldap.c:589
+#: src/editldap.c:590
 msgid " Defaults "
 msgstr " Standardverdier "
 
-#: 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."
@@ -2860,11 +2863,11 @@ msgstr ""
 "Dette nullstiller attributtnavnene til standardverdier som burde finne de "
 "fleste navn og adresser ved et navne- eller adressesøk."
 
-#: src/editldap.c:599
+#: src/editldap.c:600
 msgid "Max Query Age (secs)"
 msgstr "Maksimal søketid (sekunder)"
 
-#: 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 "
@@ -2887,11 +2890,11 @@ msgstr ""
 "senere søkninger. Dette er gunstig ved søk mot tjenere med høy responstid, "
 "men da på bekostning av mengden minne som brukes til mellomlagring."
 
-#: src/editldap.c:631
+#: src/editldap.c:632
 msgid "Include server in dynamic search"
 msgstr "Inkluder tjeneren i dynamiske søk"
 
-#: src/editldap.c:636
+#: src/editldap.c:637
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2899,11 +2902,11 @@ msgstr ""
 "Huk av for dette valget for å ta med tjeneren i dynamiske søk når\n"
 "funksjonen for automatisk adressefullføring brukes."
 
-#: src/editldap.c:642
+#: src/editldap.c:643
 msgid "Match names 'containing' search term"
 msgstr "Treff på navn som 'inneholder' søkestrengen"
 
-#: 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\" "
@@ -2917,11 +2920,11 @@ msgstr ""
 "ytelsesårsaker alltid bruker \"begynner-med\"-søkning for alle søkninger mot "
 "andre adressegrensesnitt."
 
-#: src/editldap.c:700
+#: src/editldap.c:701
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: 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 "
@@ -2932,40 +2935,40 @@ msgstr ""
 "det formen \"cn=bruker,dc=claws-mail,dc=org\", og brukes kun på beskyttede "
 "tjenere. Normalt vil dette være tomt ved søkning."
 
-#: src/editldap.c:716
+#: src/editldap.c:717
 msgid "Bind Password"
 msgstr "Bind passord"
 
-#: src/editldap.c:726
+#: src/editldap.c:727
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Passordet som skal brukes ved tilkobling som \"Bind DN\"-brukeren."
 
-#: src/editldap.c:731
+#: src/editldap.c:732
 msgid "Timeout (secs)"
 msgstr "Tidsavbrudd (sek.)"
 
-#: src/editldap.c:745
+#: src/editldap.c:746
 msgid "The timeout period in seconds."
 msgstr "Antall sekunder før en oppkobling avbrytes."
 
-#: src/editldap.c:749
+#: src/editldap.c:750
 msgid "Maximum Entries"
 msgstr "Maksimum antall poster"
 
-#: src/editldap.c:763
+#: src/editldap.c:764
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Det maksimale antall poster som skal returneres i søkeresultatet."
 
-#: src/editldap.c:778 src/prefs_account.c:3234
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: src/editldap.c:780 src/gtk/quicksearch.c:680
+#: src/editldap.c:781 src/gtk/quicksearch.c:680
 msgid "Extended"
 msgstr "Avansert"
 
-#: src/editldap.c:978
+#: src/editldap.c:975
 msgid "Add New LDAP Server"
 msgstr "Ny LDAP-tjener"
 
@@ -3092,20 +3095,20 @@ msgid "Stylesheet"
 msgstr "Stilsett"
 
 #: 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 "Ingen"
 
-#: 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 "Standardverdi"
 
-#: 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 "Fullt navn"
 
@@ -3332,7 +3335,7 @@ msgstr "Eksporter adressebok til LDIF-fil"
 msgid "Distinguished Name"
 msgstr "Distinkt Navn"
 
-#: src/export.c:113 src/summaryview.c:8190
+#: src/export.c:113 src/summaryview.c:8139
 msgid "Export to mbox file"
 msgstr "_Eksportér til mbox-fil"
 
@@ -3583,246 +3586,251 @@ msgstr ""
 "filtrerer melding (%s%s%s)\n"
 "%smeldingsfil: %s\n"
 
-#: 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 "Innboks"
 
-#: src/folder.c:1569 src/foldersel.c:407
+#: src/folder.c:1569 src/foldersel.c:404
 msgid "Sent"
 msgstr "Sendt"
 
-#: 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 "Kø"
 
-#: 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 "Papirkurv"
 
-#: 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 "Utkast"
 
-#: src/folder.c:2011
+#: src/folder.c:2012
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeider (%s)...\n"
 
-#: src/folder.c:3256
+#: src/folder.c:3257
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopierer %s til %s...\n"
 
-#: src/folder.c:3256
+#: src/folder.c:3257
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Flytter %s til %s...\n"
 
-#: src/folder.c:3564
+#: src/folder.c:3563
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Oppdaterer mellomlager for %s..."
 
-#: src/folder.c:4427
+#: src/folder.c:4424
 msgid "Processing messages..."
 msgstr "Bearbeider meldinger..."
 
-#: src/folder.c:4563
+#: src/folder.c:4559
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synkroniserer %s for bruk i frakoblet tilstand...\n"
 
-#: src/folder.c:4820
+#: src/folder.c:4816
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Ett mappe-navn kan ikke begynne eller slutte med ett punktum."
 
+#: src/folder.c:4820
+#, fuzzy
+msgid "A folder name can not end with a space."
+msgstr "Ett mappe-navn kan ikke begynne eller slutte med ett punktum."
+
 #: src/foldersel.c:247
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: 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 "NyMappe"
 
-#: 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 "Et mappenavn kan ikke inneholde '%c'."
 
-#: 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 "Mappen '%s' finnes allerede."
 
-#: 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 "Kan ikke opprette mappen '%s'."
 
-#: src/folderview.c:236
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Marker alt som l_est"
 
-#: src/folderview.c:237
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Marker alt som lest rekursi_vt"
 
-#: src/folderview.c:239
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "_Kjør bearbeidelsesregler"
 
-#: src/folderview.c:240 src/mainwindow.c:547
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Let i mappe..."
 
-#: src/folderview.c:242
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "_Bearbeider..."
 
-#: src/folderview.c:243
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Tøm papirkurv..."
 
-#: src/folderview.c:244
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Send _køen..."
 
-#: 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 "Nye"
 
-#: 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 "Uleste"
 
-#: 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 "I alt"
 
 #. 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 "#"
 
-#: src/folderview.c:767
+#: src/folderview.c:773
 msgid "Setting folder info..."
 msgstr "Angir mappeinformasjon..."
 
-#: 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 ""
 "Vil du virkelig merke all epost i denne mappen og dens undermapper som lest?"
 
-#: 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 "Vil du virkelig merke all epost i denne mappen som lest?"
 
-#: src/folderview.c:845 src/summaryview.c:4133
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Marker alt som lest"
 
-#: src/folderview.c:1015 src/imap.c:4605 src/mainwindow.c:5174 src/setup.c:91
-#, c-format
-msgid "Scanning folder %s%c%s..."
+#: src/folderview.c:1027 src/imap.c:4639
+#, fuzzy, c-format
+msgid "Scanning folder %s/%s..."
 msgstr "Ser igjennom mappen %s%c%s"
 
-#: 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 "Ser igjennom mappen %s ..."
 
-#: src/folderview.c:1050
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Gjendan lokalt mappetre"
 
-#: src/folderview.c:1051
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Hvis mappetreet gjendannes, vil lokale hurtiglager fjernes. Ønsker du å "
 "fortsette?"
 
-#: src/folderview.c:1061
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Oppdaterer mappetre..."
 
-#: src/folderview.c:1063
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Gjennomsøker mappetre..."
 
-#: src/folderview.c:1154
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kunne ikke gjennomgå mappen %s\n"
 
-#: src/folderview.c:1208
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Ser etter nye meldinger i alle mapper..."
 
-#: src/folderview.c:2124
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Lukker mappen %s..."
 
-#: src/folderview.c:2219
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Åpner mappen %s..."
 
-#: src/folderview.c:2237
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Mappen kunne ikke åpnes."
 
-#: 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 "Tøm papirkurven"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Slett alle meldingene i papirkurven?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Tøm Papirkurv"
 
-#: 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 "NB: Du er ikke online"
 
-#: src/folderview.c:2425 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Du arbeider i frakoblet tilstand. Overstyr?"
 
-#: src/folderview.c:2436 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Send meldinger i køen"
 
-#: src/folderview.c:2437 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Send alle meldinger i køen?"
 
-#: 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 "Enkelte feil oppsto mens meldinger i køen ble sendt"
 
-#: 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"
@@ -3831,64 +3839,64 @@ msgstr ""
 "Enkelte feil oppsto mens meldinger i køen ble sendt:\n"
 "%s"
 
-#: src/folderview.c:2524
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Vil du virkelig kopiere mappen '%s' til '%s'?"
 
-#: src/folderview.c:2525
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Vil du virkelig gjøre '%s' til en undermappe i '%s'?"
 
-#: src/folderview.c:2527
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Kopier mappe"
 
-#: src/folderview.c:2527
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Flytt mappe"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopierer %s til %s..."
 
-#: src/folderview.c:2538
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Flytter %s til %s..."
 
-#: src/folderview.c:2572
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Kilde og mål er identiske."
 
-#: src/folderview.c:2575
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan ikke kopiere en mappe til en av sine egne undermapper."
 
-#: src/folderview.c:2576
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Kan ikke flytte en mappe til en av sine egne undermapper."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "En mappe kan ikke flyttes mellom forskjellige postkasser."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Kopiering mislyktes!"
 
-#: src/folderview.c:2582
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Flytting mislyktes!"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Bearbeider oppsetningen for for mappe %s"
 
-#: 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 "Målmappen kan bare brukes for å lagre undermapper."
 
@@ -3912,7 +3920,7 @@ msgstr " Søk "
 msgid "Newsgroup name"
 msgstr "Navn på nyhetsgruppe"
 
-#: src/grouplistdialog.c:205
+#: src/grouplistdialog.c:205 src/prefs_send.c:171
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -3938,7 +3946,7 @@ msgstr "ukjent"
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ikke hente gruppeoversikt."
 
-#: 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 "Ferdig."
 
@@ -4032,7 +4040,7 @@ msgstr ""
 "Lokalisering: %s (tegnsett: %s)\n"
 "Operativsystem: ukjent"
 
-#: 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 "Claws-teamet"
 
@@ -4151,44 +4159,44 @@ msgstr ""
 "Du bør ha mottatt en kopi av GNUs General Public License sammen med dette "
 "programmet; hvis det ikke er tilfelle, se "
 
-#: src/gtk/about.c:698 src/main.c:2541
+#: src/gtk/about.c:698 src/main.c:2567
 msgid "Session statistics\n"
 msgstr "Statistikk for sesjonen\n"
 
-#: 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 "Påbegyndt: %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2560
+#: src/gtk/about.c:718 src/main.c:2586
 msgid "Incoming traffic\n"
 msgstr "Innkommende trafikk\n"
 
-#: 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 "Mottatte meldinger: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2569
+#: src/gtk/about.c:728 src/main.c:2595
 msgid "Outgoing traffic\n"
 msgstr "Utgående trafikk\n"
 
-#: 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 "Nye/omdirigerte meldinger: %d\n"
 
-#: 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 "Besvarte meldinger: %d\n"
 
-#: 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 "Videresendte meldinger: %d\n"
 
-#: 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 "Samlet antall utgående meldinger: %d\n"
@@ -4231,63 +4239,63 @@ msgstr "_Utgivelsesnotater"
 msgid "_Statistics"
 msgstr "_Statistikk"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Oransje"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rød"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Himmelblå"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Blå"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Grønn"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Brun"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Grå"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Lysebrun"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
+#: 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:402
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Mørk rosa"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
+#: 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:410
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Gull"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Lysegrønn"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -4513,7 +4521,7 @@ msgstr "Emne"
 msgid "Subject:"
 msgstr "Emne:"
 
-#: 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 "Kommentarer"
 
@@ -4628,11 +4636,11 @@ msgstr "Sett:"
 
 #: 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 "Status"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:881
+#: src/gtk/headers.h:37 src/prefs_themes.c:880
 msgid "Status:"
 msgstr "Status:"
 
@@ -4700,7 +4708,7 @@ msgstr "Forrang"
 msgid "Precedence:"
 msgstr "Forrang:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1071
+#: src/gtk/headers.h:46 src/prefs_account.c:1066
 msgid "Organization"
 msgstr "Organisasjon"
 
@@ -5009,9 +5017,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
@@ -5020,10 +5028,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 "Programtillegg"
 
@@ -5060,14 +5068,14 @@ msgstr "Innleste programtillegg"
 msgid "Page Index"
 msgstr "Sideindeks"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:834
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
 msgid "_Hide"
 msgstr "_Skjul"
 
 #: 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"
@@ -5343,7 +5351,7 @@ msgid "Signer"
 msgstr "Underskriver"
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:837
+#: src/prefs_themes.c:836
 msgid "Name: "
 msgstr "Navn:"
 
@@ -5469,21 +5477,21 @@ msgstr "SSL-sertifikatet er endret og ugyldig"
 msgid "SSL certificate changed"
 msgstr "SSL-sertifikatet er endret "
 
-#: src/headerview.c:95
+#: src/headerview.c:94
 msgid "Tags:"
 msgstr "Tagger:"
 
-#: 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 "(Intet Fra)"
 
-#: 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 "(Intet Emne)"
 
@@ -5523,175 +5531,216 @@ msgid "IMAP error on %s:"
 msgstr "IMAP-feil ved %s:"
 
 #: src/imap.c:621
-msgid " authenticated\n"
+#, fuzzy
+msgid "authenticated"
 msgstr " autentisert\n"
 
 #: src/imap.c:624
-msgid " not authenticated\n"
+#, fuzzy
+msgid "not authenticated"
 msgstr " ikke autentisert\n"
 
 #: src/imap.c:627
-msgid " bad state\n"
+#, fuzzy
+msgid "bad state"
 msgstr " feil status\n"
 
 #: src/imap.c:630
-msgid " stream error\n"
+#, fuzzy
+msgid "stream error"
 msgstr " feil i strøm\n"
 
 #: src/imap.c:633
-msgid " parse error (very probably non-RFC compliance from the server)\n"
+#, fuzzy
+msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr " lesefeil (antakelig en ikke RFC-kompatibel tjener)\n"
 
 #: src/imap.c:637
-msgid " connection refused\n"
+#, fuzzy
+msgid "connection refused"
 msgstr " forbindelse nektet\n"
 
 #: src/imap.c:640
-msgid " memory error\n"
+#, fuzzy
+msgid "memory error"
 msgstr " minnefeil\n"
 
 #: src/imap.c:643
-msgid " fatal error\n"
+#, fuzzy
+msgid "fatal error"
 msgstr " fatal feil\n"
 
 #: src/imap.c:646
-msgid " protocol error (very probably non-RFC compliance from the server)\n"
+#, fuzzy
+msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr " protokollfeil (antakelig en ikke RFC-kompatibel tjener)\n"
 
 #: src/imap.c:650
-msgid " connection not accepted\n"
+#, fuzzy
+msgid "connection not accepted"
 msgstr " forbindelse ikke godkjent\n"
 
 #: src/imap.c:653
-msgid " APPEND error\n"
+#, fuzzy
+msgid "APPEND error"
 msgstr " APPEND-feil\n"
 
 #: src/imap.c:656
-msgid " NOOP error\n"
+#, fuzzy
+msgid "NOOP error"
 msgstr " NOOP-feil\n"
 
 #: src/imap.c:659
-msgid " LOGOUT error\n"
+#, fuzzy
+msgid "LOGOUT error"
 msgstr " LOGOUT-feil\n"
 
 #: src/imap.c:662
-msgid " CAPABILITY error\n"
+#, fuzzy
+msgid "CAPABILITY error"
 msgstr " CAPABILITY-feil\n"
 
 #: src/imap.c:665
-msgid " CHECK error\n"
+#, fuzzy
+msgid "CHECK error"
 msgstr " CHECK-feil\n"
 
 #: src/imap.c:668
-msgid " CLOSE error\n"
+#, fuzzy
+msgid "CLOSE error"
 msgstr " CLOSE-feil\n"
 
 #: src/imap.c:671
-msgid " EXPUNGE error\n"
+#, fuzzy
+msgid "EXPUNGE error"
 msgstr " EXPUNGE-feil\n"
 
 #: src/imap.c:674
-msgid " COPY error\n"
+#, fuzzy
+msgid "COPY error"
 msgstr " COPY-feil\n"
 
 #: src/imap.c:677
-msgid " UID COPY error\n"
+#, fuzzy
+msgid "UID COPY error"
 msgstr " UID COPY-feil\n"
 
 #: src/imap.c:680
-msgid " CREATE error\n"
+#, fuzzy
+msgid "CREATE error"
 msgstr " CREATE-feil\n"
 
 #: src/imap.c:683
-msgid " DELETE error\n"
+#, fuzzy
+msgid "DELETE error"
 msgstr " DELETE-feil\n"
 
 #: src/imap.c:686
-msgid " EXAMINE error\n"
+#, fuzzy
+msgid "EXAMINE error"
 msgstr " EXAMINE-feil\n"
 
 #: src/imap.c:689
-msgid " FETCH error\n"
+#, fuzzy
+msgid "FETCH error"
 msgstr " FETCH-feil\n"
 
 #: src/imap.c:692
-msgid " UID FETCH error\n"
+#, fuzzy
+msgid "UID FETCH error"
 msgstr " UID FETCH-feil\n"
 
 #: src/imap.c:695
-msgid " LIST error\n"
+#, fuzzy
+msgid "LIST error"
 msgstr " LIST-feil\n"
 
 #: src/imap.c:698
-msgid " LOGIN error\n"
+#, fuzzy
+msgid "LOGIN error"
 msgstr " LOGIN-feil\n"
 
 #: src/imap.c:701
-msgid " LSUB error\n"
+#, fuzzy
+msgid "LSUB error"
 msgstr " LSUB-feil\n"
 
 #: src/imap.c:704
-msgid " RENAME error\n"
+#, fuzzy
+msgid "RENAME error"
 msgstr " RENAME-feil\n"
 
 #: src/imap.c:707
-msgid " SEARCH error\n"
+#, fuzzy
+msgid "SEARCH error"
 msgstr " SEARCH-feil\n"
 
 #: src/imap.c:710
-msgid " UID SEARCH error\n"
+#, fuzzy
+msgid "UID SEARCH error"
 msgstr " UID SEARCH-feil\n"
 
 #: src/imap.c:713
-msgid " SELECT error\n"
+#, fuzzy
+msgid "SELECT error"
 msgstr " SELECT-feil\n"
 
 #: src/imap.c:716
-msgid " STATUS error\n"
+#, fuzzy
+msgid "STATUS error"
 msgstr " STATUS-feil\n"
 
 #: src/imap.c:719
-msgid " STORE error\n"
+#, fuzzy
+msgid "STORE error"
 msgstr " STORE-feil\n"
 
 #: src/imap.c:722
-msgid " UID STORE error\n"
+#, fuzzy
+msgid "UID STORE error"
 msgstr " UID STORE-feil\n"
 
 #: src/imap.c:725
-msgid " SUBSCRIBE error\n"
+#, fuzzy
+msgid "SUBSCRIBE error"
 msgstr " SUBSCRIBE-feil\n"
 
 #: src/imap.c:728
-msgid " UNSUBSCRIBE error\n"
+#, fuzzy
+msgid "UNSUBSCRIBE error"
 msgstr " UNSUBSCRIBE-feil\n"
 
 #: src/imap.c:731
-msgid " STARTTLS error\n"
+#, fuzzy
+msgid "STARTTLS error"
 msgstr " STARTTLS-feil\n"
 
 #: src/imap.c:734
-msgid " INVAL error\n"
+#, fuzzy
+msgid "INVAL error"
 msgstr " INVAL-feil\n"
 
 #: src/imap.c:737
-msgid " EXTENSION error\n"
+#, fuzzy
+msgid "EXTENSION error"
 msgstr " EXTENSION-feil\n"
 
 #: src/imap.c:740
-msgid " SASL error\n"
+#, fuzzy
+msgid "SASL error"
 msgstr " SASL-feil\n"
 
 #: src/imap.c:744
-msgid " SSL error\n"
+#, fuzzy
+msgid "SSL error"
 msgstr " SSL-feil\n"
 
 #: src/imap.c:748
-#, c-format
-msgid " Unknown error [%d]\n"
+#, fuzzy, c-format
+msgid "Unknown error [%d]"
 msgstr " Ukjent feil [%d]\n"
 
-#: src/imap.c:940
+#: src/imap.c:952
 msgid ""
 "\n"
 "\n"
@@ -5703,7 +5752,7 @@ msgstr ""
 "CRAM-MD5-innlogging vil kun fungere hvis libetpan er kompilert med støtte "
 "forSASL, og programtillegget CRAM-MD5 er installert."
 
-#: src/imap.c:946
+#: src/imap.c:958
 msgid ""
 "\n"
 "\n"
@@ -5715,7 +5764,7 @@ msgstr ""
 "Innlogging med DIGEST-MD5 kan kun skje hvis libetpan er kompilert med støtte "
 "for SASL og programtillegget DIGEST-MD5 er installert."
 
-#: src/imap.c:952
+#: src/imap.c:964
 msgid ""
 "\n"
 "\n"
@@ -5727,36 +5776,62 @@ msgstr ""
 "SCRAM-SHA-1-innlogging vil kun fungere hvis libetpan er kompilert med støtte "
 "for SASL, og programtillegget SCRAM SASL er installert."
 
-#: src/imap.c:959
+#: src/imap.c:970
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"PLAIN logins only work if libetpan has been compiled with SASL support and "
+"the PLAIN SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"CRAM-MD5-innlogging vil kun fungere hvis libetpan er kompilert med støtte "
+"forSASL, og programtillegget CRAM-MD5 er installert."
+
+#: src/imap.c:976
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"LOGIN logins only work if libetpan has been compiled with SASL support and "
+"the LOGIN SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Innlogging med DIGEST-MD5 kan kun skje hvis libetpan er kompilert med støtte "
+"for SASL og programtillegget DIGEST-MD5 er installert."
+
+#: src/imap.c:983
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Oppkobling mot %s feilet: innlogging avvist.%s"
 
-#: src/imap.c:963
+#: src/imap.c:987
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Oppkobling mot %s feilet: innlogging avvist.%s\n"
 
-#: src/imap.c:981
+#: src/imap.c:1005
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Oppkobling til %s feilet"
 
-#: 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 "IMAP4-tilkobling til %s har avbrutt. Kobler til på nytt...\n"
 
-#: 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 "Claws Mail må ha nettadgang for å kunne kontakte IMAP-tjeneren."
 
-#: 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 "Usikker tilkobling"
 
-#: 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"
@@ -5770,104 +5845,104 @@ msgstr ""
 "Vil du beholde forbindelsen til denne tjeneren? Kommunikasjonen vil ikke "
 "være sikker."
 
-#: 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 "Fortsett tilkobling"
 
-#: src/imap.c:1147
+#: src/imap.c:1171
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "Konto '%s': Forbinder med IMAP4-tjener: %s:%d..."
 
-#: src/imap.c:1195
+#: src/imap.c:1219
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Får ikke forbindelse til IMAP4-tjener: %s:%d"
 
-#: src/imap.c:1198
+#: src/imap.c:1222
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Får ikke forbindelse til IMAP4-tjener: %s:%d\n"
 
-#: src/imap.c:1231 src/imap.c:4073
+#: src/imap.c:1255 src/imap.c:4110
 msgid "Can't start TLS session.\n"
 msgstr "Kan ikke starte TLS-sesjon.\n"
 
-#: src/imap.c:1294
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunne ikke logge inn på IMAP-tjeneren %s.\n"
 
-#: src/imap.c:1297
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunne ikke logge inn på LDAP-tjeneren %s."
 
-#: src/imap.c:1715
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Legger til meldinger..."
 
-#: src/imap.c:1920 src/mh.c:532
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopierer meldinger..."
 
-#: src/imap.c:2513
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "kan ikke sette sletteflagg: %d\n"
 
-#: src/imap.c:2520 src/imap.c:5028
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "kan ikke rense opp\n"
 
-#: src/imap.c:2871
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Leter etter uabonnerte mapper i %s..."
 
-#: src/imap.c:2874
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ser etter undermapper under %s..."
 
-#: src/imap.c:3192
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke opprette postkasse: LIST mislyktes\n"
 
-#: src/imap.c:3207
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "kan ikke opprette postkasse\n"
 
-#: src/imap.c:3338
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke endre navn på postkasse: %s til %s\n"
 
-#: src/imap.c:3451
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette postkasse\n"
 
-#: src/imap.c:3730
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST mislyktes\n"
 
-#: src/imap.c:3815
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Merker meldinger..."
 
-#: src/imap.c:3918
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke velge mappe: %s\n"
 
-#: src/imap.c:4070
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Tjeneren krever innlogging med TLS.\n"
 
-#: src/imap.c:4080
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan ikke gjeninnlese muligheter.\n"
 
-#: src/imap.c:4085
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5876,24 +5951,24 @@ msgstr ""
 "Forbindelsen til %s mislyktes: tjeneren krever TLS, men Claws Mail er blitt "
 "kompilert uten TLS-funksjonalitet.\n"
 
-#: src/imap.c:4093
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Login til tjeneren er deaktivert.\n"
 
-#: src/imap.c:4316
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Henter melding..."
 
-#: src/imap.c:5021
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan ikke sette slettet flagg: %d\n"
 
-#: src/imap.c:6056
+#: src/imap.c:6089
+#, fuzzy
 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 ""
@@ -5940,7 +6015,7 @@ msgstr "_Abonnementer"
 msgid "_Subscribe..."
 msgstr "_Abonner..."
 
-#: 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 "_Stopp abonnement..."
 
@@ -5961,7 +6036,7 @@ msgstr "_Oppdater mappetre"
 msgid "Show only subscribed _folders"
 msgstr "Vis _bare mapper du abonnerer på"
 
-#: 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"
@@ -5971,26 +6046,26 @@ msgstr ""
 "(hvis du vil opprette en mappe som bare skal inneholde\n"
 "undermapper og ikke epost, føy '/' til mappenavnet)"
 
-#: 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 "Arv egenskaper fra overordnet mappe"
 
-#: 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 "Angi nytt navn for '%s':"
 
-#: 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 "Bytt navn på mappe"
 
-#: 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."
@@ -5998,7 +6073,7 @@ msgstr ""
 "Mappen kunne ikke omdøpes.\n"
 "Det nye mappenavnet er ikke tillatt."
 
-#: 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 "
@@ -6011,44 +6086,44 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å slette?"
 
-#: 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 "Kan ikke slette mappen '%s'."
 
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:498
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "Vil du lete etter undermapper av '%s' som du ikke abonnerer på?"
 
-#: src/imap_gtk.c:509
+#: src/imap_gtk.c:501
 msgid "Search recursively"
 msgstr "Gjennomsøk alle undermapper"
 
-#: src/imap_gtk.c:514 src/imap_gtk.c:573
+#: src/imap_gtk.c:506 src/imap_gtk.c:565
 msgid "Subscriptions"
 msgstr "Abonnementer"
 
-#: src/imap_gtk.c:515
+#: src/imap_gtk.c:507
 msgid "_Search"
 msgstr "_Søk"
 
-#: src/imap_gtk.c:525
+#: src/imap_gtk.c:517
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Velg en undermappe under %s å abonnere på:"
 
-#: src/imap_gtk.c:536 src/mainwindow.c:675
+#: src/imap_gtk.c:528 src/mainwindow.c:679
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: 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 "Alle sammen"
 
-#: src/imap_gtk.c:556
+#: src/imap_gtk.c:548
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6061,29 +6136,29 @@ msgstr ""
 "Hvis det er nye mapper, som er opprettet og abonnert på fra en annen klient, "
 "bruk \"Søk etter nye mapper\" i postkassens rotmappe."
 
-#: src/imap_gtk.c:565
+#: src/imap_gtk.c:557
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Vil du %s mappen '%s'?"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:558
 msgid "subscribe"
 msgstr "abonner"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:558
 msgid "unsubscribe"
 msgstr "stopp abonnement"
 
-#: src/imap_gtk.c:568 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 "Utfør på undermapper"
 
-#: src/imap_gtk.c:574
+#: src/imap_gtk.c:566
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: src/imap_gtk.c:575 src/news_gtk.c:267
+#: src/imap_gtk.c:567 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "_Dropp abonnement på nyhetsgruppe"
 
@@ -6267,142 +6342,142 @@ msgstr "Velg Pine-fil"
 msgid "Import Pine file into Address Book"
 msgstr "Importer Pine-fil til adressebok"
 
-#: 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 "Claws Mail må ha nettadgang for å kunne hente epost."
 
-#: src/inc.c:344
+#: src/inc.c:343
 #, c-format
 msgid "%s failed\n"
 msgstr "%s mislyktes\n"
 
-#: src/inc.c:417
+#: src/inc.c:416
 msgid "Retrieving new messages"
 msgstr "Henter nye meldinger"
 
-#: src/inc.c:478
+#: src/inc.c:474
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:621 src/inc.c:675
+#: src/inc.c:615 src/inc.c:669
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: src/inc.c:632
+#: src/inc.c:626
 msgid "Retrieving"
 msgstr "Henter"
 
-#: 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] "Ferdig (%d melding (%s) mottatt)"
 msgstr[1] "Ferdig (%d meldinger (%s) mottatt)"
 
-#: src/inc.c:647
+#: src/inc.c:641
 msgid "Done (no new messages)"
 msgstr "Ferdig (ingen nye meldinger)"
 
-#: src/inc.c:652
+#: src/inc.c:646
 msgid "Connection failed"
 msgstr "Forbindelse mislyktes"
 
-#: src/inc.c:655 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
 msgid "Auth failed"
 msgstr "Autentisering mislyktes"
 
-#: 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 "Låst"
 
-#: 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 "Tidsavbrudd"
 
-#: src/inc.c:759
+#: src/inc.c:752
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Ferdig (%d ny melding)"
 msgstr[1] "Ferdig (%d nye meldinger)"
 
-#: src/inc.c:763
+#: src/inc.c:756
 msgid "Finished (no new messages)"
 msgstr "Ferdig (ingen nye meldinger)"
 
-#: src/inc.c:802
+#: src/inc.c:795
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Henter nye meldinger"
 
-#: src/inc.c:832
+#: src/inc.c:825
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Konto '%s': Forbinder til POP3-tjener: %s:%d..."
 
-#: src/inc.c:850
+#: src/inc.c:843
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Får ikke forbindelse til POP3-tjener: %s:%d"
 
-#: src/inc.c:854
+#: src/inc.c:847
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Får ikke forbindelse til POP3-tjener: %s:%d\n"
 
-#: 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 "Autentisering..."
 
-#: src/inc.c:936
+#: src/inc.c:929
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Henter meldinger fra %s (%s)..."
 
-#: src/inc.c:942
+#: src/inc.c:935
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Finner antall nye meldinger (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:939
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Finner antall nye meldinger (LAST)..."
 
-#: src/inc.c:950
+#: src/inc.c:943
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Finner antall nye meldinger (UIDL)..."
 
-#: src/inc.c:954
+#: src/inc.c:947
 msgid "Getting the size of messages (LIST)..."
 msgstr "Finner meldingenes størrelser (LIST)..."
 
-#: src/inc.c:961 src/send_message.c:515
+#: src/inc.c:954 src/send_message.c:514
 msgid "Quitting"
 msgstr "Avslutter"
 
-#: src/inc.c:986
+#: src/inc.c:979
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Henter melding (%d / %d) (%s / %s)"
 
-#: 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] "Laster ned (%d melding (%s) mottatt)"
 msgstr[1] "Laster ned (%d meldinger (%s) mottatt)"
 
-#: src/inc.c:1158
+#: src/inc.c:1151
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Forbindelse til %s:%d mislyktes."
 
-#: src/inc.c:1163
+#: src/inc.c:1156
 msgid "Error occurred while processing mail."
 msgstr "Feil oppsto ved behandling av epost."
 
-#: src/inc.c:1169
+#: src/inc.c:1162
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6411,37 +6486,37 @@ msgstr ""
 "Feil oppsto ved behandling av epost:\n"
 "%s"
 
-#: src/inc.c:1175
+#: src/inc.c:1168
 msgid "No disk space left."
 msgstr "Disken er full."
 
-#: src/inc.c:1180
+#: src/inc.c:1173
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1185
+#: src/inc.c:1178
 msgid "Socket error."
 msgstr "Socket-feil."
 
-#: src/inc.c:1188
+#: src/inc.c:1181
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-feil ved oppkobling til %s:%d."
 
-#: 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 "Forbindelsen lukket av nettverksvert."
 
-#: src/inc.c:1196
+#: src/inc.c:1189
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Forbindelsen til %s:%d ble lukket av nettverksverten."
 
-#: src/inc.c:1201
+#: src/inc.c:1194
 msgid "Mailbox is locked."
 msgstr "Postkassen er låst."
 
-#: src/inc.c:1205
+#: src/inc.c:1198
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6450,11 +6525,11 @@ msgstr ""
 "Postkassen er låst:\n"
 "%s"
 
-#: src/inc.c:1211 src/send_message.c:674
+#: src/inc.c:1204 src/send_message.c:673
 msgid "Authentication failed."
 msgstr "Autentisering mislyktes."
 
-#: src/inc.c:1217 src/send_message.c:677
+#: src/inc.c:1210 src/send_message.c:676
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6463,7 +6538,7 @@ msgstr ""
 "Autentisering mislyktes:\n"
 "%s"
 
-#: 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."
@@ -6471,26 +6546,26 @@ msgstr ""
 "Sesjonen fikk tidsavbrudd. Du kan kanskje gjenopprette den ved å øke "
 "tidsavbruddsverdien i Innstillinger/Annet/Diverse."
 
-#: src/inc.c:1227
+#: src/inc.c:1220
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Tidsabbrudd i forbindelsen til %s:%d."
 
-#: src/inc.c:1265
+#: src/inc.c:1258
 msgid "Incorporation cancelled\n"
 msgstr "Henting avbrutt\n"
 
-#: src/inc.c:1530
+#: src/inc.c:1523
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sDu arbeider i frakoblet tilstand. Overstyr i de neste %d minutter?"
 
-#: src/inc.c:1536
+#: src/inc.c:1529
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sDu arbeider i frakoblet tilstand. Overstyr?"
 
-#: src/inc.c:1543
+#: src/inc.c:1536
 msgid "On_ly once"
 msgstr "Kun en gang"
 
@@ -6502,7 +6577,7 @@ msgstr "Et SN"
 msgid "Nick Name"
 msgstr "Kallenavn"
 
-#: src/main.c:242
+#: src/main.c:244
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6511,7 +6586,7 @@ msgstr ""
 "Filen '%s' finnes allerede.\n"
 "Kan ikke opprette mappe."
 
-#: src/main.c:363
+#: src/main.c:365
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6520,7 +6595,7 @@ msgstr ""
 "Innstillinger for %s funnet.\n"
 "Vil du migrere disse innstillingene?"
 
-#: src/main.c:365
+#: src/main.c:367
 #, c-format
 msgid ""
 "\n"
@@ -6533,11 +6608,11 @@ msgstr ""
 "Dine filterregler fra Sylpheed kan konverteres med et\n"
 "skript som finnes på %s."
 
-#: src/main.c:377
+#: src/main.c:379
 msgid "Keep old configuration"
 msgstr "Behold gamle innstillinger"
 
-#: 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 "
@@ -6547,31 +6622,31 @@ msgstr ""
 "kan ta noe tid hvis du har IMAP- eller News-data i hurtiglager, og det vil "
 "ta ekstra plass på harddisken. "
 
-#: src/main.c:388
+#: src/main.c:390
 msgid "Migration of configuration"
 msgstr "Migrer innstillinger"
 
-#: src/main.c:399
+#: src/main.c:401
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopierer innstillinger... Dette kan ta litt tid..."
 
-#: src/main.c:408
+#: src/main.c:410
 msgid "Migration failed!"
 msgstr "Migrering mislyktes!"
 
-#: src/main.c:417
+#: src/main.c:419
 msgid "Migrating configuration..."
 msgstr "Migrerer innstillinger..."
 
-#: src/main.c:1117
+#: src/main.c:1119
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread støttes ikke av glib.\n"
 
-#: 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 "(eller eldre)"
 
-#: src/main.c:1445
+#: src/main.c:1448
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6590,7 +6665,7 @@ msgstr[1] ""
 "innstillinger for nærmere opplysninger:\n"
 "%s"
 
-#: 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 "
@@ -6601,7 +6676,7 @@ msgstr ""
 "mappetre\" i kontekstmenyen for postkassens overordnede mappe for å forsøke "
 "å reparere den."
 
-#: 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 "
@@ -6611,36 +6686,36 @@ msgstr ""
 "innleses. Dette skyldes antakelig et utdatert programtillegg. Gjeninstaller "
 "dette og prøv igjen."
 
-#: src/main.c:1729
+#: src/main.c:1750
 msgid "Missing filename\n"
 msgstr "Manglende filnavn\n"
 
-#: src/main.c:1736
+#: src/main.c:1757
 msgid "Cannot open filename for reading\n"
 msgstr "Kan ikke åpne fil for lesning\n"
 
-#: src/main.c:1747
+#: src/main.c:1768
 msgid "Malformed header\n"
 msgstr "Misformet brevhode\n"
 
-#: src/main.c:1754
+#: src/main.c:1775
 msgid "Duplicated 'To:' header\n"
 msgstr "Dobbelt 'Til:'-brevhode\n"
 
-#: src/main.c:1765
+#: src/main.c:1786
 msgid "Missing required 'To:' header\n"
 msgstr "Det påkrevde 'Til'-brevhode mangler\n"
 
-#: src/main.c:1908
+#: src/main.c:1929
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Bruk: %s [VAL]...\n"
 
-#: src/main.c:1910
+#: src/main.c:1931
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    åpne redigeringsvinduet"
 
-#: src/main.c:1911
+#: src/main.c:1932
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6659,11 +6734,11 @@ msgstr ""
 "                         en tom linje, deretter meldingsteksten til slutten "
 "av filen."
 
-#: src/main.c:1916
+#: src/main.c:1937
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      abonner på angitte URI dersom mulig."
 
-#: src/main.c:1917
+#: src/main.c:1938
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6672,23 +6747,23 @@ msgstr ""
 "  --attach fil1 [fil2]...\n"
 "                åpne redigeringsvinduet med de angitte filer som vedlegg"
 
-#: src/main.c:1920
+#: src/main.c:1941
 msgid "  --receive              receive new messages"
 msgstr "  --receive              ta imot nye meldinger"
 
-#: src/main.c:1921
+#: src/main.c:1942
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          ta imot nye meldinger fra alle kontoer"
 
-#: src/main.c:1922
+#: src/main.c:1943
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     avbryt henting av meldinger"
 
-#: src/main.c:1923
+#: src/main.c:1944
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr " --cancel-sending       avbryt sending"
 
-#: src/main.c:1924
+#: src/main.c:1945
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6706,15 +6781,15 @@ msgstr ""
 "                         forespørsel: søkestreng\n"
 "                         rekursiv: false if arg. starts with 0, n, N, f or F"
 
-#: src/main.c:1931
+#: src/main.c:1952
 msgid "  --send                 send all queued messages"
 msgstr "  --send                        send alle meldinger i køen"
 
-#: src/main.c:1932
+#: src/main.c:1953
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappe]...          vis det samlede antall meldinger"
 
-#: src/main.c:1933
+#: src/main.c:1954
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6722,15 +6797,15 @@ msgstr ""
 "  --status-full [mappe]...\n"
 "                        vis status for hver mappe"
 
-#: src/main.c:1935
+#: src/main.c:1956
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           vis statistikk for sesjonen"
 
-#: src/main.c:1936
+#: src/main.c:1957
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     nullstill statistikk for sesjonen"
 
-#: 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'"
@@ -6738,35 +6813,35 @@ msgstr ""
 " --select mappe[/melding]   Gå til angitt mappe/melding\n"
 "                         'mappe' er mappens id som i 'mappe/under_mappe'"
 
-#: src/main.c:1939
+#: src/main.c:1960
 msgid "  --online               switch to online mode"
 msgstr "  --online               bytt til tilkoblet modus"
 
-#: src/main.c:1940
+#: src/main.c:1961
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline             gå til frakoblet modus"
 
-#: src/main.c:1941
+#: src/main.c:1962
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       lukk Claws"
 
-#: src/main.c:1942
+#: src/main.c:1963
 msgid "  --debug                debug mode"
 msgstr "  --debug                feilrettingsmodus"
 
-#: src/main.c:1943
+#: src/main.c:1964
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         slå feilrettingsmodus til/fra"
 
-#: src/main.c:1944
+#: src/main.c:1965
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              vis denne hjelpeteksten og avslutt"
 
-#: src/main.c:1945
+#: src/main.c:1966
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           vis versionsinformasjon og avslutt"
 
-#: src/main.c:1946
+#: src/main.c:1967
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6774,12 +6849,12 @@ msgstr ""
 "  --version-full -V      vis informasjon om versjon samt innebygde "
 "funksjoner, og avslutt"
 
-#: src/main.c:1947
+#: src/main.c:1968
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 "  --config-dir           vis hvilken mappe som brukes for konfigurasjonsfiler"
 
-#: src/main.c:1948
+#: src/main.c:1969
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6787,838 +6862,850 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         bruk den angitte mappe for innstillinger"
 
-#: 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 "Ukjent alternativ\n"
 
-#: src/main.c:2016
+#: src/main.c:2042
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Behandler (%s)..."
 
-#: src/main.c:2019
+#: src/main.c:2045
 msgid "top level folder"
 msgstr "toppnivåmappe"
 
-#: src/main.c:2102
+#: src/main.c:2128
 msgid "Queued messages"
 msgstr "Melding i kø"
 
-#: src/main.c:2103
+#: src/main.c:2129
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Noen usendte meldinger ligger fremdeles i køen. Avslutte nå?"
 
-#: src/main.c:2845
+#: src/main.c:2871
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: nettverket er tilkoblet.\n"
 
-#: src/main.c:2851
+#: src/main.c:2877
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: nettverket er frakoblet.\n"
 
-#: src/mainwindow.c:507 src/messageview.c:209
+#: src/mainwindow.c:511 src/messageview.c:208
 msgid "_File"
 msgstr "_Fil"
 
-#: 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 "_Vis"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:516
 msgid "_Configuration"
 msgstr "_Innstillinger"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:520
 msgid "_Add mailbox"
 msgstr "_Ny postkasse"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:524
 msgid "Change mailbox order..."
 msgstr "Endre _rekkefølge på postkassene..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "_Import mbox file..."
 msgstr "_Importer mbox-fil..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:528
 msgid "_Export to mbox file..."
 msgstr "_Eksportér til _mbox-fil..."
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:529
 msgid "_Export selected to mbox file..."
 msgstr "_Eksportér utvalg til mbox-fil..."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "Empty all _Trash folders"
 msgstr "Tøm alle _Papirkurver"
 
-#: src/mainwindow.c:530 src/messageview.c:218
+#: src/mainwindow.c:534 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "_Lagre melding som..."
 
-#: src/mainwindow.c:531 src/messageview.c:219
+#: src/mainwindow.c:535 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "Lagre _del som..."
 
-#: src/mainwindow.c:534 src/messageview.c:220
+#: src/mainwindow.c:538 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Sideoppsetning..."
 
-#: src/mainwindow.c:535 src/messageview.c:221
+#: src/mainwindow.c:539 src/messageview.c:220
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:541
 msgid "Synchronise folders"
 msgstr "S_ynkroniser mapper"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "Select _thread"
 msgstr "_Velg tråd"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:550
 msgid "_Find in current message..."
 msgstr "_Finn i nåværende melding..."
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:552
 msgid "_Quick search"
 msgstr "_Hurtigsøk"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "Show or hi_de"
 msgstr "_Vis eller skjul"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "_Toolbar"
 msgstr "_Verktøylinje"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:558
 msgid "Set displayed _columns"
 msgstr "_Angi kolonner som skal vises"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "In _folder list..."
 msgstr "I _mappeliste... "
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "In _message list..."
 msgstr "I m_eldingsliste..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "La_yout"
 msgstr "Vindus_plassering"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "_Sort"
 msgstr "_Sorter"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:570
 msgid "_Attract by subject"
 msgstr "Tråd også etter emne"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:572
 msgid "E_xpand all threads"
 msgstr "Fold _ut alle tråder"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "Co_llapse all threads"
 msgstr "Slå sa_mmen alle tråder"
 
-#: src/mainwindow.c:571 src/messageview.c:232
+#: src/mainwindow.c:575 src/messageview.c:231
 msgid "_Go to"
 msgstr "_Gå til"
 
-#: src/mainwindow.c:572 src/messageview.c:233
+#: src/mainwindow.c:576 src/messageview.c:232
 msgid "_Previous message"
 msgstr "_Forrige melding"
 
-#: src/mainwindow.c:573 src/messageview.c:234
+#: src/mainwindow.c:577 src/messageview.c:233
 msgid "_Next message"
 msgstr "_Neste melding"
 
-#: src/mainwindow.c:575 src/messageview.c:236
+#: src/mainwindow.c:579 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "Forrige u_leste melding"
 
-#: src/mainwindow.c:576 src/messageview.c:237
+#: src/mainwindow.c:580 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Neste _uleste melding"
 
-#: src/mainwindow.c:578 src/messageview.c:239
+#: src/mainwindow.c:582 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Fo_rrige nye melding"
 
-#: src/mainwindow.c:579 src/messageview.c:240
+#: src/mainwindow.c:583 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "Neste n_ye melding"
 
-#: src/mainwindow.c:581 src/messageview.c:242
+#: src/mainwindow.c:585 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "Forrige mar_kerte melding"
 
-#: src/mainwindow.c:582 src/messageview.c:243
+#: src/mainwindow.c:586 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "Neste _markerte melding"
 
-#: src/mainwindow.c:584 src/messageview.c:245
+#: src/mainwindow.c:588 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "F_orrige fargemerkede melding"
 
-#: src/mainwindow.c:585 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "Neste far_gemerkede melding"
 
-#: src/mainwindow.c:587 src/messageview.c:248
+#: src/mainwindow.c:591 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Forrige åpnede melding"
 
-#: src/mainwindow.c:588 src/messageview.c:249
+#: src/mainwindow.c:592 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Neste åpnede melding"
 
-#: src/mainwindow.c:590 src/messageview.c:251
+#: src/mainwindow.c:594 src/messageview.c:250
 msgid "Parent message"
 msgstr "Overordnet melding"
 
-#: src/mainwindow.c:592 src/messageview.c:253
+#: src/mainwindow.c:596 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Neste uleste _mappe"
 
-#: src/mainwindow.c:593 src/messageview.c:254
-msgid "_Other folder..."
-msgstr "_Annen mappe..."
+#: src/mainwindow.c:597 src/messageview.c:253
+#, fuzzy
+msgid "F_older..."
+msgstr "Mappe"
 
-#: 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 "Neste del"
 
-#: 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 "Forrige del"
 
-#: src/mainwindow.c:599 src/messageview.c:258
+#: src/mainwindow.c:603 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Rulling i meldingsvindu"
 
-#: src/mainwindow.c:600 src/messageview.c:259
+#: src/mainwindow.c:604 src/messageview.c:258
 msgid "Previous line"
 msgstr "Forrige linje"
 
-#: src/mainwindow.c:601 src/messageview.c:260
+#: src/mainwindow.c:605 src/messageview.c:259
 msgid "Next line"
 msgstr "Neste linje"
 
-#: 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 "Forrige side"
 
-#: 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 "Neste side"
 
-#: src/mainwindow.c:621 src/messageview.c:280
+#: src/mainwindow.c:625 src/messageview.c:279
 msgid "Decode"
 msgstr "Avkod"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:632
 msgid "Open in new _window"
 msgstr "Åpne i _nytt vindu"
 
-#: src/mainwindow.c:629 src/messageview.c:287
+#: src/mainwindow.c:633 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Meldingens _kildekode"
 
-#: src/mainwindow.c:631 src/messageview.c:288
+#: src/mainwindow.c:635 src/messageview.c:287
 msgid "Message part"
 msgstr "Meldingsinnhold"
 
-#: src/mainwindow.c:632 src/messageview.c:289
+#: src/mainwindow.c:636 src/messageview.c:288
 msgid "View as text"
 msgstr "Vis som _tekst"
 
-#: 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 "Åpne"
 
-#: src/mainwindow.c:635 src/messageview.c:292
+#: src/mainwindow.c:639 src/messageview.c:291
 msgid "Open with..."
 msgstr "Åpne med..."
 
-#: src/mainwindow.c:639 src/messageview.c:295
+#: src/mainwindow.c:643 src/messageview.c:294
 msgid "Quotes"
 msgstr "Sitater"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:645
 msgid "_Update summary"
 msgstr "_Oppdater sammendrag"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:648
 msgid "Recei_ve"
 msgstr "_Hent"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:649
 msgid "Get from _current account"
 msgstr "Hent fra _aktiv konto"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:650
 msgid "Get from _all accounts"
 msgstr "Hent fra a_lle kontoer"
 
-#: src/mainwindow.c:647
+#: src/mainwindow.c:651
 msgid "Cancel receivin_g"
 msgstr "Av_bryt henting"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:654
 msgid "_Send queued messages"
 msgstr "Send meldinger i _køen"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:659
 msgid "Compose a_n email message"
 msgstr "_Ny epost"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:660
 msgid "Compose a news message"
 msgstr "Ny melding til _nyhetsgruppe"
 
-#: 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 "Sva_r"
 
-#: 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 "Svar _til"
 
-#: src/mainwindow.c:662 src/messageview.c:305
+#: src/mainwindow.c:666 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "_Postliste"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:667
 msgid "Follow-up and reply to"
 msgstr "_Oppfølgning og svar til"
 
-#: 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 "_Videresend"
 
-#: 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 "V_ideresend som vedlegg"
 
-#: 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 "Om_diriger"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:674
 msgid "Mailing-_List"
 msgstr "Post_liste"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:675
 msgid "Post"
 msgstr "Send"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:677
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:681
 msgid "Unsubscribe"
 msgstr "Avbryt abonnement"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "View archive"
 msgstr "Vis arkiv"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:685
 msgid "Contact owner"
 msgstr "Kontakt eier"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:689
 msgid "M_ove..."
 msgstr "_Flytt..."
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "Move to _trash"
 msgstr "Flytt til _papirkurven"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:692
 msgid "_Delete..."
 msgstr "_Slett..."
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:693
 msgid "Move thread to tr_ash"
 msgstr "Flytt t_råd til papirkurven"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:694
 msgid "Delete t_hread"
 msgstr "S_lett tråd"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:695
 msgid "Cancel a news message"
 msgstr "Avbryt nyhetsgruppemelding"
 
-#: 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 "_Marker"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:700
 msgid "_Unmark"
 msgstr "_Fjern markering"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:703
 msgid "Mark as unr_ead"
 msgstr "Marker som _ulest"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:704
 msgid "Mark as rea_d"
 msgstr "Marker som _lest"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:706
 msgid "Mark all read"
 msgstr "Marker _alt som lest"
 
-#: 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 "Ignorer tråd"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "Unignore thread"
 msgstr "Ignorer ikke tråd"
 
-#: 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 "Overvåk tråd"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "Unwatch thread"
 msgstr "Overvåk ikke tråd"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "Mark as _spam"
 msgstr "Marker som _spam"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "Mark as _ham"
 msgstr "Marker som _ham"
 
-#: src/mainwindow.c:714 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "Lås"
 
-#: src/mainwindow.c:715 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
 msgid "Unlock"
 msgstr "Lås opp"
 
-#: src/mainwindow.c:717 src/summaryview.c:427
+#: src/mainwindow.c:721 src/summaryview.c:427
 msgid "Color la_bel"
 msgstr "F_argemerkning"
 
-#: src/mainwindow.c:718 src/summaryview.c:428
+#: src/mainwindow.c:722 src/summaryview.c:428
 msgid "Ta_gs"
 msgstr "Ta_gger"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:725
 msgid "Re-_edit"
 msgstr "R_ediger igjen"
 
-#: 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 "Kontroller signatur"
 
-#: src/mainwindow.c:729 src/messageview.c:315
+#: src/mainwindow.c:733 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "_Legg avsenderen til i adresseboken"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:735
 msgid "C_ollect addresses"
 msgstr "_Hent adresser"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:736
 msgid "From current _folder..."
 msgstr "Fra aktuell _mappe..."
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:737
 msgid "From selected _messages..."
 msgstr "Fra _valgte meldinger..."
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:740
 msgid "_Filter all messages in folder"
 msgstr "_Filtrer alle meldinger i mappen"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:741
 msgid "Filter _selected messages"
 msgstr "Filtrer _valgte meldinger"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:742
 msgid "Run folder pr_ocessing rules"
 msgstr "Kjør bearbeidningsregler"
 
-#: src/mainwindow.c:740 src/messageview.c:318
+#: src/mainwindow.c:744 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "_Opprett filterregel"
 
-#: 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 "_Automatisk"
 
-#: 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 "Etter _Fra"
 
-#: 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 "Etter _Til"
 
-#: 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 "Etter _Emne"
 
-#: 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 "Opprett _bearbeidingsregel"
 
-#: src/mainwindow.c:753 src/messageview.c:332
+#: src/mainwindow.c:757 src/messageview.c:331
 msgid "List _URLs..."
 msgstr "V_is URL-er..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "Ch_eck for new messages in all folders"
 msgstr "Se etter n_ye meldinger i alle mapper"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "Delete du_plicated messages"
 msgstr "Slett _dubletter"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "In selected folder"
 msgstr "I den valgte mappen"
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:767
 msgid "In all folders"
 msgstr "I alle mapper"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "E_xecute"
 msgstr "_Utfør"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:771
 msgid "Exp_unge"
 msgstr "_Rens"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:774
 msgid "SSL cer_tificates"
 msgstr "SSL-sertifikater"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "Filtering Lo_g"
 msgstr "Filterlo_gg"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "Network _Log"
 msgstr "_Nettverkslogg"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "_Forget all session passwords"
 msgstr "Glem alle _passord fra sesjonen"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:784
+#, fuzzy
+msgid "Forget _master passphrase"
+msgstr "Glem alle _passord fra sesjonen"
+
+#: src/mainwindow.c:788
 msgid "C_hange current account"
 msgstr "_Bytt aktiv konto"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:790
 msgid "_Preferences for current account..."
 msgstr "Innstillinger for _aktiv konto..."
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:791
 msgid "Create _new account..."
 msgstr "_Ny konto..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "_Edit accounts..."
 msgstr "Endre kontoinnstillinger..."
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "P_references..."
 msgstr "_Oppsetning..."
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "Pre-pr_ocessing..."
 msgstr "_Forbearbeider..."
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:797
 msgid "Post-pro_cessing..."
 msgstr "_Etterbearbeider..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "_Filtering..."
 msgstr "Fi_ltrerer..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:799
 msgid "_Templates..."
 msgstr "_Maler..."
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "_Actions..."
 msgstr "_Handlinger..."
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:801
 msgid "Tag_s..."
 msgstr "Ta_gger..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:803
 msgid "Plu_gins..."
 msgstr "_Programtillegg..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:806
 msgid "_Manual"
 msgstr "_Håndbok..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:807
 msgid "_Online User-contributed FAQ"
 msgstr "_Brukerskrevet OSS (nettbasert)"
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:808
 msgid "Icon _Legend"
 msgstr "Ikon_forklaring"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "Set as default client"
 msgstr "Sett som standard epostprogram"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:817
 msgid "Offline _mode"
 msgstr "Frakoblet tilstand"
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:818
 msgid "Men_ubar"
 msgstr "Men_yer"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:819
 msgid "_Message view"
 msgstr "_Meldingsvisning"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "Status _bar"
 msgstr "Status_linje"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:823
 msgid "Column headers"
 msgstr "Kolonneoverskrifter"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "Th_read view"
 msgstr "_Trådet visning"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "Hide read threads"
 msgstr "Sk_jul leste tråder"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "_Hide read messages"
 msgstr "Skjul _leste meldinger"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "Hide deleted messages"
 msgstr "Skjul slette_de meldinger"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
-#: src/mainwindow.c:822 src/messageview.c:344
+#: src/mainwindow.c:829 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Vis hele _brevhodet"
 
-#: src/mainwindow.c:823 src/messageview.c:345
+#: src/mainwindow.c:830 src/messageview.c:344
 msgid "_Collapse all"
 msgstr "_Slå sammen alle"
 
-#: src/mainwindow.c:824 src/messageview.c:346
+#: src/mainwindow.c:831 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Fold sammen fra nivå _2"
 
-#: src/mainwindow.c:825 src/messageview.c:347
+#: src/mainwindow.c:832 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Fold sammen fra nivå _3"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:836
 msgid "Text _below icons"
 msgstr "Tekst _under ikoner"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "Text be_side icons"
 msgstr "Tekst _ved siden av ikoner"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "_Icons only"
 msgstr "Kun _ikoner "
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:839
 msgid "_Text only"
 msgstr "Kun _tekst"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:846
 msgid "_Standard"
 msgstr "_Standard"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "_Three columns"
 msgstr "_Tre kolonner"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:848
 msgid "_Wide message"
 msgstr "Bredt _meldingsvindu"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "W_ide message list"
 msgstr "_Bredt listevindu"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:850
 msgid "S_mall screen"
 msgstr "_Liten skjerm"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:854
 msgid "By _number"
 msgstr "Etter _nummer"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:855
 msgid "By s_ize"
 msgstr "Etter _størrelse"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:856
 msgid "By _date"
 msgstr "Etter _dato"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:857
 msgid "By thread date"
 msgstr "Etter t_råd-dato"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:860
 msgid "By s_ubject"
 msgstr "Etter _emne"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "By _color label"
 msgstr "Etter f_argemerkning"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:862
 msgid "By tag"
 msgstr "Etter ta_gg"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "By _mark"
 msgstr "Etter _merke"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:864
 msgid "By _status"
 msgstr "Etter stat_us"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:865
 msgid "By a_ttachment"
 msgstr "Etter _vedlegg"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:866
 msgid "By score"
 msgstr "Etter poeng"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:867
 msgid "By locked"
 msgstr "Etter låsning"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:868
 msgid "D_on't sort"
 msgstr "Sorter _ikke"
 
-#: src/mainwindow.c:865 src/prefs_summaries.c:455
+#: src/mainwindow.c:872 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Stigende"
 
-#: src/mainwindow.c:866 src/prefs_summaries.c:456
+#: src/mainwindow.c:873 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Fallende"
 
-#: src/mainwindow.c:908 src/messageview.c:389
+#: src/mainwindow.c:915 src/messageview.c:388
 msgid "_Auto detect"
 msgstr "Finn _automatisk"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6268
+#: src/mainwindow.c:1312 src/summaryview.c:6218
 msgid "Apply tags..."
 msgstr "Bruk tagger..."
 
-#: src/mainwindow.c:1949
+#: src/mainwindow.c:1959
 msgid "Some error(s) happened. Click here to view log."
 msgstr "En eller flere feil inntraff. Klikk her for å se loggen. "
 
-#: src/mainwindow.c:1964
+#: src/mainwindow.c:1974
 msgid "You are online. Click the icon to go offline"
 msgstr "Du er tilkoblet. Klikk på ikonet for å koble fra"
 
-#: src/mainwindow.c:1967
+#: src/mainwindow.c:1977
 msgid "You are offline. Click the icon to go online"
 msgstr "Du er frakoblet. Klikk på ikonet for å opprette nettforbindelse"
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1991
 msgid "Select account"
 msgstr "Velg konto"
 
-#: src/mainwindow.c:2008 src/prefs_logging.c:140
+#: src/mainwindow.c:2018 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Nettverkslogg"
 
-#: src/mainwindow.c:2012
+#: src/mainwindow.c:2022
 msgid "Filtering/Processing debug log"
 msgstr "Logg for filtrering/bearbeidning"
 
-#: src/mainwindow.c:2031 src/prefs_logging.c:392
+#: src/mainwindow.c:2041 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "filterlogg aktivert\n"
 
-#: src/mainwindow.c:2033 src/prefs_logging.c:394
+#: src/mainwindow.c:2043 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "filterlogg deaktivert\n"
 
-#: 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 "Uten tittel"
 
-#: src/mainwindow.c:2637 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "ingenting"
 
-#: src/mainwindow.c:2894 src/mainwindow.c:2898
+#: src/mainwindow.c:2904 src/mainwindow.c:2908
 msgid "Delete all messages in trash folders?"
 msgstr "Slett alle meldinger i Papirkurvene?"
 
-#: src/mainwindow.c:2895
+#: src/mainwindow.c:2905
 msgid "Don't quit"
 msgstr "Ikke avslutt"
 
-#: 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 "Ny postkasse"
 
-#: 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"
@@ -7628,18 +7715,18 @@ msgstr ""
 "Hvis en eksisterende postkasse angis, blir den\n"
 "automatisk gjennomsøkt."
 
-#: 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 "Postkassen '%s' finnes allerede."
 
-#: 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 "Postkasse"
 
-#: 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 "
@@ -7648,77 +7735,82 @@ msgstr ""
 "Kunne ikke opprette postkasse.\n"
 "Enkelte filer finnes kanskje allerede, eller du har ikke skriveadgang der."
 
-#: src/mainwindow.c:3394
+#: src/mainwindow.c:3413
 msgid "No posting allowed"
 msgstr "Ingen postinger tillates"
 
-#: src/mainwindow.c:3977
+#: src/mainwindow.c:3996
 msgid "Mbox import has failed."
 msgstr "Mbox-import mislyktes."
 
-#: src/mainwindow.c:3986 src/mainwindow.c:3995
+#: src/mainwindow.c:4005 src/mainwindow.c:4014
 msgid "Export to mbox has failed."
 msgstr " Mbox-eksport vellykket."
 
-#: 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 "Avslutt"
 
-#: 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 "Avslutt Claws Mail?"
 
-#: src/mainwindow.c:4227
+#: src/mainwindow.c:4246
 msgid "Folder synchronisation"
 msgstr "Mappesynkronisering"
 
-#: src/mainwindow.c:4228
+#: src/mainwindow.c:4247
 msgid "Do you want to synchronise your folders now?"
 msgstr "Ønsker du å synkronisere mappene dine nå?"
 
-#: src/mainwindow.c:4229
+#: src/mainwindow.c:4248
 msgid "_Synchronise"
 msgstr "_Synkroniser"
 
-#: src/mainwindow.c:4670
+#: src/mainwindow.c:4689
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dubletter..."
 
-#: 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] "Slettet %d dublettmelding i %d mapper.\n"
 msgstr[1] "Slettet %d dublettmeldinger i %d mapper.\n"
 
-#: 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 "Bearbeidingsregler som skal brukes før mappereglene"
 
-#: src/mainwindow.c:4976
+#: src/mainwindow.c:4990
 msgid "Processing rules to apply after folder rules"
 msgstr "Bearbeidingsregler som skal brukes etter mappereglene"
 
-#: src/mainwindow.c:4984 src/summaryview.c:5770
+#: src/mainwindow.c:4998 src/summaryview.c:5720
 msgid "Filtering configuration"
 msgstr "Konfigurasjon av filtrering"
 
-#: src/mainwindow.c:5099
+#: src/mainwindow.c:5113
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "Kan ikke registrere som standardprogram: finner ikke programstien."
 
-#: src/mainwindow.c:5158
+#: src/mainwindow.c:5172
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail er registrert som standardprogram."
 
-#: src/mainwindow.c:5160
+#: src/mainwindow.c:5174
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Kan ikke registrere som standardprogram: kan ikke skrive til "
 "registerdatabasen."
 
-#: src/mainwindow.c:5318
+#: src/mainwindow.c:5188 src/setup.c:91
+#, c-format
+msgid "Scanning folder %s%c%s..."
+msgstr "Ser igjennom mappen %s%c%s"
+
+#: src/mainwindow.c:5332
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7798,7 +7890,7 @@ msgstr "Overskriv mboxfil"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Filen finnes allerede. Vil du overskrive den?"
 
-#: 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 "Overskriv"
@@ -7844,19 +7936,19 @@ msgstr "Slutten av meldingen nådd; Fortsett fra begynnelsen?"
 msgid "Search finished"
 msgstr "Søk ferdig"
 
-#: src/messageview.c:298 src/textview.c:238
+#: src/messageview.c:297 src/textview.c:238
 msgid "Compose _new message"
 msgstr "_Ny melding"
 
-#: 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 "Claws Mail - Meldingsvisning"
 
-#: src/messageview.c:841
+#: src/messageview.c:840
 msgid "<No Return-Path found>"
 msgstr "<Ingen Retur-Path funnet>"
 
-#: src/messageview.c:849
+#: src/messageview.c:848
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7871,11 +7963,11 @@ msgstr ""
 "Returadresse: %s\n"
 "Det anbefales å ikke sende noen returkvittering."
 
-#: src/messageview.c:856 src/messageview.c:873
+#: src/messageview.c:855 src/messageview.c:872
 msgid "_Don't Send"
 msgstr "_Ikke send"
 
-#: 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"
@@ -7887,48 +7979,48 @@ msgstr ""
 "offisielt adressert til deg.\n"
 "Det anbefales å ikke sende noen returkvittering."
 
-#: src/messageview.c:1323
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Henter melding (%s)..."
 
-#: src/messageview.c:1359 src/procmime.c:1007
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Kunne ikke dekryptere: %s"
 
-#: 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 ""
 "Meldingen overensstemmer ikke med MIME-standarden. Det vil kanskje vises "
 "feil."
 
-#: 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 "Lagre som"
 
-#: src/messageview.c:1849
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Overskriv eksisterende fil?"
 
-#: 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 "Kunne ikke lagre filen '%s'."
 
-#: src/messageview.c:1910
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Vis alle %s."
 
-#: src/messageview.c:1912
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Bare den første megabyte med tekst vises."
 
-#: src/messageview.c:1943
+#: src/messageview.c:1950
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -7936,19 +8028,19 @@ msgstr ""
 "Du har fått en returkvittering for denne meldingen: den er blitt sett av "
 "mottageren."
 
-#: src/messageview.c:1946
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Du har bedt om returkvittering i denne meldingen."
 
-#: src/messageview.c:1952
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Meldingen ber om returkvittering."
 
-#: src/messageview.c:1953
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Send kvittering"
 
-#: src/messageview.c:1996
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7956,7 +8048,7 @@ msgstr ""
 "Meldingen er bare delvis mottatt,\n"
 "og er blitt slettet fra tjeneren."
 
-#: src/messageview.c:2002
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7965,15 +8057,15 @@ msgstr ""
 "Meldingen er delvis mottatt;\n"
 "den er %s."
 
-#: src/messageview.c:2006 src/messageview.c:2028
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Merk for nedlastning"
 
-#: src/messageview.c:2007 src/messageview.c:2019
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Merk for sletting"
 
-#: src/messageview.c:2012
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7982,12 +8074,12 @@ msgstr ""
 "Denne meldingen er bare delvis mottatt;\n"
 "den er %s og vil bli lastet ned."
 
-#: 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 "Fjern markering"
 
-#: src/messageview.c:2023
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7996,11 +8088,11 @@ msgstr ""
 "Denne meldingen er bare delvis mottatt;\n"
 "den er %s og vil bli slettet."
 
-#: src/messageview.c:2096
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Varsling om returkvittering"
 
-#: 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"
@@ -8010,19 +8102,19 @@ msgstr ""
 "Du har flere kontoer som bruker adressen denne meldingen er sendt til.\n"
 "Velg hvilken konto du vil bruke for returkvitteringen:"
 
-#: 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 "Av_bryt"
 
-#: src/messageview.c:2101
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Send beskjed"
 
-#: src/messageview.c:2190
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan ikke skrive ut: meldingern inneholder ikke tekst."
 
-#: src/messageview.c:2952
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8030,7 +8122,7 @@ msgstr ""
 "\n"
 "  Det er ingen meldinger i denne mappen"
 
-#: src/messageview.c:2960
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8038,7 +8130,7 @@ msgstr ""
 "\n"
 "  Meldingen er slettet"
 
-#: src/messageview.c:2961
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8046,16 +8138,16 @@ msgstr ""
 "\n"
 "  Meldingen er blitt slettet eller flyttet til en annen mappe"
 
-#: 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 "En feil oppsto ved læring.\n"
 
-#: src/mh.c:530
+#: src/mh.c:527
 msgid "Moving messages..."
 msgstr "Flytter meldinger..."
 
-#: 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 "Sletter meldinger..."
 
@@ -8063,7 +8155,7 @@ msgstr "Sletter meldinger..."
 msgid "Remove _mailbox..."
 msgstr "Fjern post_kasse..."
 
-#: src/mh_gtk.c:223
+#: src/mh_gtk.c:222
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -8074,7 +8166,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: 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"
@@ -8083,7 +8175,7 @@ msgstr ""
 "Vil du virkelig slette postkassen '%s'?\n"
 "(Meldingene blir IKKE slettet fra platelagret)"
 
-#: 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 "Fjern postkasse"
 
@@ -8156,8 +8248,7 @@ msgid "Go back to email"
 msgstr "Gå tilbake til epost"
 
 #: 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 "Kunne ikke lagre denne delen av flerdelt melding: %s"
@@ -8225,7 +8316,7 @@ msgid "Type:"
 msgstr "Type:"
 
 #: 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 "Størrelse:"
 
@@ -8235,81 +8326,81 @@ msgstr "Størrelse:"
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: src/news.c:302
+#: src/news.c:303
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "NNTP-forbindelse til %s:%d er blitt avbrutt.\n"
 
-#: src/news.c:335
+#: src/news.c:336
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "Konto '%s': Forbinder til NNTP-tjener: %s:%d...\n"
 
-#: src/news.c:356
+#: src/news.c:357
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "Feil ved innlogging til %s:%d...\n"
 
-#: 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 "Libetpan kan ikke behandle returkoden 480, så vi velger å fortsette\n"
 
-#: src/news.c:446
+#: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "Mode reader mislyktes, vi fortsetter likevel\n"
 
-#: src/news.c:450
+#: src/news.c:451
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "Feil under opprettelse av sesjon med %s:%d\n"
 
-#: src/news.c:465
+#: src/news.c:466
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "Feil ved autentisering på %s:%d...\n"
 
-#: src/news.c:490
+#: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail må ha nettadgang for å få adgang til nyhetsgruppetjeneren."
 
-#: src/news.c:861
+#: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "kan ikke velge gruppe: %s\n"
 
-#: 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 "kan ikke angi gruppe: %s\n"
 
-#: src/news.c:1059
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ugyldig artikelintervall: %d - %d\n"
 
-#: 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 "kan ikke hente xhdr\n"
 
-#: src/news.c:1213
+#: 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:1228
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "kan ikke hente xover\n"
 
-#: src/news.c:1243
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "ugyldig xover-linje\n"
 
-#: src/news.c:1445
+#: src/news.c:1449
+#, fuzzy
 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 ""
@@ -8327,19 +8418,63 @@ msgstr "_Abboner på nyhetsgruppe..."
 msgid "_Unsubscribe newsgroup"
 msgstr "Av_slutt abonnement på nyhetsgruppe"
 
-#: src/news_gtk.c:265
+#: src/news_gtk.c:250
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "Vil du virkelig slette abonnement på nyhetsgruppen '%s'?"
 
-#: src/news_gtk.c:266
+#: src/news_gtk.c:251
 msgid "Unsubscribe newsgroup"
 msgstr "Dropp abonnement på nyhetsgruppe"
 
-#: src/news_gtk.c:306
+#: src/news_gtk.c:291
 msgid "Rename newsgroup folder"
 msgstr "Bytt navn på mappen for nyhetsgrupper"
 
+#: src/password.c:128 src/password.c:129
+#, fuzzy
+msgid "Input master passphrase"
+msgstr "Fang opp inndata når adgangsfrasen skrives inn"
+
+#: src/password.c:141
+#, fuzzy
+msgid "Incorrect master passphrase."
+msgstr "Feilaktig del"
+
+#: src/password_gtk.c:67
+#, fuzzy
+msgid "New passphrases do not match, try again."
+msgstr "Adgangsfrasene passer ikke overens.\n"
+
+#: 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
+#, fuzzy
+msgid "Old passphrase:"
+msgstr "Feil adgangsfrase.\n"
+
+#: src/password_gtk.c:191
+#, fuzzy
+msgid "New passphrase:"
+msgstr "Adgangsfrase"
+
+#: src/password_gtk.c:202
+#, fuzzy
+msgid "Confirm passphrase:"
+msgstr "Feil adgangsfrase.\n"
+
 #: src/plugins/acpi_notifier/acpi_notifier.c:51
 msgid "Acpi Notifier"
 msgstr "Acpi-varsler"
@@ -8755,7 +8890,7 @@ msgstr "Arkivets plassering og navn"
 
 #: 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 "_Velg"
 
@@ -8952,12 +9087,12 @@ msgid "Remove attachments"
 msgstr "Fjern vedlegg"
 
 #: 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 "Slett"
 
 #: 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 "Vedlegg"
 
@@ -9077,8 +9212,7 @@ msgstr ""
 "Gjør ikke kontroll av manglende vedlegg ved videresendelse eller "
 "omdirigering av meldinger"
 
-#: 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 "Signatur"
 
@@ -9140,7 +9274,7 @@ msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: lærer fra melding..."
 
 #: 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 "Innlæring mislyktes; `%s` svarte med status %d."
@@ -9187,14 +9321,12 @@ msgstr ""
 "Innstillinger finnes under /Innstillinger/Oppsetning/Programtillegg/"
 "Bogofilter"
 
-#: 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 "Spamgransker"
 
-#: 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 "Spamopplæring"
@@ -9219,7 +9351,7 @@ msgstr "Meldinger større enn dette vil ikke kontrolleres"
 
 #: 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 "KB"
 
@@ -9326,15 +9458,15 @@ msgstr "Marker spam som lest"
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:299
+#: src/plugins/bsfilter/bsfilter.c:300
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: henter meldingstekst..."
 
-#: src/plugins/bsfilter/bsfilter.c:308
+#: src/plugins/bsfilter/bsfilter.c:309
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtrerer melding..."
 
-#: 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"
@@ -9347,7 +9479,7 @@ msgstr ""
 "Bruk  \"/Marker/Marker som spam\" og \"/Marker/Marker som ham\" for å trene "
 "Bsfilter med noen hundre spam- og ham-meldinger."
 
-#: 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 "
@@ -9356,11 +9488,11 @@ msgstr ""
 "En melding lot seg ikke filtrere med programtillegget for Bsfilter. "
 "Kommandoen `%s` kunne ikke kjøres."
 
-#: src/plugins/bsfilter/bsfilter.c:501
+#: src/plugins/bsfilter/bsfilter.c:502
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: lærer fra melding..."
 
-#: 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 "
@@ -9786,7 +9918,7 @@ msgstr "CSS i denne filen vil brukes på alle HTML-deler"
 #: 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 "_Bla"
@@ -9795,93 +9927,93 @@ msgstr "_Bla"
 msgid "Select stylesheet"
 msgstr "Velg stilsett"
 
-#: src/plugins/fancy/fancy_viewer.c:395
+#: src/plugins/fancy/fancy_viewer.c:387
 msgid "Remote content loading is disabled."
 msgstr "Innlasting av fjerninnhold er deaktivert."
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:464
 msgid "Load images"
 msgstr "Innles bilder"
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:466
 msgid "Enable remote content"
 msgstr "Aktiver fjerninnhold"
 
-#: src/plugins/fancy/fancy_viewer.c:476
+#: src/plugins/fancy/fancy_viewer.c:468
 msgid "Enable Javascript"
 msgstr "Aktiver Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:470
 msgid "Enable Plugins"
 msgstr "Aktiver programtillegg"
 
-#: src/plugins/fancy/fancy_viewer.c:480
+#: src/plugins/fancy/fancy_viewer.c:472
 msgid "Enable Java"
 msgstr "Aktiver Java"
 
-#: src/plugins/fancy/fancy_viewer.c:482
+#: src/plugins/fancy/fancy_viewer.c:474
 msgid "Open links with external browser"
 msgstr "Åpne lenker i nettleser"
 
-#: src/plugins/fancy/fancy_viewer.c:651
+#: src/plugins/fancy/fancy_viewer.c:643
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Det oppsto en feil: %d\n"
 
-#: 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 "%s er en misformet eller ikke gjenkjent kanal"
 
-#: src/plugins/fancy/fancy_viewer.c:718
+#: src/plugins/fancy/fancy_viewer.c:710
 msgid "Search the Web"
 msgstr "Søk på nettet"
 
-#: src/plugins/fancy/fancy_viewer.c:730
+#: src/plugins/fancy/fancy_viewer.c:722
 msgid "Open in Viewer"
 msgstr "Åpne i Fremviser"
 
-#: src/plugins/fancy/fancy_viewer.c:732
+#: src/plugins/fancy/fancy_viewer.c:724
 msgid "Open in Viewer (enable remote content)"
 msgstr "Åpne i Fremviser (aktiver fjerninnhold)"
 
-#: src/plugins/fancy/fancy_viewer.c:741
+#: src/plugins/fancy/fancy_viewer.c:733
 msgid "Open in Browser"
 msgstr "Åpne i nettleser"
 
-#: src/plugins/fancy/fancy_viewer.c:751
+#: src/plugins/fancy/fancy_viewer.c:743
 msgid "Open Image"
 msgstr "Åpne bilde"
 
-#: src/plugins/fancy/fancy_viewer.c:760
+#: src/plugins/fancy/fancy_viewer.c:752
 msgid "Copy Link"
 msgstr "Kopier lenke"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:756
 msgid "Download Link"
 msgstr "Last ned lenke"
 
-#: src/plugins/fancy/fancy_viewer.c:775
+#: src/plugins/fancy/fancy_viewer.c:767
 msgid "Save Image As"
 msgstr "Lagre bilde som"
 
-#: src/plugins/fancy/fancy_viewer.c:785
+#: src/plugins/fancy/fancy_viewer.c:777
 msgid "Copy Image"
 msgstr "Kopier bilde"
 
-#: src/plugins/fancy/fancy_viewer.c:803
+#: src/plugins/fancy/fancy_viewer.c:795
 msgid "Import feed"
 msgstr "Importer feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1016
+#: src/plugins/fancy/fancy_viewer.c:1007
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1044
+#: src/plugins/fancy/fancy_viewer.c:1035
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML-fremviser"
 
-#: 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"
@@ -9974,11 +10106,11 @@ msgstr ""
 "Legg til X-FETCH-TIME-brevhode med dato og tid for når neldingen ble hentet, "
 "i RFC822-format"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:126
+#: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid "GData plugin: Authorization required"
 msgstr "GData-tillegg: Autentisering kreves"
 
-#: 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"
@@ -9996,29 +10128,29 @@ msgstr ""
 "inn i feltet nedenfor for å gi Claws Mail tilgang til din Google kontakt-"
 "liste."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:143
+#: src/plugins/gdata/cm_gdata_contacts.c:144
 msgid "Step 1:"
 msgstr "Trinn 1:"
 
-#: 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 "Klikk her for å åpne Google's autentiserings-side i en nettleser."
 
-#: src/plugins/gdata/cm_gdata_contacts.c:153
+#: src/plugins/gdata/cm_gdata_contacts.c:154
 msgid "Step 2:"
 msgstr "Trinn 2:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:159
+#: src/plugins/gdata/cm_gdata_contacts.c:160
 msgid "Enter code:"
 msgstr "Legg inn kode:"
 
-#: 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 "GData-programtillegg: feil ved søkning etter kontakter: %s\n"
 
 #. 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"
@@ -10026,99 +10158,99 @@ msgstr[0] "Lagt %d av"
 msgstr[1] "Lagt %d av"
 
 #. 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] "1 kontakt til hurtiglageret"
 msgstr[1] "%d kontakter til hurtiglageret"
 
-#: 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 "GData-tillegg: Starter asynkron kontaktsøkning\n"
 
-#: 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 "GData-tillegg: Feil ved søkning etter grupper %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:411
+#: src/plugins/gdata/cm_gdata_contacts.c:412
 msgid "GData plugin: Groups received\n"
 msgstr "GData-tillegg: Grupper mottatt\n"
 
-#: 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 "GData-tillegg: starter asynkron gruppesøkning\n"
 
-#: 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 "GData-tillegg: Autoriseringsfeil: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:450
+#: src/plugins/gdata/cm_gdata_contacts.c:451
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData-tillegg: Vellykket autorisering\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:460
+#: src/plugins/gdata/cm_gdata_contacts.c:461
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData-tillegg: starter interaktiv autorisering\n"
 
-#: 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 "GData-tillegg: Mottatt autoriserings-kode, ber om autorisering\n"
 
-#: 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 ""
 "GData-tillegg: Ingen autoriseringskode mottatt, autorisering avbrutt.\n"
 
-#: 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 "GData-tillegg: Feil ved oppfriskning av autorisering: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:503
+#: src/plugins/gdata/cm_gdata_contacts.c:504
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData-tillegg: Vellykket oppfriskning av autorisering\n"
 
-#: 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 "GData-tillegg: Forsøker å oppfriske autorisasjon\n"
 
-#: 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 "Autorisering"
 
-#: 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 "Brukernavn:"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:94
+#: src/plugins/gdata/cm_gdata_prefs.c:95
 msgid "Polling interval (seconds):"
 msgstr "Forespørselsintervall (sekunder):"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:101
+#: src/plugins/gdata/cm_gdata_prefs.c:102
 msgid "Maximum number of results:"
 msgstr "Maksimalt antall resultater:"
 
-#: 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 "GData"
 
-#: 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 "Kunne ikke registrere haken 'address completion' i GData-tillegget"
 
-#: 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 "Kunne ikke registrere haken 'offline switch' i GData-tillegget"
 
-#: 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"
@@ -10136,7 +10268,7 @@ msgstr ""
 "\n"
 "Feedback til <berndth at gmx.de> mottas med takk."
 
-#: src/plugins/gdata/gdata_plugin.c:187
+#: src/plugins/gdata/gdata_plugin.c:196
 msgid "GData integration"
 msgstr "GData-integrasjon"
 
@@ -10266,8 +10398,8 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Intervall for cacheoppdatering "
 
-#: 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 "timer"
 
@@ -10356,11 +10488,6 @@ msgid "Request timeout"
 msgstr "Tidsavbrudd på sesjonen"
 
 #: 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 "sekund(er)"
 
@@ -10407,68 +10534,68 @@ msgstr ""
 "bli gjennomsøkt automatisk."
 
 #: src/plugins/mailmbox/plugin_gtk.c:330
-#, c-format
+#, fuzzy, 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 ""
 "Alle mapper og meldinger under '%s' vil bli slette.\n"
 "Vil du virkelig slette?"
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:435
 msgid "No Sieve auth method available\n"
 msgstr "Sieve autentiserings-metode ikke tilgjengelig\n"
 
-#: src/plugins/managesieve/managesieve.c:443
+#: src/plugins/managesieve/managesieve.c:439
 msgid "Selected Sieve auth method not available\n"
 msgstr "Ønsket Sieve autentiserings-metode er ikke tilgjengelig\n"
 
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:672
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: src/plugins/managesieve/managesieve.c:680
+#: src/plugins/managesieve/managesieve.c:676
 #, c-format
 msgid "Disconnected: %s"
 msgstr "Frakoblet: %s"
 
-#: 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 "uhåndtert melding i Sieve-sesjon: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:735
+#: src/plugins/managesieve/managesieve.c:731
 msgid "TLS failed"
 msgstr "TLS mislyktes"
 
-#: 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 "feil oppstod i SIEVE-sesjonen\n"
 
-#: src/plugins/managesieve/managesieve.c:869
+#: src/plugins/managesieve/managesieve.c:865
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "feil oppstod i Sieve-sesjonen. data: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:878
+#: src/plugins/managesieve/managesieve.c:874
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "uhåndtert melding i Sieve-sesjonen: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1135
+#: src/plugins/managesieve/managesieve.c:1131
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: prøver auth på nytt\n"
 
-#: src/plugins/managesieve/managesieve.c:1137
+#: src/plugins/managesieve/managesieve.c:1133
 msgid "Auth method not available"
 msgstr "Auth metode ikke tilgjengelig"
 
-#: 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 "_Filter"
 
@@ -10525,7 +10652,7 @@ msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve Filter%s"
 
 #: 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 "Laster..."
 
@@ -10593,94 +10720,94 @@ msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr ""
 "Administrer Sieve filtre på en tjener som bruker ManageSieve-protokollen."
 
-#: src/plugins/managesieve/sieve_prefs.c:146
+#: src/plugins/managesieve/sieve_prefs.c:149
 msgid "Enable Sieve"
 msgstr "Aktiver Sieve"
 
-#: 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 "Tjenerinformasjon"
 
-#: src/plugins/managesieve/sieve_prefs.c:162
+#: src/plugins/managesieve/sieve_prefs.c:165
 msgid "Server name"
 msgstr "Navn på tjener"
 
-#: 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 "Koble til denne maskinen istedenfor maskinen som mottar mail"
 
-#: src/plugins/managesieve/sieve_prefs.c:175
+#: src/plugins/managesieve/sieve_prefs.c:178
 msgid "Server port"
 msgstr "Tjener-port"
 
-#: src/plugins/managesieve/sieve_prefs.c:182
+#: src/plugins/managesieve/sieve_prefs.c:185
 msgid "Connect to this port instead of the default"
 msgstr "Koble til denne porten istedenfor forvalg"
 
-#: src/plugins/managesieve/sieve_prefs.c:186
+#: src/plugins/managesieve/sieve_prefs.c:189
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/managesieve/sieve_prefs.c:194
 msgid "No TLS"
 msgstr "Ingen TLS"
 
-#: src/plugins/managesieve/sieve_prefs.c:193
+#: src/plugins/managesieve/sieve_prefs.c:196
 msgid "Use TLS when available"
 msgstr "Bruk TLS når tilgjengelig"
 
-#: src/plugins/managesieve/sieve_prefs.c:195
+#: src/plugins/managesieve/sieve_prefs.c:198
 msgid "Require TLS"
 msgstr "Krev TLS"
 
-#: 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 "Ingen autentisering"
 
-#: src/plugins/managesieve/sieve_prefs.c:205
+#: src/plugins/managesieve/sieve_prefs.c:208
 msgid "Use same authentication as for receiving mail"
 msgstr "Bruke samme autentisering som for å hente mail"
 
-#: src/plugins/managesieve/sieve_prefs.c:207
+#: src/plugins/managesieve/sieve_prefs.c:210
 msgid "Specify authentication"
 msgstr "Spesifiser autentisering"
 
-#: 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 "Bruker-ID"
 
-#: 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 "Passord"
 
-#: 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 "Autentiseringsmetode"
 
-#: 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 "Automatisk"
 
-#: src/plugins/managesieve/sieve_prefs.c:379
+#: src/plugins/managesieve/sieve_prefs.c:391
 msgid "Sieve server must not contain a space."
 msgstr "Sieve-tjener må ikke inneholde mellomrom."
 
-#: src/plugins/managesieve/sieve_prefs.c:385
+#: src/plugins/managesieve/sieve_prefs.c:397
 msgid "Sieve server is not entered."
 msgstr "Sieve-tjener ikke angitt."
 
-#: src/plugins/managesieve/sieve_prefs.c:413
+#: src/plugins/managesieve/sieve_prefs.c:425
 msgid "Sieve"
 msgstr "Sieve"
 
@@ -10821,7 +10948,7 @@ msgid "New Calendar message"
 msgstr "Ny kalendermelding"
 
 #: 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 "Ny kalendermelding er mottatt"
 
@@ -10830,7 +10957,7 @@ msgid "New RSS feed article"
 msgstr "Ny artikkel fra RSS-kilde"
 
 #: 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 "Ny artikkel fra RSS-kilde er mottatt"
 
@@ -10843,7 +10970,7 @@ msgid "Unknown message type arrived"
 msgstr "Melding av ukjent type er mottatt"
 
 #: 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 "Aktuelt hovedvindu"
 
@@ -10868,7 +10995,7 @@ msgid "Calendar message"
 msgstr "Kalendermelding"
 
 #: 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"
@@ -10906,7 +11033,7 @@ msgid "Popup"
 msgstr "Sprettopp"
 
 #: 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 "Kommando"
 
@@ -10967,12 +11094,12 @@ msgid "Show banner"
 msgstr "Vis banner"
 
 #: 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 "Aldri"
 
-#: 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 "Alltid"
@@ -11001,8 +11128,7 @@ msgstr "Vidde på banner"
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr "Begrens størrelse på banner, bruk 0 for skjerm-vidde"
 
-#: 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 "piksel(er)"
 
@@ -11069,6 +11195,14 @@ msgstr "Aktiver popup"
 msgid "Popup timeout"
 msgstr "Tidsavbrudd for popup"
 
+#: 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 "sekunder"
+
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
 msgstr "Gjør sprettoppvinduer fastlåst"
@@ -11177,74 +11311,79 @@ msgstr "<alt>N"
 msgid "Toggle minimize"
 msgstr "Minimer av/på"
 
-#: src/plugins/notification/notification_trayicon.c:114
+#: src/plugins/notification/notification_trayicon.c:121
 msgid "_Get Mail"
 msgstr "_Hent Epost"
 
-#: src/plugins/notification/notification_trayicon.c:116
+#: src/plugins/notification/notification_trayicon.c:122
+#, fuzzy
+msgid "_Get Mail from account"
+msgstr "E_post fra konto"
+
+#: src/plugins/notification/notification_trayicon.c:124
 msgid "_Email"
 msgstr "_Epost"
 
-#: src/plugins/notification/notification_trayicon.c:117
+#: src/plugins/notification/notification_trayicon.c:125
 msgid "E_mail from account"
 msgstr "E_post fra konto"
 
-#: src/plugins/notification/notification_trayicon.c:118
+#: src/plugins/notification/notification_trayicon.c:126
 msgid "Open A_ddressbook"
 msgstr "Åpne _Adressebok"
 
-#: src/plugins/notification/notification_trayicon.c:119
+#: src/plugins/notification/notification_trayicon.c:127
 msgid "E_xit Claws Mail"
 msgstr "Lukk Claws Mail"
 
-#: src/plugins/notification/notification_trayicon.c:124
+#: src/plugins/notification/notification_trayicon.c:132
 msgid "_Work Offline"
 msgstr "_Arbeid frakoblet"
 
-#: src/plugins/notification/notification_trayicon.c:126
+#: src/plugins/notification/notification_trayicon.c:134
 msgid "Show Trayicon Notifications"
 msgstr "Vis Varsling i Systemkurven"
 
-#: src/plugins/notification/notification_trayicon.c:269
+#: src/plugins/notification/notification_trayicon.c:277
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nye %d, Uleste: %d, I alt: %d"
 
-#: src/plugins/notification/notification_trayicon.c:816
+#: src/plugins/notification/notification_trayicon.c:855
 msgid "New mail message"
 msgstr "Ny melding"
 
-#: src/plugins/notification/notification_trayicon.c:818
+#: src/plugins/notification/notification_trayicon.c:857
 msgid "New news post"
 msgstr "Nye nyhetsmeldinger"
 
-#: src/plugins/notification/notification_trayicon.c:820
+#: src/plugins/notification/notification_trayicon.c:859
 msgid "New calendar message"
 msgstr "Ny kalendermelding"
 
-#: src/plugins/notification/notification_trayicon.c:822
+#: src/plugins/notification/notification_trayicon.c:861
 msgid "New article in RSS feed"
 msgstr "Ny artikkel i RSS-kilde"
 
-#: src/plugins/notification/notification_trayicon.c:825
+#: src/plugins/notification/notification_trayicon.c:864
 msgid "New messages arrived"
 msgstr "Ny melding mottatt"
 
-#: 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] "%d ny melding mottatt"
 msgstr[1] "%d nye meldinger mottatt"
 
-#: 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] "%d ny nyhetsmelding mottatt"
 msgstr[1] "%d nye nyhetsmeldinger mottatt"
 
-#: 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"
@@ -11288,87 +11427,87 @@ msgstr "Optimert:"
 msgid "PDF properties"
 msgstr "PDF-egenskaper"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1329
+#: src/plugins/pdf_viewer/poppler_viewer.c:1326
 msgid "Enter password"
 msgstr "Skriv inn passord"
 
-#: 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 "Dette dokumentet er låst og krever ett passord før det kan åpnes."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1345
+#: src/plugins/pdf_viewer/poppler_viewer.c:1342
 #, c-format
 msgid "%s Document"
 msgstr "%s Dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1351
+#: src/plugins/pdf_viewer/poppler_viewer.c:1348
 #, c-format
 msgid "of %d"
 msgstr "av %d"
 
-#: 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 "PDF-gjengivelse mislyktes av ukjente grunner."
 
-#: 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 "Dokument-indeks"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1913
 msgid "First Page"
 msgstr "Første side"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1916
 msgid "Previous Page"
 msgstr "Forrige side"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1919
 msgid "Next Page"
 msgstr "Neste side"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1922
 msgid "Last Page"
 msgstr "Siste side"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1925
 msgid "Zoom In"
 msgstr "Forstørre"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1932
+#: src/plugins/pdf_viewer/poppler_viewer.c:1927
 msgid "Zoom Out"
 msgstr "Forminske"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1935
+#: src/plugins/pdf_viewer/poppler_viewer.c:1930
 msgid "Fit Page"
 msgstr "Tilpass til side"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
+#: src/plugins/pdf_viewer/poppler_viewer.c:1933
 msgid "Fit Page Width"
 msgstr "Tilpass til sidebredde"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1941
+#: src/plugins/pdf_viewer/poppler_viewer.c:1936
 msgid "Rotate Left"
 msgstr "Roter til Venstre"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+#: src/plugins/pdf_viewer/poppler_viewer.c:1939
 msgid "Rotate Right"
 msgstr "Roter til Høyre"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1942
 msgid "Document Info"
 msgstr "Dokument-info"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1952
+#: src/plugins/pdf_viewer/poppler_viewer.c:1947
 msgid "Page Number"
 msgstr "Sidenummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1954
+#: src/plugins/pdf_viewer/poppler_viewer.c:1949
 msgid "Zoom Factor"
 msgstr "Skala"
 
-#: 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 "
@@ -11381,13 +11520,13 @@ msgstr ""
 "\n"
 "Feedback mottas med glede: iwkse at claws-mail.org"
 
-#: 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 "PDF-viser"
 
-#: 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 "
@@ -11410,39 +11549,39 @@ msgstr "Rediger filterregler i perl (ext)..."
 msgid "Failed to register PGP address autocompletion hook"
 msgstr "Kunne ikke registrere haken 'PGP address autocompletion'"
 
-#: 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 "Adgangsfrase"
 
-#: src/plugins/pgpcore/passphrase.c:249
+#: src/plugins/pgpcore/passphrase.c:248
 msgid "[no user id]"
 msgstr "[ingen brukerid]"
 
-#: src/plugins/pgpcore/passphrase.c:261
+#: src/plugins/pgpcore/passphrase.c:260
 msgid "Please enter the passphrase for the new key:"
 msgstr "Skriv adgangsfrasen for den nye nøkkelen:"
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "Adgangsfrasene passer ikke overens.\n"
 
-#: src/plugins/pgpcore/passphrase.c:268
+#: src/plugins/pgpcore/passphrase.c:267
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "Skriv adgangsfrasen for den nye nøkkelen en gang til:"
 
-#: src/plugins/pgpcore/passphrase.c:273
+#: src/plugins/pgpcore/passphrase.c:272
 msgid "Please enter the passphrase for:"
 msgstr "Skriv inn adgangsfrase for:"
 
-#: src/plugins/pgpcore/passphrase.c:276
+#: src/plugins/pgpcore/passphrase.c:275
 msgid "Bad passphrase.\n"
 msgstr "Feil adgangsfrase.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:121
+#: src/plugins/pgpcore/pgp_viewer.c:173
 msgid "Key import"
 msgstr "Nøkkelimport"
 
-#: 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?"
@@ -11450,7 +11589,7 @@ msgstr ""
 "Denne nøkkelen er ikke på din nøkkelring. Skal Claws Mail prøve å importere "
 "den fra en nøkkeltjener?"
 
-#: 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 "
@@ -11458,15 +11597,15 @@ msgstr ""
 "\n"
 "  Nøkkel-ID "
 
-#: 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 "   Denne nøkkelen er ikke på din nøkkelring.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:133
+#: src/plugins/pgpcore/pgp_viewer.c:185
 msgid "   It should be possible to import it "
 msgstr "   Det skulle være mulig å importere den"
 
-#: src/plugins/pgpcore/pgp_viewer.c:135
+#: src/plugins/pgpcore/pgp_viewer.c:187
 msgid ""
 "when working online,\n"
 "   or "
@@ -11474,7 +11613,7 @@ msgstr ""
 "hvis du er nettilkoblet,\n"
 "   eller "
 
-#: src/plugins/pgpcore/pgp_viewer.c:136
+#: src/plugins/pgpcore/pgp_viewer.c:188
 msgid ""
 "with the following command: \n"
 "\n"
@@ -11484,7 +11623,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:143
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid ""
 "\n"
 "  Importing key ID "
@@ -11492,19 +11631,19 @@ msgstr ""
 "\n"
 "  importerer nøkkel-ID"
 
-#: 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 "   Nøkkelen er blitt innført på din nøkkelring.\n"
 
-#: 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 "   Nøkkelen kunne ikke innføres på din nøkkelring.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:189
+#: src/plugins/pgpcore/pgp_viewer.c:271
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Nøkkeltjenere kan noen ganger være langsomme.\n"
 
-#: 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"
@@ -11514,11 +11653,7 @@ msgstr ""
 "\n"
 "     "
 
-#: src/plugins/pgpcore/pgp_viewer.c:195
-msgid "   Key import isn't implemented in Windows.\n"
-msgstr "   Nøkkelimport er ikke implementert i Windows.\n"
-
-#: src/plugins/pgpcore/pgp_viewer.c:204
+#: src/plugins/pgpcore/pgp_viewer.c:282
 msgid "   This key is in your keyring.\n"
 msgstr "   Nøkkelen er allerede på din nøkkelring.\n"
 
@@ -11577,11 +11712,11 @@ msgstr "La utløpe etter"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Sett denne til '0' for å lagre adgangsfrasen for hele sesjonen"
 
-#: 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)"
-msgstr "minutt(er)"
+#: 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 "minutter"
 
 #: src/plugins/pgpcore/prefs_gpg.c:173
 msgid "Grab input while entering a passphrase"
@@ -11605,96 +11740,96 @@ msgstr "Hvis blank vil lokasjonen til GnuPG-programmet avgjøres automatisk."
 msgid "Select GnuPG executable"
 msgstr "Velg GnuPG-program"
 
-#: src/plugins/pgpcore/prefs_gpg.c:353
+#: src/plugins/pgpcore/prefs_gpg.c:356
 msgid "Sign key"
 msgstr "Signér nøkkel"
 
-#: src/plugins/pgpcore/prefs_gpg.c:361
+#: src/plugins/pgpcore/prefs_gpg.c:364
 msgid "Use default GnuPG key"
 msgstr "Bruk forvalgt GnuPG-nøkkel"
 
-#: src/plugins/pgpcore/prefs_gpg.c:372
+#: src/plugins/pgpcore/prefs_gpg.c:375
 msgid "Select key by your email address"
 msgstr "Velg nøkkel ut fra epostadressen din"
 
-#: src/plugins/pgpcore/prefs_gpg.c:383
+#: src/plugins/pgpcore/prefs_gpg.c:386
 msgid "Specify key manually"
 msgstr "Angi nøkkel manuelt"
 
-#: src/plugins/pgpcore/prefs_gpg.c:393
+#: src/plugins/pgpcore/prefs_gpg.c:396
 msgid "User or key ID:"
 msgstr "Bruker- eller nøkkel-ID:"
 
-#: src/plugins/pgpcore/prefs_gpg.c:434
+#: src/plugins/pgpcore/prefs_gpg.c:437
 msgid "No secret key found."
 msgstr "Ingen nøkler funnet."
 
-#: src/plugins/pgpcore/prefs_gpg.c:437
+#: src/plugins/pgpcore/prefs_gpg.c:440
 msgid "Generate a new key pair"
 msgstr "Opprett et nytt nøkkelpar"
 
-#: src/plugins/pgpcore/prefs_gpg.c:615
+#: src/plugins/pgpcore/prefs_gpg.c:618
 msgid "GPG"
 msgstr "GPG"
 
-#: 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 "Ingen nøyaktig treff for '%s'; velg nøkkelen."
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:97
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Samler info for '%s' ... %c"
 
-#: 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 "Udefinert"
 
-#: 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 "Marginal"
 
-#: 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 "Optimal"
 
-#: src/plugins/pgpcore/select-keys.c:368
+#: src/plugins/pgpcore/select-keys.c:367
 msgid "Select Keys"
 msgstr "Velg nøkler"
 
-#: src/plugins/pgpcore/select-keys.c:395
+#: src/plugins/pgpcore/select-keys.c:394
 msgid "Key ID"
 msgstr "Nøkkel-ID"
 
-#: src/plugins/pgpcore/select-keys.c:398
+#: src/plugins/pgpcore/select-keys.c:397
 msgid "Trust"
 msgstr "Stol på"
 
-#: src/plugins/pgpcore/select-keys.c:423
+#: src/plugins/pgpcore/select-keys.c:422
 msgid "_Other"
 msgstr "_Andre"
 
-#: src/plugins/pgpcore/select-keys.c:424
+#: src/plugins/pgpcore/select-keys.c:423
 msgid "Do_n't encrypt"
 msgstr "_Ikke krypter"
 
-#: src/plugins/pgpcore/select-keys.c:583
+#: src/plugins/pgpcore/select-keys.c:582
 msgid "Add key"
 msgstr "Legg til nøkkel"
 
-#: src/plugins/pgpcore/select-keys.c:584
+#: src/plugins/pgpcore/select-keys.c:583
 msgid "Enter another user or key ID:"
 msgstr "Angi annen bruker- eller nøkkel-ID"
 
-#: src/plugins/pgpcore/select-keys.c:606
+#: src/plugins/pgpcore/select-keys.c:605
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Krypter til %s <%s>"
 
-#: 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"
@@ -11713,186 +11848,181 @@ msgstr ""
 "\n"
 "Stoler du nok på den til at du likevel vil bruke den?"
 
-#: 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 "Ingen signatur funnet"
 
-#: src/plugins/pgpcore/sgpgme.c:159
+#: src/plugins/pgpcore/sgpgme.c:163
 msgid "Untrusted"
 msgstr "Uklarert"
 
-#: 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 "Signaturen kan ikke verifiseres - %s"
 
-#: 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 "Signaturen er ikke verifisert."
 
-#: src/plugins/pgpcore/sgpgme.c:213
+#: src/plugins/pgpcore/sgpgme.c:251
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Kan ikke finne nøkkel - ingen gpg-agent kjører."
 
-#: src/plugins/pgpcore/sgpgme.c:229
-#, c-format
-msgid "The signature can't be checked - %s."
-msgstr "Signaturen kan ikke verifiseres - %s."
-
-#: src/plugins/pgpcore/sgpgme.c:241
+#: src/plugins/pgpcore/sgpgme.c:269
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Gyldig signatur fra \"%s\" [ultimat]"
 
-#: src/plugins/pgpcore/sgpgme.c:244
+#: src/plugins/pgpcore/sgpgme.c:272
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Gyldig signatur fra \"%s\" [full]"
 
-#: src/plugins/pgpcore/sgpgme.c:247
+#: src/plugins/pgpcore/sgpgme.c:275
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Gyldig signatur fra \"%s\" [marginal]"
 
-#: src/plugins/pgpcore/sgpgme.c:253
+#: src/plugins/pgpcore/sgpgme.c:282
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Gyldig signatur fra \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:258
+#: 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 "Nøkkel 0x%s er ikke tilgjengelig for verifisering av denne signaturen"
+
+#: src/plugins/pgpcore/sgpgme.c:292
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utløpt signatur fra \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:261
+#: src/plugins/pgpcore/sgpgme.c:295
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Gyldig signatur fra \"%s\", men nøkkelen er utløpt"
 
-#: src/plugins/pgpcore/sgpgme.c:264
+#: src/plugins/pgpcore/sgpgme.c:298
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Gyldig signatur fra \"%s\", men nøkkelen er blitt tilbakekalt"
 
-#: src/plugins/pgpcore/sgpgme.c:267
+#: src/plugins/pgpcore/sgpgme.c:301
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Ugyldig signatur fra \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:271
-#, c-format
-msgid "Key 0x%s not available to verify this signature"
-msgstr "Nøkkel 0x%s er ikke tilgjengelig for verifisering av denne signaturen"
-
-#: src/plugins/pgpcore/sgpgme.c:276
+#: src/plugins/pgpcore/sgpgme.c:310
 msgid "The signature has not been checked"
 msgstr "Signaturen er ikke verifisert"
 
-#: src/plugins/pgpcore/sgpgme.c:295
+#: src/plugins/pgpcore/sgpgme.c:329
 msgid "Error checking signature: no status\n"
 msgstr "Feil ved kontroll av signatur: ingen status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:313
+#: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Feil ved kontroll av signatur: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:331
+#: src/plugins/pgpcore/sgpgme.c:365
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Signatur laget på %s med %s nøkkel-ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:337
+#: src/plugins/pgpcore/sgpgme.c:371
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Gyldig signatur fra uid \"%s\" (Gyldighet: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:342
+#: src/plugins/pgpcore/sgpgme.c:376
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Utløpt nøkkel uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:381
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Utløpt signatur fra uid \"%s\" (Gyldighet: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:352
+#: src/plugins/pgpcore/sgpgme.c:386
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Tilbakekalt nøkkel-uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:357
+#: src/plugins/pgpcore/sgpgme.c:391
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "DÅRLIG signatur fra \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:370
+#: src/plugins/pgpcore/sgpgme.c:404
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr " uid \"%s\" (Gyldighet: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:372
+#: src/plugins/pgpcore/sgpgme.c:406
 msgid "Revoked"
 msgstr "Opphevet"
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:411
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Eier-tillitt: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:378
+#: src/plugins/pgpcore/sgpgme.c:412
 msgid "No key!"
 msgstr "Ingen nøkkel!"
 
-#: src/plugins/pgpcore/sgpgme.c:380
+#: src/plugins/pgpcore/sgpgme.c:414
 msgid "Primary key fingerprint:"
 msgstr "Primærnøkkel fingeravtrykk:"
 
-#: src/plugins/pgpcore/sgpgme.c:398
+#: src/plugins/pgpcore/sgpgme.c:432
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "ADVARSEL: Underskrivers adresse \"%s\" stemmer ikke overens med DNS-"
 "oppføringen\n"
 
-#: src/plugins/pgpcore/sgpgme.c:404
+#: src/plugins/pgpcore/sgpgme.c:438
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Avsenders adresse brekreftet som \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:438
+#: src/plugins/pgpcore/sgpgme.c:472
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Kunne ikke hente data fra melding, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:454
+#: src/plugins/pgpcore/sgpgme.c:488
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Kan ikke initalisere data, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:609
+#: src/plugins/pgpcore/sgpgme.c:643
 msgid "Secret key specification is ambiguous"
 msgstr "Angivelse av privat nøkkel er tvetydig"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:653
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Privat nøkkel ikke funnet (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:632
+#: src/plugins/pgpcore/sgpgme.c:666
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Feil angivelse av privat nøkkel: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:721
+#: src/plugins/pgpcore/sgpgme.c:759
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme protokoll '%s' kan ikke brukes: Motoren '%s' er ikke installert riktig."
 
-#: src/plugins/pgpcore/sgpgme.c:727
+#: src/plugins/pgpcore/sgpgme.c:765
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11901,12 +12031,12 @@ msgstr ""
 "Gpgpme protokoll '%s' kan ikke brukes: Motoren '%s' versjon %s er "
 "installert, men versjon %s påkreves.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:735
+#: src/plugins/pgpcore/sgpgme.c:773
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme protokoll '%s' kan ikke brukes (ukjent problem)"
 
-#: src/plugins/pgpcore/sgpgme.c:751
+#: src/plugins/pgpcore/sgpgme.c:789
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11914,7 +12044,7 @@ msgstr ""
 "GnuPG er ikke installert skikkelig, eller må oppgraderes.\n"
 "OpenPGP-støtte deaktivert."
 
-#: src/plugins/pgpcore/sgpgme.c:785
+#: 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"
@@ -11922,11 +12052,11 @@ msgstr ""
 "Kontoinformasjonen må lagres med \"OK\" før et nytt nøkkelpar kan "
 "opprettes.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:790
+#: src/plugins/pgpcore/sgpgme.c:871
 msgid "No PGP key found"
 msgstr "Ingen PGP-nøkkel funnet"
 
-#: src/plugins/pgpcore/sgpgme.c:791
+#: 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"
@@ -11936,23 +12066,23 @@ msgstr ""
 "kan signere meldinger eller motta krypterte meldinger.\n"
 "Vil du opprette et nytt nøkkelpar nå?"
 
-#: src/plugins/pgpcore/sgpgme.c:861 src/plugins/pgpcore/sgpgme.c:877
+#: src/plugins/pgpcore/sgpgme.c:961 src/plugins/pgpcore/sgpgme.c:983
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kunne ikke danne nytt nøkkelpar: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:868
+#: src/plugins/pgpcore/sgpgme.c:971
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
 "Oppretter ditt nye nøkkelpar... Flytt musen rundt for å skape entropi..."
 
-#: src/plugins/pgpcore/sgpgme.c:883
+#: src/plugins/pgpcore/sgpgme.c:989
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Kunne ikke opprette nytt nøkkelpar: ukjent feil"
 
-#: src/plugins/pgpcore/sgpgme.c:887
+#: src/plugins/pgpcore/sgpgme.c:993
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11965,22 +12095,18 @@ msgstr ""
 "\n"
 "Vil du eksportere det til en nøkkeltjener?"
 
-#: src/plugins/pgpcore/sgpgme.c:891
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid "Key generated"
 msgstr "Nøkkel opprettet"
 
-#: src/plugins/pgpcore/sgpgme.c:930
+#: src/plugins/pgpcore/sgpgme.c:1073
 msgid "Key exported."
 msgstr "Nøkkel eksportert."
 
-#: src/plugins/pgpcore/sgpgme.c:932
+#: src/plugins/pgpcore/sgpgme.c:1075
 msgid "Couldn't export key."
 msgstr "Kunne ikke eksportere nøkkel."
 
-#: src/plugins/pgpcore/sgpgme.c:936
-msgid "Key export isn't implemented in Windows."
-msgstr "Nøkkeleksport er ikke implementert i Windows."
-
 #: src/plugins/pgpinline/pgpinline.c:155
 msgid "Incorrect part"
 msgstr "Feilaktig del"
@@ -12001,7 +12127,7 @@ msgstr "Kunne ikke konvertere tekstdata med noe fornuftig tegnsett."
 #: 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 "Kunne ikke initialisere GPG-kontekst, %s"
@@ -12136,11 +12262,11 @@ msgstr ""
 msgid "Signature boundary not found."
 msgstr "Søkstrengen ikke funnet."
 
-#: 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 "Kunne ikke behandle dekryptert fil."
 
-#: 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 "Kunne ikke behandle dekrypterte meldingsdeler."
 
@@ -12204,13 +12330,13 @@ msgid "Show Python console..."
 msgstr "Vis Python-konsoll..."
 
 #: 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 "Oppdater"
 
-#: 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 "Bla"
 
@@ -12397,26 +12523,26 @@ msgstr "Angi URL-en for den nyhetskilde du vil abonnere på:"
 msgid "'%c' can't be used in folder name."
 msgstr "Et mappenavn kan ikke inneholde '%c'."
 
-#: 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] "Claws Mail må ha nettadgang for å kunne oppdatere feeden."
 msgstr[1] "Claws Mail må ha nettadgang for å kunne oppdatere feedene."
 
-#: 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 "Vil du virkelig fjerne mappetreet '%s'?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:317
+#: src/plugins/rssyl/rssyl_cb_menu.c:315
 msgid "Remove feed tree"
 msgstr "Fjern mappetre"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:351
+#: src/plugins/rssyl/rssyl_cb_menu.c:349
 msgid "Select an OPML file"
 msgstr "Velg OPML fil"
 
-#: 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 "Kunne ikke opprette mappe for ny feed '%s'."
@@ -12463,51 +12589,51 @@ msgstr ""
 "RSSyl: Applikasjonen avslutter, kunne ikke avslutte oppdatering av kilde på "
 "'%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:273
+#: src/plugins/rssyl/rssyl_feed_props.c:270
 msgid "HTTP Basic authentication"
 msgstr "HTTP Basic autentisering"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:290
+#: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr "Bruk det forvalgte oppdateringsintervall"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:302
+#: src/plugins/rssyl/rssyl_feed_props.c:303
 msgid "Keep old items"
 msgstr "Behold gamle meldinger"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:308
+#: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
 msgstr "_Trim"
 
-#: 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 "Oppdater kilde, slett meldinger som ikke lenger er i kilden"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:313
+#: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr "Hent kommentarer hvis mulig"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Always mark it as new"
 msgstr "Marker den alltid som ny"
 
-#: 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 "Marker den som ny kun hvis tekst er endret"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid "Never mark it as new"
 msgstr "Marker den aldri som ny"
 
-#: 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 "Legg tittel til toppen av meldingen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:362
+#: src/plugins/rssyl/rssyl_feed_props.c:363
 msgid "Ignore title rename"
 msgstr "Ignorer endring av titler"
 
-#: 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."
@@ -12515,52 +12641,54 @@ msgstr ""
 "Bruk nåværende mappenavn, selv om forfatter av kilden endrer tittel på "
 "kilden."
 
-#: 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 "Verifiser SSL-sertifikatets gyldighet"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:391
+#: src/plugins/rssyl/rssyl_feed_props.c:392
 msgid "User name"
 msgstr "Brukernavn"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:404
+#: src/plugins/rssyl/rssyl_feed_props.c:405
 msgid "Source URL"
 msgstr "Kilde-URL:"
 
-#: 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 "Hent kommentarer på meldinger yngre enn"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:425
-msgid "day(s)"
-msgstr "dag(er)"
-
 #: 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 "dager"
+
+#: src/plugins/rssyl/rssyl_feed_props.c:427
 msgid "Set to -1 to fetch all comments"
 msgstr "Sett til -1 for å hente alle kommentarer"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:450
+#: src/plugins/rssyl/rssyl_feed_props.c:451
 msgid "If an item changes"
 msgstr "Bare hvis den er endret"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:455
+#: src/plugins/rssyl/rssyl_feed_props.c:456
 msgid "Items"
 msgstr "Element"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:468
+#: src/plugins/rssyl/rssyl_feed_props.c:469
 msgid "Refresh interval"
 msgstr "Intervall for oppdatering "
 
-#: 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 "Sett til 0 for å deaktivere automatisk oppdatering for denne kilde"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:528
+#: src/plugins/rssyl/rssyl_feed_props.c:529
 msgid "_OK"
 msgstr "_OK"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:536
+#: src/plugins/rssyl/rssyl_feed_props.c:537
 msgid "Set feed properties"
 msgstr "Angi feed-egenskaper"
 
@@ -12614,7 +12742,7 @@ msgstr ""
 "Noen av filene kan allerede finnes, eller du mangler kanskje "
 "skrivetillatelse der? "
 
-#: src/plugins/rssyl/rssyl.h:17
+#: src/plugins/rssyl/rssyl.h:20
 msgid "My Feeds"
 msgstr "Mine Kilder"
 
@@ -12677,17 +12805,17 @@ msgid "Updating comments for '%s'..."
 msgstr "Oppdaterer kommentarer for '%s'..."
 
 #: 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 "401 (Autorisering kreves)"
 
 #: 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 "403 (Uautorisert)"
 
 #: 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 "404 (Ikke funnet)"
 
@@ -12728,12 +12856,12 @@ msgstr "Kilde uten tittel"
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: Muligens ugyldig kilde uten tittel på %s\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:228
+#: src/plugins/rssyl/rssyl_update_feed.c:231
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Oppdaterer kilde '%s'..."
 
-#: 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"
@@ -12746,7 +12874,7 @@ msgstr ""
 "\n"
 "Vennligst kontakt utviklerne, dette burde ikke skje."
 
-#: 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 "Claws Mail må ha nettadgang for å kunne oppdatere kildene dine."
 
@@ -12759,7 +12887,7 @@ msgstr ""
 "Vennligst rapporter dette, med debug-utskrift vedlagt.\n"
 
 #: 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 "S/MIME"
 
@@ -12800,24 +12928,24 @@ msgstr ""
 "\n"
 "GPGME er copyright 2001 av Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:423
+#: src/plugins/smime/smime.c:421
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Kunne ikke angi GPG-protokoll, %s"
 
-#: src/plugins/smime/smime.c:451
+#: src/plugins/smime/smime.c:449
 msgid "Couldn't open temporary file"
 msgstr "Kunne ikke åpne midlertidlig fil"
 
-#: 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 "Kunne ikke skrive til midlertidlig fil"
 
-#: src/plugins/smime/smime.c:488
+#: src/plugins/smime/smime.c:486
 msgid "Couldn't close temporary file"
 msgstr "Kunne ikke lukke midlertidlig fil"
 
-#: 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."
@@ -12825,21 +12953,21 @@ msgstr ""
 "Vær oppmerksom på at brevhodefelter, som Emne, ikke krypteres med S/MIME-"
 "systemet."
 
-#: src/plugins/spam_report/spam_report.c:293
+#: src/plugins/spam_report/spam_report.c:299
 msgid "Reporting spam..."
 msgstr "Rapporterer spam..."
 
-#: src/plugins/spam_report/spam_report.c:328
+#: src/plugins/spam_report/spam_report.c:334
 msgid "Report spam online..."
 msgstr "Rapporter spam online..."
 
-#: 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 "SpamRapport"
 
-#: 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"
@@ -12855,19 +12983,19 @@ msgstr ""
 " * spamcop.net\n"
 " * nominasjonssystemet på lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:407
+#: src/plugins/spam_report/spam_report.c:413
 msgid "Spam reporting"
 msgstr "Spam-rapportering"
 
-#: src/plugins/spam_report/spam_report_prefs.c:122
+#: src/plugins/spam_report/spam_report_prefs.c:137
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: src/plugins/spam_report/spam_report_prefs.c:149
+#: src/plugins/spam_report/spam_report_prefs.c:169
 msgid "Forward to:"
 msgstr "Videresend til:"
 
-#: 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 "Passord:"
 
@@ -12903,8 +13031,9 @@ msgstr ""
 "for at spamd kjører og kan nås. "
 
 #: src/plugins/spamassassin/spamassassin.c:429
+#, fuzzy
 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 ""
 "Claws Mail må ha nettadgang for å kunne fore disse meldingene til den "
@@ -13071,12 +13200,6 @@ msgstr "Start"
 msgid "Show"
 msgstr "Vis"
 
-#: 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 "dager"
-
 #: src/plugins/vcalendar/month-view.c:109
 msgid "Monday"
 msgstr "Mandag"
@@ -13166,7 +13289,7 @@ msgid "Next month"
 msgstr "Neste måned"
 
 #: 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 "vCalendar"
 
@@ -13382,63 +13505,63 @@ msgstr "Deltagere:"
 msgid "Action:"
 msgstr "Handling:"
 
-#: src/plugins/vcalendar/vcal_folder.c:164
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "_Nytt møte..."
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "_Eksporter kalender..."
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to webCal..."
 msgstr "_Abonner på webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "_Omdøp..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "_Oppdater abonnementer"
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "_Listevisning"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "_Ukevisning"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "_Månedsvisning"
 
-#: src/plugins/vcalendar/vcal_folder.c:1094
+#: src/plugins/vcalendar/vcal_folder.c:1095
 msgid "Meetings"
 msgstr "Møter"
 
-#: src/plugins/vcalendar/vcal_folder.c:1479
+#: src/plugins/vcalendar/vcal_folder.c:1494
 msgid "in the past"
 msgstr "tidligere"
 
-#: src/plugins/vcalendar/vcal_folder.c:1482
+#: src/plugins/vcalendar/vcal_folder.c:1497
 msgid "today"
 msgstr "i dag"
 
-#: src/plugins/vcalendar/vcal_folder.c:1485
+#: src/plugins/vcalendar/vcal_folder.c:1500
 msgid "tomorrow"
 msgstr "i morgen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1488
+#: src/plugins/vcalendar/vcal_folder.c:1503
 msgid "this week"
 msgstr "denne uken"
 
-#: src/plugins/vcalendar/vcal_folder.c:1491
+#: src/plugins/vcalendar/vcal_folder.c:1506
 msgid "later"
 msgstr "senere"
 
-#: src/plugins/vcalendar/vcal_folder.c:1495
+#: src/plugins/vcalendar/vcal_folder.c:1510
 #, c-format
 msgid ""
 "\n"
@@ -13447,17 +13570,17 @@ msgstr ""
 "\n"
 "Dette er de planlagte begivenheter %s:\n"
 
-#: 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 "Tidsavbrudd (%d sekunder) ved forbindelse til %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1608
+#: src/plugins/vcalendar/vcal_folder.c:1623
 #, c-format
 msgid "Error %ld"
 msgstr "Feil %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1805
+#: src/plugins/vcalendar/vcal_folder.c:1820
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13470,7 +13593,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1809
+#: src/plugins/vcalendar/vcal_folder.c:1824
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13483,7 +13606,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: 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"
@@ -13494,7 +13617,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: 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"
@@ -13505,42 +13628,42 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: 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 "Kunne ikke opprette mappen %s"
 
-#: 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 "Claws Mail må ha nettadgang for å kunne oppdatere Webcal-feeden."
 
-#: src/plugins/vcalendar/vcal_folder.c:1904
+#: src/plugins/vcalendar/vcal_folder.c:1919
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Henter kalender for %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1905
+#: src/plugins/vcalendar/vcal_folder.c:1920
 msgid "new subscription"
 msgstr "nytt abonnement"
 
-#: 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 "Claws Mail må ha nettadgang for å kunne oppdatere abonnementet."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Subscribe to WebCal"
 msgstr "Abonner på WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Enter the WebCal URL:"
 msgstr "Angi WebCal-URLen:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1940
+#: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Could not parse the URL."
 msgstr "Kunne ikke tolke URLen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1968
+#: src/plugins/vcalendar/vcal_folder.c:1983
 msgid "Do you really want to unsubscribe?"
 msgstr "Vil du virkelig avbryte abonnementet?"
 
@@ -13596,15 +13719,15 @@ msgstr "Denne uken"
 msgid "Later"
 msgstr "Senere"
 
-#: src/plugins/vcalendar/vcal_manager.c:1242
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Godtatt:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1244
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Avslått:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1246
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Forsøksvis godtatt:"
 
@@ -13625,8 +13748,9 @@ msgid "Add..."
 msgstr "Legg til..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#, fuzzy
 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 ""
 "Følgende person(er) er opptatt på det planlagte møtetidspunkt:\n"
@@ -13911,83 +14035,83 @@ msgstr "Kunne ikke eksportere ledig/opptatt-info."
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Kunne ikke eksportere ledig/opptatt-info til '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:282
+#: src/plugins/vcalendar/vcal_prefs.c:285
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: src/plugins/vcalendar/vcal_prefs.c:291
+#: src/plugins/vcalendar/vcal_prefs.c:294
 msgid "Alert me"
 msgstr "Varsle meg"
 
-#: src/plugins/vcalendar/vcal_prefs.c:303
+#: src/plugins/vcalendar/vcal_prefs.c:306
 msgid "minutes before an event"
 msgstr "minutter før en begivenhet"
 
-#: src/plugins/vcalendar/vcal_prefs.c:315
+#: src/plugins/vcalendar/vcal_prefs.c:318
 msgid "Calendar export"
 msgstr "Kalendereksport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:326
+#: src/plugins/vcalendar/vcal_prefs.c:329
 msgid "Automatically export calendar to"
 msgstr "Eksporter kalenderen automatisk til"
 
-#: 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 "Du kan eksportere til en lokal fil eller en URL"
 
-#: 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 "Angi en lokal fil eller en URL (http://tjener/sti/fil.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:367
+#: src/plugins/vcalendar/vcal_prefs.c:370
 msgid "Include webcal subscriptions in export"
 msgstr "Ta med webcal-abonnementer i eksport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:377
+#: src/plugins/vcalendar/vcal_prefs.c:380
 msgid "Command to run after calendar export"
 msgstr "Kommando som skal kjøres etter kalendereksport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:406
+#: src/plugins/vcalendar/vcal_prefs.c:409
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrer Claws Mails kalender i XFCEs Orage-klokke"
 
-#: 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 "La Orage (versjon 4.4 eller høyere) se Claws Mails kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:421
+#: src/plugins/vcalendar/vcal_prefs.c:424
 msgid "Export as GNOME shell calendar server"
 msgstr "Eksporter som GNOME shell kalender-tjener"
 
-#: 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 ""
 "Registrer D-Bus kalender-tjener grensesnitt for å eksportere Claws Mails "
 "kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:433
+#: src/plugins/vcalendar/vcal_prefs.c:436
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: src/plugins/vcalendar/vcal_prefs.c:445
+#: src/plugins/vcalendar/vcal_prefs.c:448
 msgid "Automatically export free/busy status to"
 msgstr "Eksporter automatisk ledig/opptatt-info til"
 
-#: 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 "Angi en lokal fil eller en URL (http://tjener/sti/fil.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:486
+#: src/plugins/vcalendar/vcal_prefs.c:489
 msgid "Command to run after free/busy status export"
 msgstr "Kommando som skal kjøres etter eksport av ledig/opptatt-status"
 
-#: src/plugins/vcalendar/vcal_prefs.c:513
+#: src/plugins/vcalendar/vcal_prefs.c:516
 msgid "Get free/busy status of others from"
 msgstr "Hent andres ledig/opptatt-status fra"
 
-#: 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 "
@@ -13996,7 +14120,7 @@ msgstr ""
 "Angi en lokal fil eller en URL (http://tjener/sti/fil.ifb). Bruk %u for "
 "venstre side av epost-adressen, %d for domenet"
 
-#: src/plugins/vcalendar/vcal_prefs.c:535
+#: src/plugins/vcalendar/vcal_prefs.c:538
 msgid "SSL options"
 msgstr "SSL-valgmuligheter"
 
@@ -14051,56 +14175,56 @@ msgstr "feil oppsto i POP3-sesjon\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-kommandoen støttes ikke\n"
 
-#: 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 "POP3"
 
-#: 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 "IMAP4"
 
-#: src/prefs_account.c:338
+#: src/prefs_account.c:336
 msgid "News (NNTP)"
 msgstr "Nyhetsgruppe (NNTP)"
 
-#: src/prefs_account.c:339 src/wizard.c:1494
+#: src/prefs_account.c:337 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "Lokal mbox-fil"
 
-#: src/prefs_account.c:340
+#: src/prefs_account.c:338
 msgid "None (SMTP only)"
 msgstr "Ingen (kun SMTP)"
 
-#: src/prefs_account.c:1033
+#: src/prefs_account.c:1028
 msgid "Name of account"
 msgstr "Navn på kontoen"
 
-#: src/prefs_account.c:1042
+#: src/prefs_account.c:1037
 msgid "Set as default"
 msgstr "Angi som forvalgt"
 
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1045
 msgid "Personal information"
 msgstr "Personlig informasjon"
 
-#: src/prefs_account.c:1059
+#: src/prefs_account.c:1054
 msgid "Full name"
 msgstr "Fullt navn"
 
-#: src/prefs_account.c:1065
+#: src/prefs_account.c:1060
 msgid "Mail address"
 msgstr "Epostadresse"
 
-#: src/prefs_account.c:1128 src/wizard.c:1517
+#: src/prefs_account.c:1123 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Innstill automatisk"
 
-#: src/prefs_account.c:1130 src/wizard.c:1518
+#: src/prefs_account.c:1125 src/wizard.c:1525
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: 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."
@@ -14108,77 +14232,77 @@ msgstr ""
 "NB: denne versjonen av Claws Mail\n"
 "er bygd uten støtte for IMAP og Nyhetsgrupper."
 
-#: src/prefs_account.c:1176
+#: src/prefs_account.c:1171
 msgid "This server requires authentication"
 msgstr "Denne tjeneren krever autentisering"
 
-#: src/prefs_account.c:1183
+#: src/prefs_account.c:1178
 msgid "Authenticate on connect"
 msgstr "Autentiser ved tilkobling"
 
-#: src/prefs_account.c:1237
+#: src/prefs_account.c:1232
 msgid "News server"
 msgstr "Nyhetsgruppetjener"
 
-#: src/prefs_account.c:1243
+#: src/prefs_account.c:1238
 msgid "Server for receiving"
 msgstr "Tjener for mottak"
 
-#: src/prefs_account.c:1249
+#: src/prefs_account.c:1244
 msgid "Local mailbox"
 msgstr "Lokal postkasse"
 
-#: src/prefs_account.c:1256
+#: src/prefs_account.c:1251
 msgid "SMTP server (send)"
 msgstr "SMTP-tjener (sende)"
 
-#: src/prefs_account.c:1264
+#: src/prefs_account.c:1259
 msgid "Use mail command rather than SMTP server"
 msgstr "Bruk 'mail'-kommandoen i stedet for en SMTP-tjener"
 
-#: src/prefs_account.c:1273
+#: src/prefs_account.c:1268
 msgid "command to send mails"
 msgstr "kommando for å sende epost"
 
-#: src/prefs_account.c:1338
+#: src/prefs_account.c:1332
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1424
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Lokal"
 
-#: src/prefs_account.c:1430 src/prefs_account.c:1519
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Forvalgt innboks"
 
-#: 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 "Ufiltrerte meldinger vil bli lagret i denne mappen"
 
-#: src/prefs_account.c:1452
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Bruk sikker autentisering (APOP)"
 
-#: src/prefs_account.c:1455
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Slett meldinger på tjener når de mottas"
 
-#: src/prefs_account.c:1466
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Slett etter"
 
-#: 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 "0 dager og 0 timer: slett med en gang"
 
-#: src/prefs_account.c:1496
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Grense for mottaksstørrelse"
 
-#: 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."
@@ -14186,78 +14310,83 @@ msgstr ""
 "Meldinger over denne grensen vil bare delvis hentes ned. Når de velges vil "
 "du kunne laste ned hele meldinger eller slette dem."
 
-#: src/prefs_account.c:1539 src/prefs_account.c:2464
+#: src/prefs_account.c:1543 src/prefs_account.c:2482
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1546
+#: src/prefs_account.c:1550
 msgid "Maximum number of articles to download"
 msgstr "Maksimalt antall artikler som skal lastes ned"
 
-#: src/prefs_account.c:1556
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "ubegrenset dersom 0 angis"
 
-#: src/prefs_account.c:1592
+#: src/prefs_account.c:1585
+#, fuzzy
+msgid "Plain text"
+msgstr "Finn tekst:"
+
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "Mappe på IMAP-tjeneren"
 
-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(vanligvis tom)"
 
-#: src/prefs_account.c:1610
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Vis bare mapper du abonnerer på"
 
-#: src/prefs_account.c:1617
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Båndbredde-effektivt modus (laster ikke ned fjerne tagger)"
 
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Dette modus bruker mindre båndbredde, men kan være langsommere med noen "
 "tjenere."
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Filtrer meldinger idet de mottas"
 
-#: src/prefs_account.c:1633
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Tillat filtrering med programtillegg ved mottakelse"
 
-#: src/prefs_account.c:1637
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Hent Epost' ser etter meldinger på denne kontoen"
 
-#: 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 "Brevhode"
 
-#: src/prefs_account.c:1720
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Generer Meldings-ID"
 
-#: src/prefs_account.c:1723
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Send kontoens epost-adresse i Meldings-ID"
 
-#: src/prefs_account.c:1726
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Legg til brevhodefelt for user agent"
 
-#: src/prefs_account.c:1733
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Legg til brukerdefinert brevhode"
 
-#: src/prefs_account.c:1748
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentisering (SMTP AUTH)"
 
-#: 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."
@@ -14265,180 +14394,176 @@ msgstr ""
 "Hvis du lar disse stå tomme, vil samme\n"
 "bruker-ID og passord som ved mottak brukes."
 
-#: src/prefs_account.c:1844
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentiser med POP3 før sending"
 
-#: src/prefs_account.c:1859
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Tidsavbrudd for POP-autentisering: "
 
-#: src/prefs_account.c:1867
-msgid "minutes"
-msgstr "minutter"
-
-#: src/prefs_account.c:1937 src/prefs_account.c:1983
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:1940
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Sett inn signatur automatisk"
 
-#: src/prefs_account.c:1945
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_account.c:1970
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Resultat fra kommando"
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Sett automatisk følgende adresser"
 
-#: src/prefs_account.c:2055
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Ordbøker for stavekontroll"
 
-#: 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 "Forvalgt ordliste"
 
-#: 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 "Forvalgt sekundær ordbok"
 
-#: 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 "Skriv"
 
-#: 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 "Svar"
 
-#: 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 "Send videre"
 
-#: src/prefs_account.c:2241
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Forvalgt system for integritet"
 
-#: src/prefs_account.c:2270
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Signer alltid meldinger"
 
-#: src/prefs_account.c:2272
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Krypter alltid meldinger"
 
-#: src/prefs_account.c:2274
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Signer alltid meldinger ved svar på signert melding"
 
-#: src/prefs_account.c:2277
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Krypter alltid meldinger ved svar på krypterte meldinger"
 
-#: src/prefs_account.c:2280
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Krypter sendte meldinger med din egen nøkkel i tillegg til mottakerens."
 
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Lagre krypterte, sendte meldinger i klartekst"
 
-#: 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 "Ikke bruk SSL"
 
-#: src/prefs_account.c:2441
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Bruk SSL for POP3-tilkoblinger"
 
-#: 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 "Bruk STARTTLS-kommando til å starta SSL-sessjoner"
 
-#: src/prefs_account.c:2456
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Bruk SSL for IMAP4-tilkoblinger"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Bruk SSL for SMTP-tilkoblinger"
 
-#: src/prefs_account.c:2480
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Send (SMTP)"
 
-#: src/prefs_account.c:2484
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Ikke bruk SSL (men bruk STARTTLS om nødvendig)"
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Bruk SSL for SMTP-tilkobling"
 
-#: src/prefs_account.c:2495
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Klient-sertifikater"
 
-#: src/prefs_account.c:2503
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Sertifikat for mottagelse"
 
-#: 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 "Klient-sertifikatet som en PKCS12- eller PEM-fil"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Sertifikat for avsendelse"
 
-#: src/prefs_account.c:2558
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Godkjenn automatisk gyldige SSL-sertifikater"
 
-#: src/prefs_account.c:2561
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Bruk ikke-blokkerende SSL"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Deaktiver dette hvis du har problemer med tilkobling over SSL"
 
-#: src/prefs_account.c:2691
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP-port"
 
-#: src/prefs_account.c:2698
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "POP3-port"
 
-#: src/prefs_account.c:2705
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "IMAP4-port"
 
-#: src/prefs_account.c:2712
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "NNTP-port"
 
-#: src/prefs_account.c:2718
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Domenenavn"
 
-#: 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."
@@ -14446,124 +14571,112 @@ msgstr ""
 "Domenenavnet vil bli brukt i den Meldings-ID som opprettes, og ved "
 "oppkobling til SMTP-tjenere."
 
-#: src/prefs_account.c:2735
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Bruk kommando for å kommunisere med tjener"
 
-#: src/prefs_account.c:2743
-msgid "Move deleted mails to trash and expunge immediately"
-msgstr "Flytt slettede meldinger til papirkurven og rens den med en gang"
-
-#: src/prefs_account.c:2745
-msgid ""
-"Moves deleted mails to trash instead of using the \\Deleted flag without "
-"expunging."
-msgstr ""
-"Flytter slettede meldinger til papirkurven i stedet for å bruke \\Deleted-"
-"flagget uten å rense."
-
-#: src/prefs_account.c:2749
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Merk krysspostede meldinger som lest og med farve:"
 
-#: src/prefs_account.c:2805
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Legg sendte meldinger i"
 
-#: src/prefs_account.c:2807
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Legg køede meldinger i"
 
-#: src/prefs_account.c:2809
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Legg utkast i"
 
-#: src/prefs_account.c:2811
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Legg slettede meldinger i"
 
-#: src/prefs_account.c:2871
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Kontonavn ikke angitt."
 
-#: src/prefs_account.c:2875
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Epostadresse ikke angitt."
 
-#: src/prefs_account.c:2882
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "SMTP-tjener ikke angitt."
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Bruker ID ikke angitt."
 
-#: src/prefs_account.c:2892
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "POP3-tjener ikke angitt."
 
-#: src/prefs_account.c:2912
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Den forvalgte Innboks-mappen finnes ikke."
 
-#: src/prefs_account.c:2918
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-tjener ikke angitt."
 
-#: src/prefs_account.c:2923
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "NNTP-tjener ikke angitt."
 
-#: src/prefs_account.c:2929
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "lokal postkassefil ikke angitt."
 
-#: src/prefs_account.c:2935
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "mailkommando ikke angitt."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Motta"
 
-#: 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 "Maler"
 
-#: src/prefs_account.c:3324
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Personvern"
 
-#: src/prefs_account.c:3435
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Avansert"
 
-#: src/prefs_account.c:3726
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Innstillinger for ny konto"
 
-#: src/prefs_account.c:3728
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoinnstillinger"
 
-#: src/prefs_account.c:3849 src/wizard.c:1382
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Mislykket (feil adresse)"
 
-#: src/prefs_account.c:3934
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Velg signaturfil"
 
-#: 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 "Velg sertifikatfil"
 
-#: src/prefs_account.c:4065
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:4205
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (programtillegg er ikke innlest)"
@@ -14685,21 +14798,20 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Vil du virkelig slette alle handlinger?"
 
 #: 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 "Posten er ikke lagret"
 
 #: 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 "Posten ble ikke lagret. Lukk likevel?"
 
 #: 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 "_Fortsett redigering"
 
@@ -14792,7 +14904,7 @@ msgstr "bruk filterhandlinger mellom {} på de markerte meldinger"
 msgid "for a literal %"
 msgstr "for en bokstavelig %"
 
-#: src/prefs_actions.c:1004 src/prefs_themes.c:936
+#: src/prefs_actions.c:1004 src/prefs_themes.c:935
 msgid "Actions"
 msgstr "Handlinger"
 
@@ -14818,15 +14930,15 @@ msgstr "Aktuelle handlinger"
 msgid "Action string is not valid."
 msgstr "Handlingsstrengen er ugyldig."
 
-#: src/prefs_common.c:220 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:298
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Den %d\\n%f skrev:\\n\\n%q\\n%X"
 
-#: 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"
@@ -14834,7 +14946,7 @@ msgstr ""
 "\\n\\nStart videresendt melding:\\n\\n?d{Dato: %d\\n}?f{Fra: %f\\n}?t{Til: %t"
 "\\n}?c{Kopi-Til: %c\\n}?n{Nyhetsgruppe: %n\\n}?s{Emne: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:448
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%d/%m %Y (%a) - %H:%M"
 
@@ -15088,7 +15200,7 @@ msgid "Message flags"
 msgstr "Meldingsflagg"
 
 #: 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 "Marker"
 
@@ -15593,7 +15705,7 @@ msgstr "Vis"
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: 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 "Innstillinger"
 
@@ -15738,7 +15850,7 @@ msgstr "Feilmeldinger"
 msgid "Status messages for filtering/processing log"
 msgstr "Statusmeldinger for filter-/bearbeidingsloggen"
 
-#: 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 "Andre"
 
@@ -15814,11 +15926,11 @@ msgstr "Del av meldingsteksten"
 msgid "whole message"
 msgstr "Hele meldingen"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6332
+#: src/prefs_matcher.c:394 src/summaryview.c:6282
 msgid "Marked"
 msgstr "Markert"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6330
+#: src/prefs_matcher.c:395 src/summaryview.c:6280
 msgid "Deleted"
 msgstr "Slettet"
 
@@ -15826,11 +15938,11 @@ msgstr "Slettet"
 msgid "Replied"
 msgstr "Besvart"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6324
+#: src/prefs_matcher.c:397 src/summaryview.c:6274
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: 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 "Spam"
@@ -15839,7 +15951,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Har vedlegg"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6350
+#: src/prefs_matcher.c:401 src/summaryview.c:6300
 msgid "Signed"
 msgstr "Signert"
 
@@ -16143,6 +16255,11 @@ msgstr "Velg HTML-delen av flerdelte/alternative meldinger"
 msgid "Line space"
 msgstr "Linjeavstand"
 
+#: src/prefs_message.c:189 src/prefs_message.c:223
+#, fuzzy
+msgid "pixels"
+msgstr "piksel(er)"
+
 #: src/prefs_message.c:195
 msgid "Scroll"
 msgstr "Rull"
@@ -16179,6 +16296,24 @@ msgstr "Behandle disse tegnene som siteringstegn: "
 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 ""
+
+#: src/prefs_migration.c:104
+#, fuzzy
+msgid "Configuration warning"
+msgstr "Oppsetning fullført"
+
 #: src/prefs_msg_colors.c:147
 msgid "Message view"
 msgstr "Meldingsvisning"
@@ -16365,15 +16500,15 @@ msgstr "Velg farge for mappe"
 msgid "Colors"
 msgstr "Farger"
 
-#: src/prefs_other.c:96
+#: src/prefs_other.c:107
 msgid "Choose preset keyboard shortcuts"
 msgstr "Velg en forinnstilt oppsetning med hurtigtaster"
 
-#: src/prefs_other.c:110
+#: src/prefs_other.c:121
 msgid "Select preset:"
 msgstr "Velg forvalgt:"
 
-#: 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."
@@ -16381,35 +16516,35 @@ msgstr ""
 "Hurtigtaster for menypunktene kan endres ved å trykke tasten(e)\n"
 "mens menypunktet er i fokus under muspekeren."
 
-#: src/prefs_other.c:478
+#: src/prefs_other.c:496
 msgid "Add address to destination when double-clicked"
 msgstr "Dobbelklikk for å legge adressen til blant mottakerne"
 
-#: src/prefs_other.c:481
+#: src/prefs_other.c:499
 msgid "On exit"
 msgstr "Ved avsluttning"
 
-#: src/prefs_other.c:484
+#: src/prefs_other.c:502
 msgid "Confirm on exit"
 msgstr "Bekreft avsluttning"
 
-#: src/prefs_other.c:491
+#: src/prefs_other.c:509
 msgid "Empty trash on exit"
 msgstr "Tøm papirkurven ved avslutning"
 
-#: src/prefs_other.c:494
+#: src/prefs_other.c:512
 msgid "Warn if there are queued messages"
 msgstr "Varsle hvis det fortsatt er meldinger i køen"
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:514
 msgid "Keyboard shortcuts"
 msgstr "Hurtigtaster"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:517
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Tillat endring av hurtigtaster"
 
-#: 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"
@@ -16419,15 +16554,15 @@ msgstr ""
 "ved å sette fokus på menypunktet og skrive inn en ny tastekombinasjon.\n"
 "Fjern avkrysningen hvis du vil låse alle eksisterende hurtigtaster."
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:527
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Velg blant forinstilte hurtigtaster..."
 
-#: src/prefs_other.c:519
+#: src/prefs_other.c:537
 msgid "Metadata handling"
 msgstr "Håndtering av metadata"
 
-#: 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."
@@ -16435,31 +16570,31 @@ msgstr ""
 "Sikrere modus anmoder OS om å skrive metadata direkte til disken;\n"
 "dermed unngås tap av data ved sammenbrudd, men det kan ta noe tid."
 
-#: src/prefs_other.c:524
+#: src/prefs_other.c:542
 msgid "Safer"
 msgstr "Sikrere"
 
-#: src/prefs_other.c:526
+#: src/prefs_other.c:544
 msgid "Faster"
 msgstr "Raskere"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:562
 msgid "Socket I/O timeout"
 msgstr "Socket I/O tidsavbrudd"
 
-#: src/prefs_other.c:566
+#: src/prefs_other.c:584
 msgid "Ask before emptying trash"
 msgstr "Spør før papirkurven tømmes"
 
-#: src/prefs_other.c:568
+#: src/prefs_other.c:586
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "Spør om kontospesifikke filtreringsregler ved manuell filtrering"
 
-#: src/prefs_other.c:573
+#: src/prefs_other.c:591
 msgid "Use secure file deletion if possible"
 msgstr "Bruk sikker filsletting hvis mulig"
 
-#: src/prefs_other.c:577
+#: src/prefs_other.c:595
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16467,7 +16602,7 @@ msgstr ""
 "Bruk sikker filsletting hvis mulig\n"
 "(programmet 'shred' er ikke tilgjengelig)"
 
-#: 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."
@@ -16475,11 +16610,32 @@ msgstr ""
 "Bruk programmet 'shred' for å overskrive filer med tilfeldig data før de "
 "slettes. Det gjør slettingen langsommere. Les advarslene i shreds man-side."
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:604
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synkroniser mapper for frakoblet tilstand så snart som mulig"
 
-#: src/prefs_other.c:689
+#: src/prefs_other.c:607
+#, fuzzy
+msgid "Master passphrase"
+msgstr "Feil adgangsfrase.\n"
+
+#: src/prefs_other.c:610
+#, fuzzy
+msgid "Use a master passphrase"
+msgstr "Skriv inn adgangsfrase for:"
+
+#: 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
+#, fuzzy
+msgid "Change master passphrase"
+msgstr "Skriv inn adgangsfrase for:"
+
+#: src/prefs_other.c:778
 msgid "Miscellaneous"
 msgstr "Diverse"
 
@@ -16487,71 +16643,71 @@ msgstr "Diverse"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Den %d\\n%f skrev:\\n\\n%q"
 
-#: src/prefs_receive.c:123
+#: src/prefs_receive.c:142
 msgid "External incorporation program"
 msgstr "Eksternt integreringsprogram"
 
-#: src/prefs_receive.c:126
+#: src/prefs_receive.c:145
 msgid "Use external program for receiving mail"
 msgstr "Bruk eksternt program for å hente epost"
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:161
 msgid "Automatic checking"
 msgstr "Automatisk henting"
 
-#: src/prefs_receive.c:149
+#: src/prefs_receive.c:168
 msgid "Check for new mail every"
 msgstr "Se etter ny epost hvert"
 
-#: src/prefs_receive.c:167
+#: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
 msgstr "Se etter ny epost ved oppstart"
 
-#: src/prefs_receive.c:170
+#: src/prefs_receive.c:218
 msgid "Dialogs"
 msgstr "Dialoger"
 
-#: src/prefs_receive.c:172
+#: src/prefs_receive.c:220
 msgid "Show receive dialog"
 msgstr "Vis mottaksdialog"
 
-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:230
 msgid "Only on manual receiving"
 msgstr "Kun ved manuelt mottak"
 
-#: src/prefs_receive.c:193
+#: src/prefs_receive.c:241
 msgid "Close receive dialog when finished"
 msgstr "Lukk mottaksdialog når operasjon fullført"
 
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:244
 msgid "Don't popup error dialog on receive error"
 msgstr "Vis ikke feilmelding i eget vindu ved mottaksfeil"
 
-#: src/prefs_receive.c:199
+#: src/prefs_receive.c:247
 msgid "After receiving new mail"
 msgstr "Etter mottak av ny epost"
 
-#: src/prefs_receive.c:201
+#: src/prefs_receive.c:249
 msgid "Go to Inbox"
 msgstr "Gå til innboks"
 
-#: src/prefs_receive.c:203
+#: src/prefs_receive.c:251
 msgid "Update all local folders"
 msgstr "Oppdater alle lokale mapper"
 
-#: src/prefs_receive.c:205
+#: src/prefs_receive.c:253
 msgid "Run command"
 msgstr "Kjør kommando"
 
-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:258
 msgid "after automatic check"
 msgstr "etter automatisk avhenting"
 
-#: src/prefs_receive.c:212
+#: src/prefs_receive.c:260
 msgid "after manual check"
 msgstr "etter manuell avhenting"
 
-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:268
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -16560,39 +16716,39 @@ msgstr ""
 "Kommando som skal kjøres:\n"
 "(bruk %d som antall nye epostmeldinger)"
 
-#: src/prefs_receive.c:343 src/prefs_send.c:358
+#: src/prefs_receive.c:411 src/prefs_send.c:371
 msgid "Mail Handling"
 msgstr "Meldingshåndtering"
 
-#: src/prefs_receive.c:344
+#: src/prefs_receive.c:412
 msgid "Receiving"
 msgstr "Mottar epost"
 
-#: src/prefs_send.c:161
+#: src/prefs_send.c:159
 msgid "Save sent messages"
 msgstr "Lagre sendte meldinger"
 
-#: src/prefs_send.c:164
-msgid "Confirm before sending queued messages"
-msgstr "Noen feil oppsto mens meldinger i køen ble sendt"
-
-#: src/prefs_send.c:167
+#: src/prefs_send.c:162
 msgid "Never send Return Receipts"
 msgstr "Send aldri returkvittering"
 
-#: src/prefs_send.c:170
+#: src/prefs_send.c:180
+msgid "Confirm before sending queued messages"
+msgstr "Noen feil oppsto mens meldinger i køen ble sendt"
+
+#: src/prefs_send.c:183
 msgid "Show send dialog"
 msgstr "Vis sendingsdialog"
 
-#: src/prefs_send.c:172
+#: src/prefs_send.c:186
 msgid "Warn when Subject is empty"
 msgstr "Advar hvis Emne er tomt"
 
-#: src/prefs_send.c:180
+#: src/prefs_send.c:193
 msgid "Outgoing encoding"
 msgstr "Utgående koding"
 
-#: 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"
@@ -16600,135 +16756,131 @@ msgstr ""
 "Hvis 'Automatisk' er valgt, vil den mest egnede kodingen for gjeldende "
 "locale bli brukt"
 
-#: src/prefs_send.c:220
-msgid "Automatic (Recommended)"
-msgstr "Automatisk (Anbefalt)"
-
-#: src/prefs_send.c:222
+#: src/prefs_send.c:235
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_send.c:223
+#: src/prefs_send.c:236
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:225
+#: src/prefs_send.c:238
 msgid "Western European (ISO-8859-1)"
 msgstr "Vesteuropeisk (ISO-8859-1)"
 
-#: src/prefs_send.c:226
+#: src/prefs_send.c:239
 msgid "Western European (ISO-8859-15)"
 msgstr "Vesteuropeisk (ISO-8859-15)"
 
-#: src/prefs_send.c:228
+#: src/prefs_send.c:241
 msgid "Central European (ISO-8859-2)"
 msgstr "Sentraleuropeisk (ISO-8859-2)"
 
-#: src/prefs_send.c:230
+#: src/prefs_send.c:243
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: src/prefs_send.c:231
+#: src/prefs_send.c:244
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: src/prefs_send.c:233
+#: src/prefs_send.c:246
 msgid "Greek (ISO-8859-7)"
 msgstr "Gresk (ISO-8859-7)"
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:248
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebraisk (ISO-8859-8)"
 
-#: src/prefs_send.c:236
+#: src/prefs_send.c:249
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebraisk (Windows-1255)"
 
-#: src/prefs_send.c:238
+#: src/prefs_send.c:251
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisk (ISO-8859-6)"
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:252
 msgid "Arabic (Windows-1256)"
 msgstr "Arabisk (Windows-1256)"
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:254
 msgid "Turkish (ISO-8859-9)"
 msgstr "Tyrkisk (ISO-8859-9)"
 
-#: src/prefs_send.c:243
+#: src/prefs_send.c:256
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisk (ISO-8859-5)"
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:257
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/prefs_send.c:245
+#: src/prefs_send.c:258
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "Kyrillisk (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:259
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisk (KOI8-U)"
 
-#: src/prefs_send.c:247
+#: src/prefs_send.c:260
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_send.c:249
+#: src/prefs_send.c:262
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japansk (ISO-2022-JP)"
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:264
 msgid "Japanese (EUC-JP)"
 msgstr "Japansk (EUC-JP)"
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:265
 msgid "Japanese (Shift_JIS)"
 msgstr "Japansk (Shift_JIS)"
 
-#: src/prefs_send.c:255
+#: src/prefs_send.c:268
 msgid "Simplified Chinese (GB18030)"
 msgstr "Forenklet Kinesisk (GB18030)"
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:269
 msgid "Simplified Chinese (GB2312)"
 msgstr "Forenklet kinesisk (GB2312)"
 
-#: src/prefs_send.c:257
+#: src/prefs_send.c:270
 msgid "Simplified Chinese (GBK)"
 msgstr "Forenklet Kinesisk (GBK)"
 
-#: src/prefs_send.c:258
+#: src/prefs_send.c:271
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradisjonell kinesisk (Big5)"
 
-#: src/prefs_send.c:260
+#: src/prefs_send.c:273
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradisjonell kinesisk (EUC-TW)"
 
-#: src/prefs_send.c:261
+#: src/prefs_send.c:274
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinesisk (ISO-2022-CN)"
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:277
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:279
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:280
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:284
 msgid "Transfer encoding"
 msgstr "Transfer enkoding"
 
-#: src/prefs_send.c:282
+#: src/prefs_send.c:295
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -16736,8 +16888,8 @@ msgstr ""
 "Angi hvilken Content-Transfer-Encoding som skal brukes når meldingskroppen "
 "inneholder ikke-ASCII tegn"
 
-#: 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 "Sender"
 
@@ -17163,7 +17315,7 @@ msgstr "Gjeldende mal"
 msgid "Template"
 msgstr "Mal"
 
-#: 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 "Forvalgt internt tema"
 
@@ -17270,54 +17422,54 @@ msgstr ""
 "Fil %s feilet\n"
 "under installasjon av temaet."
 
-#: src/prefs_themes.c:667
+#: src/prefs_themes.c:666
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d tema tilgjengelig (%d bruker, %d system, 1 intern)"
 
-#: src/prefs_themes.c:708
+#: src/prefs_themes.c:707
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Internt tema har %d ikoner"
 
-#: src/prefs_themes.c:714
+#: src/prefs_themes.c:713
 msgid "No info file available for this theme"
 msgstr "Ingen informasjonsfil er tilgjengelig for dette temaet"
 
-#: src/prefs_themes.c:732
+#: src/prefs_themes.c:731
 msgid "Error: couldn't get theme status"
 msgstr "Feil: kan ikke finne temastatus"
 
-#: src/prefs_themes.c:756
+#: src/prefs_themes.c:755
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d filer (%d ikoner), størrelse: %s"
 
-#: src/prefs_themes.c:804
+#: src/prefs_themes.c:803
 msgid "Selector"
 msgstr "Utvelger"
 
-#: src/prefs_themes.c:815
+#: src/prefs_themes.c:814
 msgid "Install new..."
 msgstr "Installer nytt..."
 
-#: src/prefs_themes.c:820
+#: src/prefs_themes.c:819
 msgid "Get more..."
 msgstr "Finn mer..."
 
-#: src/prefs_themes.c:831
+#: src/prefs_themes.c:830
 msgid "Information"
 msgstr "Informasjon"
 
-#: src/prefs_themes.c:845
+#: src/prefs_themes.c:844
 msgid "Author: "
 msgstr "Forfatter: "
 
-#: src/prefs_themes.c:853
+#: src/prefs_themes.c:852
 msgid "URL:"
 msgstr "URL:"
 
-#: src/prefs_themes.c:895
+#: src/prefs_themes.c:894
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
@@ -17466,35 +17618,35 @@ msgstr "Ingen informasjon tilgjengelig"
 msgid "No recipient keys defined."
 msgstr "Ingen mottaksnøkler definert."
 
-#: 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 "[Feil ved dekoding av BASE64]\n"
 
-#: src/procmsg.c:937 src/procmsg.c:940
+#: src/procmsg.c:936 src/procmsg.c:939
 msgid "Already trying to send."
 msgstr "Forsøker allerede å sende."
 
-#: 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 "Kunne ikke åpne fil %s."
 
-#: src/procmsg.c:1619
+#: src/procmsg.c:1626
 msgid "Queued message header is broken."
 msgstr "Sitert meldingshode er ødelagt."
 
-#: src/procmsg.c:1639
+#: src/procmsg.c:1646
 msgid "An error happened during SMTP session."
 msgstr "En feil oppsto under SMTP-sesjonen."
 
-#: 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 ""
 "Ingen bestemt konto funnet for sending og en feil oppsto i SMTP-sesjonen."
 
-#: src/procmsg.c:1661
+#: src/procmsg.c:1668
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -17502,20 +17654,20 @@ msgstr ""
 "Kunne ikke finne avsenderinformasjon. Meldingen er kanskje ikke opprettet av "
 "Claws."
 
-#: src/procmsg.c:1683
+#: src/procmsg.c:1690
 msgid "Couldn't create temporary file for news sending."
 msgstr "Kunne ikke opprette midlertidig fil for sending til postliste."
 
-#: src/procmsg.c:1696
+#: src/procmsg.c:1703
 msgid "Error when writing temporary file for news sending."
 msgstr "Kunne ikke skrive til midlertidig fil for sending til nyhetsgruppe."
 
-#: src/procmsg.c:1710
+#: src/procmsg.c:1717
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Feil oppsto under posting av melding til %s."
 
-#: src/procmsg.c:2262
+#: src/procmsg.c:2269
 msgid "Filtering messages...\n"
 msgstr "Filtrerer melding...\n"
 
@@ -17821,88 +17973,88 @@ msgstr "Angi tekst som skal erstatte '%s'"
 msgid "Enter variable"
 msgstr "Angi variabel"
 
-#: src/send_message.c:152
+#: src/send_message.c:153
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Sender melding med følgende kommando: %s\n"
 
-#: src/send_message.c:166
+#: src/send_message.c:167
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Kunne ikke utføre komando: %s"
 
-#: src/send_message.c:201
+#: src/send_message.c:202
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "En feil oppsto under utføring av kommando: %s"
 
-#: src/send_message.c:351
+#: src/send_message.c:350
 msgid "Connecting"
 msgstr "Forbinder"
 
-#: src/send_message.c:356
+#: src/send_message.c:355
 msgid "Doing POP before SMTP..."
 msgstr "Gjør POP før SMTP..."
 
-#: src/send_message.c:359
+#: src/send_message.c:358
 msgid "POP before SMTP"
 msgstr "POP før SMTP"
 
-#: src/send_message.c:364
+#: src/send_message.c:363
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Konto '%s': Forbinder til SMTP-tjener: %s:%d..."
 
-#: src/send_message.c:421
+#: src/send_message.c:420
 msgid "Mail sent successfully."
 msgstr "Melding sendt ok."
 
-#: src/send_message.c:487
+#: src/send_message.c:486
 msgid "Sending HELO..."
 msgstr "Sender HELO..."
 
-#: 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 "Autentisering"
 
-#: src/send_message.c:489 src/send_message.c:494
+#: src/send_message.c:488 src/send_message.c:493
 msgid "Sending message..."
 msgstr "Sender melding..."
 
-#: src/send_message.c:492
+#: src/send_message.c:491
 msgid "Sending EHLO..."
 msgstr "Sender EHLO..."
 
-#: src/send_message.c:501
+#: src/send_message.c:500
 msgid "Sending MAIL FROM..."
 msgstr "Sender MAIL FROM..."
 
-#: src/send_message.c:505
+#: src/send_message.c:504
 msgid "Sending RCPT TO..."
 msgstr "Sender RCPT TO..."
 
-#: src/send_message.c:510
+#: src/send_message.c:509
 msgid "Sending DATA..."
 msgstr "Send DATA..."
 
-#: src/send_message.c:514
+#: src/send_message.c:513
 msgid "Quitting..."
 msgstr "Avslutter..."
 
-#: src/send_message.c:543
+#: src/send_message.c:542
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sender melding (%d / %d byte)"
 
-#: src/send_message.c:596
+#: src/send_message.c:595
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: 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 "Feil oppstod under avsending av meldingen."
 
-#: src/send_message.c:668
+#: src/send_message.c:667
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -17935,15 +18087,15 @@ msgstr "Kildekode for melding"
 msgid "%s - Source"
 msgstr "%s - Kildekode"
 
-#: src/ssl_manager.c:157
+#: src/ssl_manager.c:156
 msgid "Saved SSL certificates"
 msgstr "Lagrede SSL-sertifikat"
 
-#: src/ssl_manager.c:431
+#: src/ssl_manager.c:436
 msgid "Delete certificate"
 msgstr "Slett sertifikat"
 
-#: src/ssl_manager.c:432
+#: src/ssl_manager.c:437
 msgid "Do you really want to delete this certificate?"
 msgstr "Ønsker du virkelig å slette dette sertifikatet?"
 
@@ -17971,7 +18123,7 @@ msgstr "Betingelse: "
 msgid "Find _all"
 msgstr "Finn _alle"
 
-#: 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 "Søker i %s...\n"
@@ -17996,263 +18148,266 @@ msgstr "Skjul/vis hurtigsøk"
 msgid "Toggle multiple selection"
 msgstr "Slå utvidet utvalg til/fra"
 
-#: src/summaryview.c:1294
+#: src/summaryview.c:1275
 msgid "Process mark"
 msgstr "Bearbeid merke"
 
-#: src/summaryview.c:1295
+#: src/summaryview.c:1276
 msgid "Some marks are left. Process them?"
 msgstr "Noen merker gjenstår. Bearbeid dem?"
 
-#: src/summaryview.c:1345
+#: src/summaryview.c:1326
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Gjennomsøker mappe (%s)..."
 
-#: src/summaryview.c:1842 src/summaryview.c:1894
+#: src/summaryview.c:1823 src/summaryview.c:1875
 msgid "No more unread messages"
 msgstr "Ingen flere uleste meldinger"
 
 # src/summaryview.c:912y
-#: src/summaryview.c:1843
+#: src/summaryview.c:1824
 msgid "No unread message found. Search from the end?"
 msgstr "Ingen uleste meldinger funnet. _Søk fra slutten?"
 
-#: 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 "Intern feil: uventet verdi for prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1863
+#: src/summaryview.c:1844
 msgid "No unread messages."
 msgstr "Ingen uleste meldinger."
 
-#: src/summaryview.c:1895
+#: src/summaryview.c:1876
 msgid "No unread message found. Go to next folder?"
 msgstr "Ingen uleste meldinger funnet. Gå til neste mappe?"
 
-#: src/summaryview.c:1937 src/summaryview.c:1989
+#: src/summaryview.c:1918 src/summaryview.c:1970
 msgid "No more new messages"
 msgstr "Ingen flere nye meldinger"
 
 # src/summaryview.c:912y
-#: src/summaryview.c:1938
+#: src/summaryview.c:1919
 msgid "No new message found. Search from the end?"
 msgstr "Ingen nye meldinger funnet. _Søk fra slutten?"
 
-#: src/summaryview.c:1958
+#: src/summaryview.c:1939
 msgid "No new messages."
 msgstr "Ingen nye meldinger."
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:1971
 msgid "No new message found. Go to next folder?"
 msgstr "Ingen nye meldinger funnet. Gå til neste mappe?"
 
-#: src/summaryview.c:2027 src/summaryview.c:2068
+#: src/summaryview.c:2008 src/summaryview.c:2049
 msgid "No more marked messages"
 msgstr "Ingen flere merkede meldinger"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2009
 msgid "No marked message found. Search from the end?"
 msgstr "Ingen merkede meldinger funnet. Søk fra slutten?"
 
-#: src/summaryview.c:2037
+#: src/summaryview.c:2018
 msgid "No marked messages."
 msgstr "Ingen merkede meldinger."
 
-#: src/summaryview.c:2069
+#: src/summaryview.c:2050
 msgid "No marked message found. Go to next folder?"
 msgstr "Ingen merkede meldinger funnet. Gå til neste mappe?"
 
-#: src/summaryview.c:2106 src/summaryview.c:2131
+#: src/summaryview.c:2087 src/summaryview.c:2112
 msgid "No more labeled messages"
 msgstr "Ingen flere fargemerkede meldinger"
 
-#: src/summaryview.c:2107
+#: src/summaryview.c:2088
 msgid "No labeled message found. Search from the end?"
 msgstr "Ingen fargemerkede meldinger funnet. Søk på nytt fra slutten?"
 
-#: src/summaryview.c:2116 src/summaryview.c:2141
+#: src/summaryview.c:2097 src/summaryview.c:2122
 msgid "No labeled messages."
 msgstr "Inget fargemerkede meldinger."
 
-#: src/summaryview.c:2132
+#: src/summaryview.c:2113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Ingen fargemerkede meldinger funnet. Søk på nytt fra begynnelsen?"
 
-#: src/summaryview.c:2446
+#: src/summaryview.c:2427
 msgid "Attracting messages by subject..."
 msgstr "Meldinger innlemmes i tråden etter emne..."
 
-#: src/summaryview.c:2631
+#: src/summaryview.c:2612
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: src/summaryview.c:2635
+#: src/summaryview.c:2616
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttet"
 
-#: 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 "%s%d kopiert"
 
-#: src/summaryview.c:2655
+#: src/summaryview.c:2636
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " valgt objekt"
 msgstr[1] " valgte objekter"
 
-#: 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 "%d ny(e), %d ulest(e), %d i alt (%s)"
 
-#: src/summaryview.c:2691
+#: src/summaryview.c:2672
 msgid "Message summary"
 msgstr "Meldings-sammendrag"
 
-#: src/summaryview.c:2692
+#: src/summaryview.c:2673
 msgid "New:"
 msgstr "Nye:"
 
-#: src/summaryview.c:2693
+#: src/summaryview.c:2674
 msgid "Unread:"
 msgstr "Uleste:"
 
-#: src/summaryview.c:2694
+#: src/summaryview.c:2675
 msgid "Total:"
 msgstr "Totalt:"
 
-#: src/summaryview.c:2696
+#: src/summaryview.c:2677
 msgid "Marked:"
 msgstr "Markert:"
 
-#: src/summaryview.c:2697
+#: src/summaryview.c:2678
 msgid "Replied:"
 msgstr "Besvart:"
 
-#: src/summaryview.c:2698
+#: src/summaryview.c:2679
 msgid "Forwarded:"
 msgstr "Videresendt:"
 
-#: src/summaryview.c:2699
+#: src/summaryview.c:2680
 msgid "Locked:"
 msgstr "Låst:"
 
-#: src/summaryview.c:2700
+#: src/summaryview.c:2681
 msgid "Ignored:"
 msgstr "Ignorert:"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2682
 msgid "Watched:"
 msgstr "Overvåket:"
 
-#: src/summaryview.c:2711
+#: src/summaryview.c:2692
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d markert (%s/%s), %d ulest"
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:2972
 msgid "Sorting summary..."
 msgstr "Sorterer sammendrag..."
 
-#: src/summaryview.c:3130
+#: src/summaryview.c:3111
 msgid "Setting summary from message data..."
 msgstr "Oppretter sammendrag fra meldingsdata..."
 
-#: src/summaryview.c:3335
+#: src/summaryview.c:3316
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
-#: src/summaryview.c:3387
+#: src/summaryview.c:3368
 msgid "(No Recipient)"
 msgstr "(Ingen mottaker)"
 
-#: src/summaryview.c:3422
+#: src/summaryview.c:3403
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Fra: %s, på %s"
 
-#: src/summaryview.c:3431
+#: src/summaryview.c:3412
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Til: %s, på %s"
 
-#: src/summaryview.c:4310
+#: src/summaryview.c:4291
 msgid "You're not the author of the article.\n"
 msgstr "Du har ikke skrevet denne artikkelen.\n"
 
-#: 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] "Vil du virkelig slette den markerte meldingen?"
 msgstr[1] "Vil du virkelig slette de %d markerte meldingene?"
 
-#: src/summaryview.c:4406
-msgid "Delete message(s)"
-msgstr "Slett melding(er)"
+#: src/summaryview.c:4384
+#, fuzzy
+msgid "Delete message"
+msgid_plural "Delete messages"
+msgstr[0] "Slett melding"
+msgstr[1] "Slett melding"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4548
 msgid "Destination is same as current folder."
 msgstr "Målmappen er den samme som aktuell mappe."
 
-#: src/summaryview.c:4679
+#: src/summaryview.c:4653
 msgid "Destination to copy is same as current folder."
 msgstr "Den valgte målmappen er den samme som aktuell mappe."
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4818
 msgid "Append or Overwrite"
 msgstr "Legg til eller overskriv"
 
-#: src/summaryview.c:4845
+#: src/summaryview.c:4819
 msgid "Append or overwrite existing file?"
 msgstr "Legg til i slutten av eksisterende fil, eller overskriv hele filen?"
 
-#: src/summaryview.c:4846
+#: src/summaryview.c:4820
 msgid "_Append"
 msgstr "Legg til i slutten"
 
-#: src/summaryview.c:4846
+#: src/summaryview.c:4820
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: 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 ""
 "Du er i ferd med å skrive ut %d meldinger, en for en. Vil du fortsette?"
 
-#: src/summaryview.c:5371
+#: src/summaryview.c:5321
 msgid "Building threads..."
 msgstr "Tråder..."
 
-#: src/summaryview.c:5619
+#: src/summaryview.c:5569
 msgid "Skip these rules"
 msgstr "Hopp over disse reglene"
 
-#: src/summaryview.c:5622
+#: src/summaryview.c:5572
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Bruk disse reglene uansett hvilken konto de hører til"
 
-#: src/summaryview.c:5625
+#: src/summaryview.c:5575
 msgid "Apply these rules if they apply to the current account"
 msgstr "Bruk disse reglene hvis de hører til den aktive kontoen"
 
-#: src/summaryview.c:5654
+#: src/summaryview.c:5604
 msgid "Filtering"
 msgstr "Filtrerer"
 
-#: 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:"
@@ -18260,55 +18415,55 @@ msgstr ""
 "Enkelte filterregler hører til en bestemt konto.\n"
 "Velg hva som skal skje med disse reglene:"
 
-#: src/summaryview.c:5685
+#: src/summaryview.c:5635
 msgid "Filtering..."
 msgstr "Filtrerer..."
 
-#: src/summaryview.c:5764
+#: src/summaryview.c:5714
 msgid "Processing configuration"
 msgstr "Behandler oppsetningen"
 
-#: src/summaryview.c:6310
+#: src/summaryview.c:6260
 msgid "Ignored thread"
 msgstr "Ignorert tråd"
 
-#: src/summaryview.c:6312
+#: src/summaryview.c:6262
 msgid "Watched thread"
 msgstr "Overvåket tråd"
 
-#: src/summaryview.c:6320
+#: src/summaryview.c:6270
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Besvart men også videresendt - klikk for å se svaret"
 
-#: src/summaryview.c:6322
+#: src/summaryview.c:6272
 msgid "Replied - click to see reply"
 msgstr "Besvart - klikk for å se svaret"
 
-#: src/summaryview.c:6334
+#: src/summaryview.c:6284
 msgid "To be moved"
 msgstr "Skal flyttes"
 
-#: src/summaryview.c:6336
+#: src/summaryview.c:6286
 msgid "To be copied"
 msgstr "Skal kopieres"
 
-#: src/summaryview.c:6348
+#: src/summaryview.c:6298
 msgid "Signed, has attachment(s)"
 msgstr "Signert, har vedlegg"
 
-#: src/summaryview.c:6352
+#: src/summaryview.c:6302
 msgid "Encrypted, has attachment(s)"
 msgstr "Kryptert, har vedlegg"
 
-#: src/summaryview.c:6354
+#: src/summaryview.c:6304
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: src/summaryview.c:6356
+#: src/summaryview.c:6306
 msgid "Has attachment(s)"
 msgstr "Har vedlegg"
 
-#: src/summaryview.c:8004
+#: src/summaryview.c:7953
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18317,11 +18472,11 @@ msgstr ""
 "Feil ved regulært uttrykk (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8107
+#: src/summaryview.c:8056
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Gå tilbake til mappelisten (du har uleste meldinger)"
 
-#: src/summaryview.c:8112
+#: src/summaryview.c:8061
 msgid "Go back to the folder list"
 msgstr "Gå tilbake til mappelisten"
 
@@ -18781,12 +18936,12 @@ msgstr "Velg hvilken URL som skal åpnes."
 msgid "Select All"
 msgstr "Velg alt"
 
-#: src/wizard.c:520
+#: src/wizard.c:521
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Velkommen til Claws"
 
-#: src/wizard.c:543
+#: src/wizard.c:544
 #, c-format
 msgid ""
 "\n"
@@ -18876,54 +19031,54 @@ msgstr ""
 "gjøres på <%s>.\n"
 "\n"
 
-#: src/wizard.c:619
+#: src/wizard.c:620
 msgid "Please enter the mailbox name."
 msgstr "Angi navn på postkassen."
 
-#: src/wizard.c:647
+#: src/wizard.c:648
 msgid "Please enter your name and email address."
 msgstr "Angi fullt navn og epostadresse."
 
-#: src/wizard.c:658
+#: src/wizard.c:659
 msgid "Please enter your receiving server and username."
 msgstr "Angi tjener for innkommende epost og ditt brukernavn på denne"
 
-#: src/wizard.c:668
+#: src/wizard.c:669
 msgid "Please enter your username."
 msgstr "Angi ditt brukernavn"
 
-#: src/wizard.c:678
+#: src/wizard.c:679
 msgid "Please enter your SMTP server."
 msgstr "Angi tjener for utgående epost (SMTP)."
 
-#: src/wizard.c:689
+#: src/wizard.c:690
 msgid "Please enter your SMTP username."
 msgstr "Angi brukernavn på utgående tjener (SMTP)."
 
-#: src/wizard.c:968
+#: src/wizard.c:975
 msgid "Your name:"
 msgstr "Ditt navn:"
 
-#: src/wizard.c:979
+#: src/wizard.c:986
 msgid "Your email address:"
 msgstr "Din epostadresse:"
 
-#: src/wizard.c:990
+#: src/wizard.c:997
 msgid "Your organization:"
 msgstr "Organisasjon:"
 
-#: src/wizard.c:1024
+#: src/wizard.c:1031
 msgid "Mailbox name:"
 msgstr "Postkasse-navn:"
 
-#: src/wizard.c:1032
+#: src/wizard.c:1039
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 "Du kan også angi en absolutt sti, f.eks.: \"/home/john/Dokumenter/Epost\""
 
-#: 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\""
@@ -18931,55 +19086,55 @@ msgstr ""
 "Du kan spesifisere portnummeret ved å føye det til i slutten: \"mail."
 "eksempel.com:25\""
 
-#: src/wizard.c:1106
+#: src/wizard.c:1113
 msgid "SMTP server address:"
 msgstr "Adresse til SMTP-tjener:"
 
-#: src/wizard.c:1112
+#: src/wizard.c:1119
 msgid "Use authentication"
 msgstr "Bruk autentisering"
 
-#: src/wizard.c:1121
+#: src/wizard.c:1128
 msgid "(empty to use the same as receive)"
 msgstr "(hvis tomt brukes samme som ved mottak)"
 
-#: src/wizard.c:1135
+#: src/wizard.c:1142
 msgid "SMTP username:"
 msgstr "SMTP brukernavn:"
 
-#: src/wizard.c:1146
+#: src/wizard.c:1153
 msgid "SMTP password:"
 msgstr "SMPT-passord:"
 
-#: src/wizard.c:1159
+#: src/wizard.c:1166
 msgid "Use SSL to connect to SMTP server"
 msgstr "Bruk SSL for å forbinde til SMTP-tjener"
 
-#: src/wizard.c:1170 src/wizard.c:1590
+#: src/wizard.c:1177 src/wizard.c:1597
 msgid "Use SSL via STARTTLS"
 msgstr "Bruk SSL via STARTTLS"
 
-#: src/wizard.c:1182 src/wizard.c:1602
+#: src/wizard.c:1189 src/wizard.c:1609
 msgid "Client SSL certificate (optional)"
 msgstr "SSL-sertifikat for mottageren (valgfritt)"
 
-#: 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 "Adresse til tjener:"
 
-#: src/wizard.c:1314
+#: src/wizard.c:1321
 msgid "Local mailbox:"
 msgstr "Lokal postkasse:"
 
-#: src/wizard.c:1483
+#: src/wizard.c:1490
 msgid "Server type:"
 msgstr "Tjener-type:"
 
-#: src/wizard.c:1493
+#: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP"
 
-#: 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\""
@@ -18987,19 +19142,19 @@ msgstr ""
 "Du kan spesifisere portnummeret ved å føye det til i slutten: \"mail."
 "eksempel.com:110\""
 
-#: src/wizard.c:1579
+#: src/wizard.c:1586
 msgid "Use SSL to connect to receiving server"
 msgstr "Bruk SSL for å forbinde til innkommende tjener"
 
-#: src/wizard.c:1644
+#: src/wizard.c:1651
 msgid "IMAP server directory:"
 msgstr "Mappe på IMAP-tjeneren:"
 
-#: src/wizard.c:1655
+#: src/wizard.c:1662
 msgid "Show only subscribed folders"
 msgstr "Vis bare mapper det abonneres på"
 
-#: src/wizard.c:1663
+#: src/wizard.c:1670
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19007,15 +19162,15 @@ msgstr ""
 "Advarsel: denne versjonen av Claws Mail\n"
 "er bygd uten støtte for IMAP."
 
-#: src/wizard.c:1781
+#: src/wizard.c:1788
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail konfigurasjonsveiviser"
 
-#: src/wizard.c:1815
+#: src/wizard.c:1822
 msgid "Welcome to Claws Mail"
 msgstr "Velkommen til Claws"
 
-#: src/wizard.c:1823
+#: src/wizard.c:1829
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19028,31 +19183,31 @@ msgstr ""
 "Vi begynner med å legge inn dine grunnopplysninger og dine vanligste "
 "epostinnstillinger så du kan ta Claws Mail i bruk i løpet av noen minutter."
 
-#: src/wizard.c:1836
+#: src/wizard.c:1842
 msgid "About You"
 msgstr "Om deg selv"
 
-#: 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 "Felter i fete typer må utfylles"
 
-#: src/wizard.c:1851
+#: src/wizard.c:1857
 msgid "Receiving mail"
 msgstr "Mottar epost"
 
-#: src/wizard.c:1866
+#: src/wizard.c:1872
 msgid "Sending mail"
 msgstr "Sender epost"
 
-#: src/wizard.c:1882
+#: src/wizard.c:1888
 msgid "Saving mail on disk"
 msgstr "Lagrer melding til disk"
 
-#: src/wizard.c:1898
+#: src/wizard.c:1904
 msgid "Configuration finished"
 msgstr "Oppsetning fullført"
 
-#: src/wizard.c:1906
+#: src/wizard.c:1911
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19060,6 +19215,40 @@ msgstr ""
 "Claws Mail er nå klar.\n"
 "Klikk Lagre for å starte."
 
+#~ msgid "_Other folder..."
+#~ msgstr "_Annen mappe..."
+
+#~ msgid "   Key import isn't implemented in Windows.\n"
+#~ msgstr "   Nøkkelimport er ikke implementert i Windows.\n"
+
+#~ msgid "minute(s)"
+#~ msgstr "minutt(er)"
+
+#~ msgid "The signature can't be checked - %s."
+#~ msgstr "Signaturen kan ikke verifiseres - %s."
+
+#~ msgid "Key export isn't implemented in Windows."
+#~ msgstr "Nøkkeleksport er ikke implementert i Windows."
+
+#~ msgid "day(s)"
+#~ msgstr "dag(er)"
+
+#~ msgid "Move deleted mails to trash and expunge immediately"
+#~ msgstr "Flytt slettede meldinger til papirkurven og rens den med en gang"
+
+#~ msgid ""
+#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
+#~ "expunging."
+#~ msgstr ""
+#~ "Flytter slettede meldinger til papirkurven i stedet for å bruke \\Deleted-"
+#~ "flagget uten å rense."
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatisk (Anbefalt)"
+
+#~ msgid "Delete message(s)"
+#~ msgstr "Slett melding(er)"
+
 #~ msgid "+_Insert"
 #~ msgstr "+Sett _inn"
 
@@ -19152,9 +19341,6 @@ msgstr ""
 #~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
 #~ msgstr "<span color=\"red\">Feil ved tømming av ikon-cache.</span>"
 
-#~ msgid "seconds"
-#~ msgstr "sekunder"
-
 #~ msgid "mbox (etPan!)..."
 #~ msgstr "mbox (etPan!)..."
 
diff --git a/po/nl.po b/po/nl.po
index 496802a..37e8c16 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.14\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-02 18:16+0200\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-08-02 18:17+0200\n"
 "Last-Translator: Marcel Pol <marcel at timelord.nl>\n"
 "Language-Team: translators at lists.claws-mail.org\n"
@@ -92,7 +92,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 
 #: 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
@@ -105,7 +105,7 @@ msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 msgid "Name"
 msgstr "Naam"
 
-#: 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"
 
@@ -818,8 +818,8 @@ msgstr "Adresboeken"
 msgid "Person"
 msgstr "Persoon"
 
-#: 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 "Map"
 
@@ -959,18 +959,18 @@ msgstr "Adressen update"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Update mislukt. Wijzigingen niet opgeslagen naar map."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Bericht"
 
-#: 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 "Waarschuwing"
 
-#: 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 "Fout"
@@ -1003,43 +1003,43 @@ msgstr "LDAP-naam"
 msgid "Attribute Value"
 msgstr "Eigenschapwaarde"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Niets"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "een weergever"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "een MIME-verwerker"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "mappen"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "filteren"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "privacy-bescherming"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "een aankondiger"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "een utility"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "dingen"
 
-#: 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."
@@ -1047,24 +1047,24 @@ msgstr ""
 "Deze plugin levert ondersteuning voor %s (%s), dat reeds ondersteund wordt "
 "door de plugin %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Plugin is reeds geladen"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Geheugen reserveren voor plugin mislukt"
 
-#: 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 ""
 "Deze module heeft geen licentie die verenigbaar is met de GPL v3 of nieuwer."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Deze module is voor 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 "
@@ -1073,7 +1073,7 @@ msgstr ""
 "Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin '%s' "
 "gecompileerd is."
 
-#: 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."
@@ -1081,12 +1081,12 @@ msgstr ""
 "Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin "
 "gecompileerd is."
 
-#: 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 "Je versie van Claws Mail is te oud voor de '%s'-plugin."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Je versie van Claws Mail is te oud voor de plugin."
 
@@ -1256,212 +1256,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 "zondag"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "maandag"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "dinsdag"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "donderdag"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "vrijdag"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "zaterdag"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januari"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "maart"
 
-#: 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 "mei"
 
-#: 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 "augustus"
 
-#: 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 "zo"
 
-#: 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 "di"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "wo"
 
-#: 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 "vr"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "za"
 
-#: 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 "mei"
 
-#: 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 "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."
@@ -1475,7 +1475,7 @@ msgstr "_Toevoegen..."
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
@@ -1914,7 +1914,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Wil je doorgaan?"
 
-#: 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 "_Invoegen"
 
@@ -1969,7 +1969,7 @@ msgstr ""
 "Selecteer eerst een account."
 
 #: 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 "Verzenden"
 
@@ -1977,8 +1977,8 @@ msgstr "Verzenden"
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "De enige ontvanger is het standaard CC-adres. Toch verzenden?"
 
-#: 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 "_Verzenden"
@@ -2012,7 +2012,7 @@ msgstr "Toch in de wachtrij zetten?"
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: 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"
@@ -2022,7 +2022,7 @@ msgstr ""
 "\n"
 "Omzetten van de tekenset mislukt."
 
-#: 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"
@@ -2032,7 +2032,7 @@ msgstr ""
 "\n"
 "Kon de sleutel van de ontvanger, nodig voor versleutelen, niet vinden."
 
-#: 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"
@@ -2077,7 +2077,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2088,7 +2088,7 @@ msgstr ""
 "naar de opgegeven tekenset '%s'.\n"
 "Verzenden met tekenset %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2101,72 +2101,72 @@ msgstr ""
 "worden.\n"
 "Toch verzenden?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Decoderen van e-mail mislukt: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Versleutel-waarschuwing"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "Ga _door met bewerken"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Geen account beschikbaar voor het verzenden."
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Geselecteerd account is geen NNTP: Plaatsen is niet mogelijk."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bijvoegsel %s bestaat niet meer. Negeren?"
 
-#: 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 "Verzenden annuleren"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Negeer bijvoegsel"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Origineel %s gedeelte"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Toevoegen aan adres_boek"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Verwijder inhoud"
 
-#: 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 "Gebruik <tab> om adressen automatisch af te maken"
 
-#: 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 "Grootte"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Bericht bewaren in"
 
-#: 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
@@ -2177,23 +2177,23 @@ msgstr "Bericht bewaren in"
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "Hea_der"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Bijvoegsels"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "Anderen"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "_Onderwerp:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2202,19 +2202,19 @@ msgstr ""
 "Spellingcontrole kon niet gestart worden.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_Van:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Te gebruiken account voor dit bericht"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Een afzender-adres is verplicht."
 
-#: 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 "
@@ -2223,68 +2223,68 @@ msgstr ""
 "Het privacy-systeem '%s' kon niet worden geladen. Het zal niet mogelijk zijn "
 "om dit bericht te ondertekenen of te versleutelen."
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "G_een"
 
-#: 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 "Opmaakfout in berichttekst-sjabloon op regel %d."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Opmaakfout in Van-sjabloon."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Opmaakfout in Aan-sjabloon."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Opmaakfout in Cc-sjabloon."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Opmaakfout in Bcc-sjabloon."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Opmaakfout in Antwoord-Aan sjabloon."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Opmaakfout in Onderwerp-sjabloon."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME-type."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: 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 "Codering"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2295,16 +2295,16 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep 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 heeft netwerktoegang nodig voor het verzenden van deze e-mail."
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Kon bericht niet in de wachtrij zetten."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2315,15 +2315,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Kon klad niet opslaan."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Kon klad niet opslaan"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2331,24 +2331,24 @@ msgstr ""
 "Kon klad niet opslaan.\n"
 "Wil je deze e-mail annuleren of weggooien?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Annuleren"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Gooi e-mail weg"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Bestand '%s' kon niet gelezen worden."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2357,54 +2357,54 @@ msgstr ""
 "Bestand '%s' bevat ongeldige characters\n"
 "voor de huidige codering, invoeging kan onjuist zijn."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Gooi bericht weg"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Bericht is gewijzigd, veranderingen laten vervallen?"
 
-#: 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 "_Gooi weg"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "Opslaan als _klad"
 
-#: 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 "Veranderingen opslaan"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bericht is gewijzigd. Veranderingen opslaan?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Niet opslaan"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Wil je sjabloon '%s' toepassen?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: 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 "_Vervang"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "In- of Bijvoegen"
 
-#: 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?"
@@ -2412,16 +2412,16 @@ msgstr ""
 "Wil je de inhoud van de bestand(en) invoegen in de tekst van het bericht of "
 "bijvoegen bij het bericht als het verstuurd wordt?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Bijvoegen"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Opmaakfout in citaat op regel %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 +2640,7 @@ msgid " Check File "
 msgstr " Controleer bestand"
 
 #: 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 "Bestand"
@@ -2788,7 +2788,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"
 
@@ -2975,7 +2975,7 @@ msgstr ""
 "Het maximaal aantal ingangen dat moet worden teruggegeven in een "
 "zoekresultaat."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Algemeen"
 
@@ -3696,61 +3696,61 @@ msgstr "De map '%s' bestaat al."
 msgid "Can't create the folder '%s'."
 msgstr "Kan map '%s' niet aanmaken."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "_Alles gelezen"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Markeer alles gelezen, _recursief"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "_Verwerkingsregel draaien"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Map doorzoeken..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "_Verwerken..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Prullenbak leegmaken..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Verzend wacht_rij..."
 
-#: 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 "Nieuw"
 
-#: 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 "Ongelezen"
 
-#: 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 "Totaal"
 
 #. 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 "Mapinfo wordt ingesteld..."
 
-#: 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?"
@@ -3758,98 +3758,98 @@ msgstr ""
 "Wil je werkelijk alle berichten in deze map en zijn submappen als gelezen "
 "markeren?"
 
-#: 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 "Wil je werkelijk alle berichten in deze map als gelezen markeren?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Markeer alles als gelezen"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Map wordt ingelezen %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 "Map wordt ingelezen %s..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Vernieuw mappenboom"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "Mappenboom vernieuwen verwijdert lokale caches. Wil je doorgaan?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Mappenboom wordt opnieuw aangemaakt..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Mappenboom wordt ingelezen ..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kan map '%s' niet inlezen\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Map %s wordt gesloten..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Map %s wordt geopend..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Map kon niet worden geopend."
 
-#: 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 "Prullenbak leegmaken"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Alle berichten in de prullenbak weggooien?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Prullenbak legen"
 
-#: 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 waarschuwing"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Je bent momenteel niet online. Toch doorgaan?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Alle berichten uit de wachtrij verzenden?"
 
-#: 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 ""
 "Er is een fout opgetreden bij het verzenden van berichten in de wachtrij."
 
-#: 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"
@@ -3858,64 +3858,64 @@ msgstr ""
 "Er zijn fouten opgetreden bij het verzenden van berichten in de wachtrij:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Wil je werkelijk map '%s' kopiëren naar '%s'?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Wil je werkelijk van map '%s' een submap maken van '%s'?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Kopieer map"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Verplaats map"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Bezig %s te kopiëren naar %s ..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Bezig %s te verplaatsen naar %s ..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Bron en bestemming zijn hetzelfde."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan een map niet kopiëren naar één van z'n submappen."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Kan een map niet verplaatsen naar één van z'n submappen."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Kan een map niet naar een ander postvak verplaatsen."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Kopiëren mislukt."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Verplaatsen mislukt."
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Instellingen voor map '%s' wordt verwerkt"
 
-#: 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 "Doel-map kan alleen gebruikt worden om submappen op te slaan."
 
@@ -4257,63 +4257,63 @@ msgstr "_Opmerkingen bij deze uitgave"
 msgid "_Statistics"
 msgstr "_Statistieken"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Oranje"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Rood"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Roze"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Hemelsblauw"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Groen"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Bruin"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Grijs"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Lichtbruin"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Donkerrood"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Donkerroze"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Staalblauw"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Goud"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Heldergroen"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5051,7 +5051,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"
 
@@ -5093,9 +5093,9 @@ msgid "_Hide"
 msgstr "_Verberg"
 
 #: 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"
@@ -5803,8 +5803,8 @@ msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4-verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\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 heeft netwerktoegang nodig voor toegang tot de IMAP-server."
 
@@ -5845,85 +5845,85 @@ msgstr "Kan geen verbinding maken met de IMAP4-server: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan geen verbinding maken met de 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 TLS-sessie niet tot stand brengen.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kon niet inloggen op IMAP-server %s.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kon niet inloggen op IMAP-server %s."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Berichten worden toegevoegd..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Berichten worden gekopieerd..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "kan \"verwijderd\" vlaggen niet instellen\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Zoeken naar niet-geabonneerde mappen in %s..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Zoeken naar submappen van %s..."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "LIST mislukt: kan postvak niet aanmaken\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "kan postvak niet aanmaken\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan postvak niet hernoemen: %s naar %s\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "kan postvak niet verwijderen\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST mislukt\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Berichten afvlaggen..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Server vereist TLS om in te loggen.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan 'capabilities' niet verversen.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5932,20 +5932,20 @@ msgstr ""
 "Verbinden met %s mislukt: de server vereist TLS, maar Claws Mail is "
 "gecompileerd zonder TLS-ondersteuning.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Inloggen op servers staat uit.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Berichten worden opgehaald..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan \"verwijderd\" vlaggen: %d niet instellen\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"
@@ -7876,7 +7876,7 @@ msgstr "Mbox-bestand overschrijven"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Dit bestand bestaat reeds. Wil je het overschrijven?"
 
-#: 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 "Overschrijven"
@@ -7926,7 +7926,7 @@ msgstr "Zoeken voltooid"
 msgid "Compose _new message"
 msgstr "Nieuw bericht opstellen"
 
-#: 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 - Berichtenvenster"
 
@@ -7965,48 +7965,48 @@ msgstr ""
 "officieel aan je gericht.\n"
 "Je wordt afgeraden een onvangstbevestiging te versturen."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Ophalen van bericht (%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 "Decoderen mislukt: %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 ""
 "Bericht is niet conform de MIME-standaard. Het zou verkeerd weergegeven "
 "kunnen worden."
 
-#: 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 "Opslaan als"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Bestaand bestand overschrijven?"
 
-#: 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 "Kan bestand '%s' niet opslaan."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Geef alle %s weer."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Alleen de eersste megabyte tekst is weergegeven."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1950
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8014,19 +8014,19 @@ msgstr ""
 "Je kreeg een ontvangstbevestiging in dit bericht : het is gezien door de "
 "ontvanger."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Je hebt om een ontvangstbevestiging gevraagd voor dit bericht."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Dit bericht vraagt om een ontvangstbevestiging."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Ontvangstbevestiging versturen"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8034,7 +8034,7 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "en is verwijderd van de server."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8043,15 +8043,15 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Markeer voor ophalen"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Gemarkeerd om te verwijderen"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8060,12 +8060,12 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden opgehaald."
 
-#: 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 "Demarkeer"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8074,11 +8074,11 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden verwijderd."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Verstuur Ontvangstbevestiging"
 
-#: 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"
@@ -8089,19 +8089,19 @@ msgstr ""
 "gebruiken.\n"
 "Kies het account vanaf welke je de ontvangstbevestiging wilt versturen:"
 
-#: 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 "_Annuleren"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Stuur Bevestiging"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan niet afdrukken: het bericht bevat geen tekst."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8109,7 +8109,7 @@ msgstr ""
 "\n"
 " Er zijn geen berichten in deze map"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8117,7 +8117,7 @@ msgstr ""
 "\n"
 " Bericht is verwijderd"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8125,7 +8125,7 @@ msgstr ""
 "\n"
 "  Bericht is verplaatst naar de prullenbak of naar een andere map"
 
-#: 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 "Er is een fout opgetreden tijdens het leren.\n"
@@ -8360,34 +8360,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "kan groep '%s' niet selecteren\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 "kan groep niet instellen: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ongeldig artikelbereik: %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 "Kan xhdr niet ophalen\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d uit %s wordt opgehaald...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "Kan xover niet ophalen\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "ongeldige xover regel\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"
@@ -9344,7 +9344,7 @@ msgstr "Berichten groter dan dit zullen niet worden gecontroleerd"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "KB"
 
@@ -9917,7 +9917,7 @@ msgstr "De CSS in dit bestand wordt toegepast op alle HTML-delen"
 #: 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 "Bekijk"
@@ -10222,7 +10222,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-plugin: Starten van vernieuwing authorisatie\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 "Authenticatie"
 
@@ -10403,7 +10403,7 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Cache verversingsinterval"
 
-#: 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 "uur"
@@ -10784,7 +10784,7 @@ msgstr "Geef authenticatie op"
 #: 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 "Gebruikersnaam"
 
@@ -10792,18 +10792,18 @@ msgstr "Gebruikersnaam"
 #: 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 "Wachtwoord"
 
-#: 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 "Authenticatie-methode"
 
-#: 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"
 
@@ -11734,7 +11734,7 @@ msgstr ""
 "sessie opslaan"
 
 #: 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"
@@ -12358,8 +12358,8 @@ msgstr "Geef Python-console weer..."
 msgid "Refresh"
 msgstr "Verversen"
 
-#: 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 "Bekijk"
@@ -12687,7 +12687,7 @@ msgstr "Haal reacties op van berichten jonger dan"
 
 #: 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 "dagen"
 
@@ -13314,7 +13314,7 @@ msgid "Next month"
 msgstr "Volgende maand"
 
 #: 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"
 
@@ -13745,15 +13745,15 @@ msgstr "Deze week"
 msgid "Later"
 msgstr "Later"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Geaccepteerd: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Afgewezen: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Voorlopig Geaccepteerd: "
 
@@ -14201,12 +14201,12 @@ msgstr "er is een fout opgetreden in de POP3-sessie\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-opdracht wordt niet ondersteund\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"
 
@@ -14295,40 +14295,40 @@ msgstr "opdracht voor versturen berichten"
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Lokaal"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Standaard 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 "Ongefilterde berichten gaan in deze map"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Gebruik beveiligde authenticatie (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Verwijder reeds ontvangen berichten van de server"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Verwijder na"
 
-#: 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 dagen en 0 uur: verwijder meteen"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Limiet op grootte"
 
-#: 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."
@@ -14337,82 +14337,82 @@ msgstr ""
 "opgehaald. Als je zo'n bericht selecteert, kun je kiezen om het helemaal op "
 "te halen of te verwijderen."
 
-#: 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 "Maximum aantal artikelen dat zal worden opgehaald"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "ongelimiteerd als 0 is opgegeven"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Platte tekst"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "IMAP-servermap"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(gewoonlijk leeg)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Geef alleen geabonneerde mappen weer"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreedte-efficiente methode (vermijdt ophalen van tags)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Deze methode gebruikt minder bandbreedte, maar kan langzamer zijn met "
 "bepaalde servers."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filter de berichten bij het ophalen met behulp van plugins"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ophalen' haalt de e-mail voor dit account op"
 
-#: 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 "Header"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Stuur account-e-mailadres in Bericht-ID"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Voeg een header van de gebruikers-agent toe"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-authenticatie (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."
@@ -14420,179 +14420,179 @@ msgstr ""
 "Als je deze velden leeg laat, worden dezelfde\n"
 "gebruikersnaam en wachtwoord gebruikt als bij ontvangen."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Authenticatie met POP3 voor het verzenden"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Tijdslimiet voor POP-authenticatie: "
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Handtekening"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Voeg automatisch ondertekening in"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Scheidingsteken van handtekening"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Opdracht-uitvoer"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Automatisch volgende adressen instellen"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Woordenlijsten voor spellingcontrole"
 
-#: 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 "Standaard woordenlijst"
 
-#: 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 "Standaard alternatieve woordenlijst"
 
-#: 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 "Opstellen"
 
-#: 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 "Antwoord"
 
-#: 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 "Doorsturen"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Standaard privacy-systeem"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Berichten altijd ondertekenen"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Berichten altijd versleutelen"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 "Berichten altijd versleutelen bij het reageren op een ondertekend bericht"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Berichten altijd versleutelen bij het reageren op een versleuteld bericht"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Versleutel verzonden berichten behalve met de sleutel van de ontvanger ook "
 "met je eigen sleutel"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Sla verzonden versleutelde berichten onversleuteld op"
 
-#: 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 "Gebruik geen SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Gebruik SSL voor POP3-verbinding"
 
-#: 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 "Gebruik STARTTLS voor starten SSL-sessie"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Gebruik SSL voor IMAP4-verbinding"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Gebruik SSL voor NNTP-verbinding"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Gebruik geen SSL (maar, als het noodzakelijk is, gebruik STARTTLS)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Gebruik SSL voor SMTP-verbinding"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Client-certificaten"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Certificaat om te ontvangen"
 
-#: 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 "Client-certificaat-bestand als een PKCS12- of PEM-bestand"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Certificaat om te verzenden"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Geldige SSL-certificaten automatisch accepteren"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Gebruik niet-blokkerende SSL"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Zet dit uit als je problemen hebt met SSL-verbindingen"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP-poort"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "POP3-poort"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "IMAP4-poort"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "NNTP-poort"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Domeinnaam"
 
-#: 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."
@@ -14600,112 +14600,112 @@ msgstr ""
 "De domeinnaam wordt gebruikt in de aangemaakte Bericht-ID, en wanneer er "
 "wordt verbonden met SMTP-servers."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Gebruik opdracht om te communiceren met server"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markeer dubbel geplaatste berichten als gelezen en kleur:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Plaats verzonden berichten in"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Plaats berichten in wachtrij in"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Plaats kladberichten in"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Plaats verwijderde berichten in"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Je hebt geen accountnaam opgegeven."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Je hebt geen e-mailadres opgegeven."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "Je hebt geen SMTP-server opgegeven."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Je hebt geen gebruikers-ID opgegeven."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "Je hebt geen POP3-server opgegeven."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "De standaard Inbox-map bestaat niet."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "Je hebt geen IMAP4-server opgegeven."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "Je hebt geen NNTP-server opgegeven."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "Je hebt geen bestandsnaam voor het lokale postvak opgegeven."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "Je hebt geen mail-opdrachtregel opgegeven."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: 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 "Sjablonen"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - accountvoorkeuren"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Mislukt (verkeerd adres)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Selecteer bestand met handtekening"
 
-#: 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 "Selecteer certificaat-bestand"
 
-#: 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 (plugin niet geladen)"
@@ -14973,15 +14973,15 @@ msgstr "Huidige acties"
 msgid "Action string is not valid."
 msgstr "Actie-regel is niet geldig."
 
-#: 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 "Op %d\\n%f schreef:\\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"
@@ -14989,7 +14989,7 @@ msgstr ""
 "\\n\\nBegin doorgestuurd bericht:\\n\\n?d{Datum: %d\\n}?f{Van: %f\\n}?t{Aan: "
 "%t\\n}?c{Cc: %c\\n}?n{Nieuwsgroepen: %n\\n}?s{Onderwerp: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d6c14af..5298504 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.13.2git220\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-02 21:48-0300\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-08-03 23:13-0300\n"
 "Last-Translator: Frederico Goncalves Guimaraes <frederico at teia.bio.br>\n"
 "Language-Team: Frederico Goncalves Guimaraes <frederico at teia.bio.br>\n"
@@ -82,7 +82,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Receber mensagem' busca os e-mails das contas 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 "'Receber mensagem' busca os e-mails das contas marcadas"
 msgid "Name"
 msgstr "Nome"
 
-#: 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"
 
@@ -820,8 +820,8 @@ msgstr "Livros de Endereços"
 msgid "Person"
 msgstr "Pessoa"
 
-#: 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 "Pasta"
 
@@ -963,18 +963,18 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Não foi possível atualizar. As mudanças não foram escritas no diretório."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Nota"
 
-#: 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 "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 "Erro"
@@ -1007,67 +1007,67 @@ msgstr "Nome no LDAP"
 msgid "Attribute Value"
 msgstr "Atribuir valor"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Nenhum"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "um visualizador"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "um analisador MIME"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "pastas"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "filtragem"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "uma interface de privacidade"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "um notificador"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "um utilitário"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "coisas"
 
-#: 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 "Esse plugin fornece %s (%s), o qual já é fornecido pelo plugin %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "O plugin Já foi carregado"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Não foi possível alocar memória para o 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 ""
 "Esse módulo não está licenciado sob uma licença compatível com a GPL v3 ou "
 "posterior."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Esse módulo é para o 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 "
@@ -1076,7 +1076,7 @@ msgstr ""
 "A sua versão do Claws Mail é mais recente do que a utilizada para construir "
 "o plugin '%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."
@@ -1084,12 +1084,12 @@ msgstr ""
 "A sua versão do Claws Mail é mais recente do que a utilizada para construir "
 "o plugin."
 
-#: 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 "A sua versão do Claws Mail é muito antiga para o 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 "A sua versão do Claws Mail é muito antiga para o plugin."
 
@@ -1260,212 +1260,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 "Domingo"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: 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 "Janeiro"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Fevereiro"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Março"
 
-#: 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 "Maio"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junho"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julho"
 
-#: 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 "Setembro"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Outubro"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembro"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Dezembro"
 
-#: 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 "Seg"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ter"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Qua"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Qui"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Sex"
 
-#: 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 "Jan"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Fev"
 
-#: 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 "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 "Ago"
 
-#: 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 "Out"
 
-#: 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"
@@ -1479,7 +1479,7 @@ msgstr "_Adicionar..."
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
@@ -1922,7 +1922,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Tem certeza?"
 
-#: 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 "_Inserir"
 
@@ -1977,7 +1977,7 @@ msgstr ""
 "mensagem. Por favor, selecione uma conta 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"
 
@@ -1985,8 +1985,8 @@ msgstr "Enviar"
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cc padrão. Enviar mesmo assim?"
 
-#: 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"
@@ -2020,7 +2020,7 @@ msgstr "Mandar para a Fila de Saída mesmo assim?"
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: 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"
@@ -2030,7 +2030,7 @@ msgstr ""
 "\n"
 "Ocorreu um erro na conversão da codificação dos 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"
@@ -2040,7 +2040,7 @@ msgstr ""
 "\n"
 "Não foi possível obter a chave de criptografia do destinatário."
 
-#: 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"
@@ -2085,7 +2085,7 @@ msgstr ""
 "Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
 "tentar novamente."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2096,7 +2096,7 @@ msgstr ""
 "para a codificação %s especificada.\n"
 "Enviá-la como %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2109,73 +2109,73 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Não foi possível criptografar o e-mail: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Aviso de criptografia"
 
-#: 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 "Não existem contas para enviar a mensagem!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "A conta selecionada não é NNTP: é impossível enviar a mensagem."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "O anexo %s não existe mais. Devo 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 o envio"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ignorar o anexo"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Parte %s original"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Adicionar ao _Livro de Endereços"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Excluir o conteúdo da 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 ""
 "Use <tab> para completar automaticamente a partir do Livro de Endereços"
 
-#: 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 "Tamanho"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Salvar mensagem em "
 
-#: 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
@@ -2186,23 +2186,23 @@ msgstr "Salvar mensagem em "
 msgid "_Browse"
 msgstr "Nav_egar"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "_Cabeçalho"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "Ane_xos"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "_Outros"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "_Assunto:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2211,19 +2211,19 @@ msgstr ""
 "Não foi possível iniciar o verificador ortográfico.\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 "Conta a ser usada por esse e-mail"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Endereço do remetente a ser usado"
 
-#: 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 "
@@ -2232,68 +2232,68 @@ msgstr ""
 "Não foi possível carregar o sistema de privacidade '%s'. Você não poderá "
 "assinar ou criptografar essa mensagem."
 
-#: 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 "_Nenhum"
 
-#: 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 "O corpo do modelo possui um erro na linha %d."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Erro no formato do Remetente do modelo."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Erro no formato do Destinatário do modelo."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Erro no formato da Cc do modelo."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Erro no formato da Cco do modelo."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Erro no formato do Responder Para do modelo."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Erro no formato do assunto do modelo."
 
-#: 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 "O arquivo não existe ou está vazio."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Propriedades"
 
-#: 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 "Codificação"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2304,15 +2304,15 @@ msgstr ""
 "Deseja terminar o processo?\n"
 "Id do grupo do processo: %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 "O Claws Mail necessita de acesso à rede para enviar essa mensagem."
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2323,15 +2323,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Não foi possível salvar o rascunho"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2339,24 +2339,24 @@ msgstr ""
 "Não foi possível salvar o rascunho.\n"
 "Deseja cancelar a saída ou descartar essa mensagem?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Cancelar a saída"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Descartar a mensagem"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Selecione o arquivo"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2365,54 +2365,54 @@ msgstr ""
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Descartar a mensagem"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 
-#: 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 "Salvar em _Rascunhos"
 
-#: 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 "Salvar alterações"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Essa mensagem foi modificada. Deseja salvar as últimas alterações?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Não salvar"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Deseja aplicar o modelo '%s'?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Aplicar o modelo"
 
-#: 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 "_Substituir"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 
-#: 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?"
@@ -2420,16 +2420,16 @@ msgstr ""
 "Você deseja inserir o conteúdo do(s) arquivo(s) no corpo da mensagem ou "
 "anexá-lo ao e-mail?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Anexar"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erro no formato da citação, na linha %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 "
@@ -2646,7 +2646,7 @@ msgid " Check File "
 msgstr " Verificar o arquivo "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c: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 "Arquivo"
@@ -2796,7 +2796,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"
 
@@ -2983,7 +2983,7 @@ msgstr ""
 "O número máximo de entradas que devem ser apresentadas como resultado da "
 "pesquisa."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Básico"
 
@@ -3713,61 +3713,61 @@ msgstr "A pasta '%s' já existe."
 msgid "Can't create the folder '%s'."
 msgstr "Não foi possível criar a pasta '%s'."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Marcar _todas como lidas"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Marcar _recursivamente todas como lidas"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "E_xecutar regras de processamento"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Pesquisar na pasta..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "Proce_ssamento..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Esvaziar _Lixeira..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Enviar mensagens da _fila..."
 
-#: 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 "Nova"
 
-#: 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 "Não lida"
 
-#: 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 "Configurando as informações da pasta..."
 
-#: 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?"
@@ -3775,99 +3775,99 @@ msgstr ""
 "Deseja realmente marcar todas as mensagens dessa pasta e suas sub-pastas "
 "como lidas?"
 
-#: 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 "Deseja realmente marcar todas as mensagens dessa pasta como lidas?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Vasculhando a pasta %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 "Vasculhando a pasta %s..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Reconstruir a árvore de pastas"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "A reconstrução da árvore de pastas irá remover os caches locais. Deseja "
 "continuar?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a árvore de pastas..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Vasculhando a árvore de pastas..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Não foi possível vasculhar a pasta %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Verificando se há novas mensagens em todas as pastas..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fechando a pasta %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abrindo a pasta %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Não foi possível abrir a pasta."
 
-#: 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 "Esvaziar Lixeira"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Excluir todas as mensagens da Lixeira?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Esvaziar a Lixeira"
 
-#: 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 "Aviso de modo desconectado"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Você está trabalhando em modo desconectado. Redefinir?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Enviar mensagens da Fila de Saída"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Enviar todas as mensagens da Fila de Saída?"
 
-#: 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 "Ocorreram erros durante o envio das mensagens da Fila de Saída."
 
-#: 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,64 +3876,64 @@ msgstr ""
 "Ocorreram erros durante o envio de mensagens da Fila de Saída:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Deseja realmente copiar a pasta '%s' para '%s'?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Deseja realmente tornar a pasta '%s' uma sub-pasta de '%s'?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Copiar a pasta"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Mover a pasta"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s para %s..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movendo %s para %s..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "A pasta de origem e a de destino são a mesma."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Não é possível copiar a pasta para dentro dela mesma."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Não é possível mover a pasta para dentro dela mesma."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Não é possivel mover pastas entre caixas postais diferentes."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Não foi possível copiar!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Não foi possível mover!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuração de processamento da pasta %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 "A pasta de destino só pode ser usada para armazenar sub-pastas."
 
@@ -4276,63 +4276,63 @@ msgstr "_Notas do lançamento"
 msgid "_Statistics"
 msgstr "_Estatísticas"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Laranja"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Vermelho"
 
-#: 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 celeste"
 
-#: 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 "Marrom"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Cinza"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Marrom 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 "Vermelho escuro"
 
-#: 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 escuro"
 
-#: 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 metálico"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Dourado"
 
-#: 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 brilhante"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -5069,7 +5069,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"
 
@@ -5113,9 +5113,9 @@ msgid "_Hide"
 msgstr "_Esconder"
 
 #: 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"
@@ -5827,8 +5827,8 @@ msgstr "Erro na conexão com %s"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s foi interrompida. 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 ""
 "O Claws Mail necessita de acesso à rede para conectar-se ao servidor IMAP."
@@ -5869,85 +5869,85 @@ msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível conectar com o 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 "Não foi possível iniciar sessão TLS.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Não foi possível autenticar-se no servidor IMAP %s.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Não foi possível conectar-se ao servidor IMAP %s."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Procurando por pastas não assinadas em %s..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Procurando por sub-pastas de %s..."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não foi possível criar a caixa postal: falha no comando LIST\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não foi possível renomear a caixa postal: %s para %s\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Marcando as mensagens..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "O servidor depende do TLS para efetutar a autenticação.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as 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 "
@@ -5956,20 +5956,20 @@ msgstr ""
 "Ocorreu uma falha na conexão com %s: o servidor requer TLS, mas o Claws Mail "
 "foi compilado sem o suporte a TLS.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "não foi possível definir marcas de exclusão: %d\n"
 
-#: src/imap.c: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"
@@ -7908,7 +7908,7 @@ msgstr "Sobrescrever o arquivo mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "O arquivo já existe. Deseja sobrescrevê-lo?"
 
-#: src/mbox.c: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 "Sobrescrever"
@@ -7958,7 +7958,7 @@ msgstr "Pesquisa concluída"
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
-#: 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 - Visualização das mensagens"
 
@@ -7997,48 +7997,48 @@ msgstr ""
 "oficialmente endereçada à você.\n"
 "Não é aconselhável enviar a confirmação de recebimento."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Buscando a mensagem (%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 "Não foi possível descriptografar: %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 ""
 "A mensagem não está de acordo com o padrão MIME. Ela pode ser renderizada "
 "incorretamente."
 
-#: 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 "Salvar como"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Sobrescrever o arquivo 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 "Não foi possível salvar o arquivo '%s'."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Exibir todos os %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "É exibido somente o primeiro megabyte do 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."
@@ -8046,19 +8046,19 @@ msgstr ""
 "Você recebeu uma confirmação de recebimento nessa mensagem: ela foi exibida "
 "pelo recebedor."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Você solicitou uma confirmação de recebimento nessa mensagem."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "O remetente solicitou uma confirmação de recebimento."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Enviar a confirmação de recebimento"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8066,7 +8066,7 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente,\n"
 "e foi excluída no servidor."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8075,15 +8075,15 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente.;\n"
 "ela é %s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Marcar para receber"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Marcar para exclusão"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8092,12 +8092,12 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será baixada."
 
-#: 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 "Desmarcar"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8106,11 +8106,11 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será excluída."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Confirmação de recebimento"
 
-#: 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"
@@ -8122,19 +8122,19 @@ msgstr ""
 "Por favor, selecione qual a conta que você deseja utilizar para enviar a "
 "confirmação de recebimento:"
 
-#: 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 confirmação"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Não foi possível imprimir: a mensagem não contém texto."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8142,7 +8142,7 @@ msgstr ""
 "\n"
 "  Não existem mais mensagens nesta pasta"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8150,7 +8150,7 @@ msgstr ""
 "\n"
 "  A mensagem foi excluída"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8158,7 +8158,7 @@ msgstr ""
 "\n"
 "  A mensagem foi excluída ou movida para outra pasta"
 
-#: 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 "Ocorreu um erro durante a aprendizagem.\n"
@@ -8394,34 +8394,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "não foi possível selecionar o 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 "não foi possível definir o grupo: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervalo de artigos 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 "não foi possível obter xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtendo xover %d - %d em %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "não foi possível obter xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "linha 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"
@@ -9377,7 +9377,7 @@ msgstr "Mensagens maiores que isso não serão verificadas"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "Kb"
 
@@ -9948,7 +9948,7 @@ msgstr "O CSS desse arquivo será aplicado em todas as 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"
@@ -10257,7 +10257,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Plugin GData: Tentando atualizar a autorização\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Autenticação"
 
@@ -10444,7 +10444,7 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Intervalo de atualização do 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 "horas"
@@ -10827,7 +10827,7 @@ msgstr "Especificar a autenticação"
 #: 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 do usuário"
 
@@ -10835,18 +10835,18 @@ msgstr "ID do usuário"
 #: 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 "Senha"
 
-#: 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 autenticação"
 
-#: 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"
 
@@ -11785,7 +11785,7 @@ msgstr ""
 "Se for definida como '0', a senha será armazenada durante toda a sessão"
 
 #: 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 "minutos"
@@ -12414,8 +12414,8 @@ msgstr "Exibir o console Python..."
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: 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 "Navegar"
@@ -12749,7 +12749,7 @@ msgstr "Buscar comentários em publicações mais recentes que"
 
 #: 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 "dias"
 
@@ -13378,7 +13378,7 @@ msgid "Next month"
 msgstr "Próximo mês"
 
 #: 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"
 
@@ -13809,15 +13809,15 @@ msgstr "Essa semana"
 msgid "Later"
 msgstr "Mais tarde"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Aceito: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Recusado: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Aceito provisoriamente: "
 
@@ -14269,12 +14269,12 @@ msgstr "ocorreu um erro na sessão POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "Comando TOP não suportado\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"
 
@@ -14363,40 +14363,40 @@ msgstr "comando para enviar mensagens"
 msgid "Account%d"
 msgstr "Conta%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 "Caixa de Entrada padrão"
 
-#: 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 "Mensagens não filtradas serão armazenadas nessa pasta"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação de segurança (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Eliminar as mensagens do servidor após recebê-las"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Remover apó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 dia e 0 hora: excluir imediatamente"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Tamanho limite do recebimento"
 
-#: 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."
@@ -14404,82 +14404,82 @@ msgstr ""
 "Mensagens acima desse limite serão recebidas parcialmente. Ao selecioná-las, "
 "você poderá obtê-las por inteiro ou exclui-las."
 
-#: src/prefs_account.c: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 artigos a receber"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "ilimitado se for especificado 0"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Texto puro"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "Diretório do servidor IMAP"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(geralmente vazio)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Mostrar apenas pastas assinadas"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Módulo de eficiência de banda (impede a recuperação de etiquetas remotas)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Esse modo usa menos banda, mas pode ser mais lento com alguns servidores."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permite filtrar usando plugins, durante o recebimento"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 
-#: 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 "Cabeçalho"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Enviar o endereço de e-mail da conta na Message-ID"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Adicionar cabeçalho user agent"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho definido pelo usuário"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação 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."
@@ -14487,178 +14487,178 @@ msgstr ""
 "Deixe estes campos em branco, para utilizar os mesmos usuário e senha de "
 "recebimento."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar via POP3 antes de enviar"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Tempo de espera para autenticação POP: "
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Inserir a assinatura automaticamente"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Saída do comando"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Dicionários de checagem 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 "Dicionário padrão"
 
-#: 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 "Dicionário alternativo padrão"
 
-#: 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 "Escrever"
 
-#: 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 "Encaminhar"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Sistema de privacidade padrão"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Sempre assinar as mensagens"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Sempre criptografar as mensagens"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Sempre assinar as mensagens em resposta a mensagens assinadas"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Sempre criptografar as mensagens em resposta a mensagens criptografadas"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Criptografar as mensagens enviadas com sua própria chave além da dos "
 "destinatários"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvar mensagens criptografadas enviadas como texto simples"
 
-#: 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 "Não utilizar SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conexão 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 "Utilizar comando STARTTLS para iniciar sessão SSL"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizar SSL para conexão IMAP4"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Utilizar SSL para conexão 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 "Não use SSL (mas, se necessario, use STARTTLS)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Utilizar SSL para conexão SMTP"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Certificados do cliente"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Certificado para recebimento"
 
-#: 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 do cliente como um arquivo PKCS12 ou PEM"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Certificado para envio"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Aceitar certificados SSL válidos automaticamente"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL não bloqueador"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desligue essa opção caso você tenha problemas de conexão via SSL"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "Porta SMTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "Porta POP3"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "Porta NNTP"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: 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."
@@ -14666,112 +14666,112 @@ msgstr ""
 "O nome do domínio será utilizado na Message-ID gerada e durante a conexão "
 "com os servidores SMTP."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Utilizar comando para comunicar com o servidor"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar mensagens de cross-posting como lidas e com a cor:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Colocar as mensagens enviadas em"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Colocar as mensagens a serem enviadas em"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Colocar os rascunhos das mensagens em"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Colocar as mensagens excluídas em"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "O nome da conta não foi informado."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "O endereço de e-mail não foi informado."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "O servidor SMTP não foi informado."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "A ID do usuário não foi informada."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "O servidor POP3 não foi informado."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "A pasta padrão da Caixa de Entrada não existe."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "O servidor IMAP4 não foi informado."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "O servidor NNTP não foi informado."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "o nome do arquivo da caixa postal local não informado."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "o comando de e-mail não foi informado."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Receber"
 
-#: 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 "Modelos"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Preferências da nova conta"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferências da conta"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Falha (endereço errado)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Selecione o arquivo de assinatura"
 
-#: 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 "Selecione o arquivo do 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 (plugin não carregado)"
@@ -15030,15 +15030,15 @@ msgstr "Ações atuais"
 msgid "Action string is not valid."
 msgstr "A especificação da ação não é 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 "Olá,\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Em %d\\n%f escreveu:\\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"
@@ -15047,7 +15047,7 @@ msgstr ""
 "\\n}?t{Para: %t\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Assunto: %s\\n}\\n\\n"
 "%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
diff --git a/po/ru.po b/po/ru.po
index 901bd4a..6601a6d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,7 +14,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-02 15:31+0300\n"
 "Last-Translator: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
 "Language-Team: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
@@ -90,7 +90,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Получить Почту' проверяет письма в указанных учётных записях"
 
 #: 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
@@ -103,7 +103,7 @@ msgstr "'Получить Почту' проверяет письма в ука
 msgid "Name"
 msgstr "Имя"
 
-#: 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 "Протокол"
 
@@ -818,8 +818,8 @@ msgstr "Адресные Книги"
 msgid "Person"
 msgstr "Контакт"
 
-#: 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 "Папка"
 
@@ -960,18 +960,18 @@ msgstr "Обновить адрес(а)"
 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: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 "Предупреждение"
 
-#: 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 "Ошибка"
@@ -1004,67 +1004,67 @@ 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 "оповещение"
 
-#: 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:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Модуль уже загружен"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Ошибка выделения памяти для Модуля"
 
-#: 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 ""
 "Лицензия на модуль отличается от GPL v3 или более поздней совместимой "
 "лицензии."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Этот модуль для 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 "
@@ -1072,18 +1072,18 @@ msgid ""
 msgstr ""
 "Ваша версия Claws Mail новее, чем версия '%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."
 msgstr "Ваша версия Claws Mail новее, чем версия для которой собран модуль."
 
-#: 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 является очень старой для '%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 является очень старой для модуля."
 
@@ -1253,212 +1253,212 @@ msgstr "%d.%02dМБ"
 msgid "%.2fGB"
 msgstr "%.2fГБ"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4823
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Понедельник"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Среда"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Четверг"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Пятница"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Суббота"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Январь"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Февраль"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Март"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Апрель"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Май"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Июнь"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Июль"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Август"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Сентябрь"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Октябрь"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Ноябрь"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Декабрь"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Вс"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Пн"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Вт"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Ср"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Чт"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Пт"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Сб"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Янв"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Фев"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Мар"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Апр"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Май"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Июн"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Июл"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Авг"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Сен"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Окт"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Ноя"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Дек"
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "ДП"
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ПП"
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "дп"
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "пп"
@@ -1472,7 +1472,7 @@ msgstr "_Добавить..."
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Свойства..."
 
@@ -1910,7 +1910,7 @@ msgstr "Вы собираетесь вставить файл размером %
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
-#: 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 "_Вставить"
 
@@ -1965,7 +1965,7 @@ msgstr ""
 "Пожалуйста, выберите учётную запись перед отправкой."
 
 #: 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 "Отправить"
 
@@ -1973,8 +1973,8 @@ msgstr "Отправить"
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "По умолчанию задан только \"Копия\" (Cс) адрес. Всё равно отправить?"
 
-#: 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 "_Отправить"
@@ -2010,7 +2010,7 @@ msgstr "Всё равно поставить в очередь на отправ
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: 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 +2020,7 @@ msgstr ""
 "\n"
 "Ошибка преобразование кодировки."
 
-#: 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 +2030,7 @@ msgstr ""
 "\n"
 "Не удалось получить ключ шифрования."
 
-#: 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"
@@ -2075,7 +2075,7 @@ msgstr ""
 "Используйте кнопку \"Отправить сообщения из очереди\" из меню главного окна "
 "для повторной попытки."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2086,7 +2086,7 @@ msgstr ""
 "в определённую %s кодировку.\n"
 "Отправить как %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2099,73 +2099,73 @@ msgstr ""
 "\n"
 "Всё равно отправить?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Не удалось зашифровать письмо: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Предупреждение о кодировке"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "П_родолжить"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Отсутствует учётная запись для отправки почты!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Выбранная учётная запись не NNTP: Отправка невозможна."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 "Файл %s, который вы вложили в сообщение, больше не существует. Игнорировать?"
 
-#: 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 "Отменить отправку"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Игнорировать вложение"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Часть первоисточника %s"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Добавить в адресную _книгу"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Удалить содержимое записи"
 
-#: 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 "Использовать <Tab> для автозавершения из адресной книги"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "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 "Размер"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Сохранить Сообщение в "
 
-#: 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
@@ -2176,23 +2176,23 @@ 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"
@@ -2201,19 +2201,19 @@ msgstr ""
 "Не удалось запустить проверку орфографии.\n"
 "%s"
 
-#: 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 "
@@ -2222,68 +2222,68 @@ msgstr ""
 "Не удалось загрузить систему конфиденциальности '%s'. Вы не сможете "
 "подписать или зашифровать сообщение."
 
-#: 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 "Ошибка в теле шаблона, строка %d."
 
-#: 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 "Неверный тип MIME."
 
-#: 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 "MIME тип"
 
-#: 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"
@@ -2294,15 +2294,15 @@ msgstr ""
 "Завершить процесс принудительно?\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 "Claws Mail требуется доступ к сети для отправки письма."
 
-#: 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"
@@ -2313,15 +2313,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: 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?"
@@ -2329,24 +2329,24 @@ msgstr ""
 "Не удалось сохранить черновик.\n"
 "Отказаться от написанного сообщения?"
 
-#: 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 "Файл '%s' не может быть прочитан."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2355,54 +2355,54 @@ msgstr ""
 "Файл '%s' содержал неверные символы\n"
 "для текущей кодировки, вставка может быть неправильной."
 
-#: 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 "Вы хотите применить шаблон '%s' ?"
 
-#: 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?"
@@ -2410,16 +2410,16 @@ 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 "Неверный формат цитирования в строке %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 "
@@ -2637,7 +2637,7 @@ 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: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 "Файл"
@@ -2785,7 +2785,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"
 
@@ -2965,7 +2965,7 @@ msgid ""
 msgstr ""
 "Максимальное число записей, которые должны возвращаться в результат поиска."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Основные"
 
@@ -3688,61 +3688,61 @@ msgstr "Папка '%s' уже существует."
 msgid "Can't create the folder '%s'."
 msgstr "Невозможно создать папку '%s'."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Пометить все как п_рочтённые"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Рекурсивно пометить все как п_рочтённые"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "Зап_устить обработку"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "_Поиск в папке..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "Обрабо_тка..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Очистить _корзину..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Отправить _очередь..."
 
-#: 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 "Новые"
 
-#: 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 "Непрочтённые"
 
-#: 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 "Всего"
 
 #. 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 "Настройка информации папки..."
 
-#: 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?"
@@ -3750,97 +3750,97 @@ msgstr ""
 "Действительно пометить все сообщения данной папки и её подпапок как "
 "прочтённые?"
 
-#: 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 "Действительно пометить все сообщения данной папки как прочтённые?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Пометить все как прочтённые"
 
-#: 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/%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 "Сканирование папки %s..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Перестроить дерево папок"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "Перестройка дерева папок удалит локальные кэши. Продолжить?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Перестраивается дерево папок..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Сканирование дерева папок..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Не удалось просмотреть папку %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяется наличие новых сообщений во всех папках..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Закрытие папки %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Открывается папка %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Папка не может быть открыта."
 
-#: 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 "Очистить корзину"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Удалить все сообщения в корзине?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Очистить корзину"
 
-#: 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 "Автономная работа"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Вы работаете автономно. Подключиться?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Отправить сообщение(я) из очереди"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Отправить все сообщения из очереди?"
 
-#: 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 "Возникли ошибки при отправке сообщений из очереди."
 
-#: 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"
@@ -3849,64 +3849,64 @@ msgstr ""
 "Возникли ошибки при отправке сообщений из очереди:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Действительно копировать папку '%s' в '%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 "Вы действительно хотите сделать папку '%s' подпапкой '%s'?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Копировать папку"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Переместить папку"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Копирование %s в %s..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Перенос %s в %s..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Источник совпадает с приёмником."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Невозможно копировать папку в одну из её подпапок."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Невозможно переместить папку в одну из её подпапок."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Невозможно перемещение папок из одного почтового ящика в другой."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Произошла ошибка копирования!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Перенос не удался!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Параметры обработки для папки %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 "Папка назначения может содержать только другие папки."
 
@@ -4249,63 +4249,63 @@ msgstr "_О релизе"
 msgid "_Statistics"
 msgstr "_Статистика"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Оранжевый"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Красный"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Розовый"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Голубой"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Синий"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Зеленый"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Коричневый"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Зеленый"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Светлокоричневый"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Темнокрасный"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Темнорозовый"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Голубая сталь"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Золотой"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Светлозеленый"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Малиновый"
 
@@ -5040,7 +5040,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 "Модули"
 
@@ -5084,9 +5084,9 @@ msgid "_Hide"
 msgstr "_Скрыть"
 
 #: 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"
@@ -5795,8 +5795,8 @@ msgstr "Соединение с %s прошло неудачно"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 соединение с %s было разорвано. Повторное подключение...\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 необходимо сетевое подключение для доступа к серверу IMAP."
 
@@ -5836,85 +5836,85 @@ msgstr "Не удалось подключиться к IMAP4 серверу: %s
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не удалось подключиться к 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 "Не удалось начать TLS сессию.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Не удалось подключиться к серверу IMAP %s.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Не удалось подключиться к серверу IMAP %s."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Добавление сообщения..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Копирование сообщения..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "невозможно установить флаг удаления\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "невозможно стереть\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Поиск подписанных папок в %s..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ищутся подпапки %s..."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не удалось создать почтовый ящик: LIST завершился с ошибкой\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "не удалось создать почтовый ящик\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не удалось переименовать почтовый ящик: %s в %s\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "не удалось удалить почтовый ящик\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST завершился с ошибкой\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Помечаются сообщения..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Сервер требует TLS для входа в систему.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Не удалось обновить.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5923,20 +5923,20 @@ msgstr ""
 "Не удалось соединиться с %s: сервер требует TLS, но Claws Mail собран без "
 "поддержки TLS.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Сбой входа на сервер.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Получение сообщения..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "невозможно установить флаг удаления: %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"
@@ -7876,7 +7876,7 @@ msgstr "Перезаписать mbox файл"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Этот файл уже существует. Переписать его?"
 
-#: 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 "Перезаписать"
@@ -7926,7 +7926,7 @@ msgstr "Поиск завершён"
 msgid "Compose _new message"
 msgstr "Составить _новое сообщение"
 
-#: 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 - Просмотр Сообщения"
 
@@ -7965,66 +7965,66 @@ msgstr ""
 "официально адресовано вам.\n"
 "Автоматическое уведомление о получении сообщения не будет отослано."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Получение сообщения (%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 "Не удалось расшифровать: %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 ""
 "Сообщение не соответствует стандарту MIME. Оно может отображаться "
 "некорректно."
 
-#: 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 "Сохранить как"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Перезаписать существующий файл?"
 
-#: 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 "Не удалось сохранить файл '%s'."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Показать все %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Показан только первый мегабайт текста."
 
-#: 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 "Вы получили уведомление о прочтении этого сообщения получателем."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Вы запросили уведомление о прочтении этого сообщения получателем."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Это сообщение запрашивает отсылку уведомления о получении."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Послать уведомление"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8032,7 +8032,7 @@ msgstr ""
 "Это сообщение было получено частично\n"
 "и удалено с сервера."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8041,15 +8041,15 @@ msgstr ""
 "Это сообщение было получено частично;\n"
 "оно %s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Отметить для загрузки"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Отметить для удаления"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8058,12 +8058,12 @@ msgstr ""
 "Это сообщение было получено частично;\n"
 "оно %s и будет загружено."
 
-#: 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 "Снять метку"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8072,11 +8072,11 @@ msgstr ""
 "Это сообщение было получено частично;\n"
 "оно %s и будет удалено."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Возврат Уведомления о Получении"
 
-#: 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"
@@ -8088,19 +8088,19 @@ msgstr ""
 "Пожалуйста, выберите учётную запись, которую вы хотите использовать, для "
 "отправки уведомления о получении:"
 
-#: 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 "_Отменить"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Послать Уведомление"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Печать невозможна: сообщение не содержит текста."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8108,7 +8108,7 @@ msgstr ""
 "\n"
 "  Нет сообщений в этой папке"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8116,7 +8116,7 @@ msgstr ""
 "\n"
 "  Сообщение было удалено"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8124,7 +8124,7 @@ msgstr ""
 "\n"
 "  Сообщение было удалено или перемещено в другую папку"
 
-#: 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 "При обучении произошла ошибка.\n"
@@ -8356,34 +8356,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "не удалось выбрать группу: %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 "не удалось установить группу: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "неверный диапазон статьи: %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\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "получение xover %d - %d в %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "не удалось получить xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "неверная строка xover\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"
@@ -9330,7 +9330,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:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "КБ"
 
@@ -9898,7 +9898,7 @@ msgstr "CSS в этом файле будет применяться для вс
 #: 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 "Просмотр"
@@ -10203,7 +10203,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData модуль: Попытка обновить авторизацию\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Аутентификация"
 
@@ -10385,7 +10385,7 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Период обновления кэша"
 
-#: 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 "часов"
@@ -10765,7 +10765,7 @@ msgstr "Укажите аутентификацию"
 #: 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 "Пользователь"
 
@@ -10773,18 +10773,18 @@ msgstr "Пользователь"
 #: 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 "Пароль"
 
-#: 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 "Метод аутентификация"
 
-#: 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 "Автоматически"
 
@@ -11716,7 +11716,7 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Значение '0' будет сохранять парольную фразу в течение всей сессии"
 
 #: 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 "минут"
@@ -12340,8 +12340,8 @@ msgstr "Показать Python консоль..."
 msgid "Refresh"
 msgstr "Обновить"
 
-#: 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 "Просмотр"
@@ -12672,7 +12672,7 @@ msgstr "Получать комментарии для постов не ста
 
 #: 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 "дней"
 
@@ -13298,7 +13298,7 @@ msgid "Next month"
 msgstr "Следующий месяц"
 
 #: 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"
 
@@ -13729,15 +13729,15 @@ msgstr "На этой неделе"
 msgid "Later"
 msgstr "В будущем"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Принято:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Отклонено:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Ориентировочно Принято:"
 
@@ -14186,12 +14186,12 @@ msgstr "ошибка во время POP3 сессии\n"
 msgid "TOP command unsupported\n"
 msgstr "команда ТОР не поддерживается\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"
 
@@ -14280,40 +14280,40 @@ msgstr "команда для отправки почты"
 msgid "Account%d"
 msgstr "Учётная запись %d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Локальный узел"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "'Входящие' по умолчанию"
 
-#: 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 "Неотфильтрованные сообщения помещаются в эту папку"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Использовать безопасную аутентификацию (АРОР)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Удалять сообщения с сервера после получения"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Удалить по истечении"
 
-#: 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 дней 0 часов : удалять немедленно"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Ограничение размера получаемых сообщений"
 
-#: 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."
@@ -14321,83 +14321,83 @@ msgstr ""
 "Сообщения, превышающие данный лимит загружаются частично. При их выборе, "
 "возможно получить полное сообщение, либо удалить его."
 
-#: 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 "Максимальное количество статей для загрузки"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "неограниченно, если указан 0"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "каталог сервера IMAP"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(обычно пусто)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Показывать только подписанные папки"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Режим экономии трафика (не получать теги с сервера)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Этот режим использует меньше трафика, но может быть медленнее с некоторыми "
 "серверами."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Фильтровать сообщения при получении"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Использовать модули фильтрации при получении"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "'Получить почту' проверяет наличие новых сообщений данной учётной записи"
 
-#: 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 "Заголовок"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Генерировать идентификатор сообщения"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Включать почтовый адрес в идентификатор сообщения"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Добавить заголовок агента пользователя"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Добавить заданный заголовок"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "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."
@@ -14405,176 +14405,176 @@ msgstr ""
 "Пустое поле означает использовать имя пользователя и пароль те же, что и при "
 "получении."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Авторизация с POP3 перед отправкой"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Время ожидания авторизации POP: "
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "Автоматически вставлять подпись"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Отделять подпись"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Автоматически установить следующие адреса"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Словари проверки орфографии"
 
-#: 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 "Словарь по умолчанию"
 
-#: 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 "Альтернативный словарь по умолчанию"
 
-#: 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 "Составление"
 
-#: 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 "Ответить"
 
-#: 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 "Переслать"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Система конфиденциальности по умолчанию"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Всегда подписывать сообщения"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Всегда шифровать сообщения"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Всегда подписывать сообщение при ответе на подписанное сообщение"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Всегда шифровать сообщение при ответе на зашифрованное сообщение"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Шифровать отправленные сообщения своим ключом в дополнение к ключу получателя"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Сохранять отправленные зашифрованные сообщения как простой текст"
 
-#: 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 "Не использовать SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Использовать SSL для 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 "Использовать команду STARTTLS для начала SSL сессии"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Использовать SSL для IMAP4 соединения"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Использовать SSL для NNTP соединения"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Отправка (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Не использовать SSL (но при необходимости, использовать STARTTLS)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Использовать SSL для SMTP соединения"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Клиентские сертификаты"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Сертификат для получения"
 
-#: 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 "Клиентский сертификат в виде файла PKCS12 или PEM"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Сертификат для отправки"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Автоматически принимать действительный SSL сертификат"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Использовать неблокируемый SSL"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Отключите при обнаружении проблем с SSL соединением"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "порт SMTP"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "порт POP3"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "порт IMAP4"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "порт NNTP"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "имя домена"
 
-#: 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."
@@ -14582,112 +14582,112 @@ msgstr ""
 "Доменное имя будет использоваться в сгенерированном Message-ID, и при "
 "подключении к серверам SMTP."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Использовать команду для связи с сервером"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Пометить перекрёстные сообщения как прочтённые и цветом:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Поместить отправленные сообщения в"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Поместить исходящие сообщения в"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Поместить черновые сообщения в"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Поместить удалённые сообщения в"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Имя учётной записи не введено."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Почтовый адрес не введён."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "SMTP сервер не введён."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Имя пользователя не введено."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "POP3 сервер не введён."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Папка по умолчанию 'Входящие' не существует."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 сервер не введён."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "NNTP сервер не введён."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "имя файла локального ящика не введено."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "команда приёма почты не введена."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Получить"
 
-#: 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 "Шаблоны"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Дополнительные"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Параметры для новой учётной записи"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "Параметры учётной записи - %s"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Ошибка (неправильный адрес)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Выбрать файл подписи"
 
-#: 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 "Выбрать файл сертификата"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4285
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (модуль не загружен)"
@@ -14941,15 +14941,15 @@ msgstr "Текущие действия"
 msgid "Action string is not valid."
 msgstr "Строка действия задано неверно."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Здравствуйте,\\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 пишет:\\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"
@@ -14958,7 +14958,7 @@ msgstr ""
 "t{Кому: %t\\n}?c{Копия: %c\\n}?n{Группы новостей: %n\\n}?s{Тема: %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/sk.po b/po/sk.po
index 5c3da04..51ff08b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.13\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-02 11:23+0200\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
 "Language-Team: slovenčina <linux at slavino.sk>\n"
@@ -149,7 +149,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 
 #: src/account.c: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
@@ -162,7 +162,7 @@ msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 msgid "Name"
 msgstr "Meno"
 
-#: 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"
 
@@ -876,8 +876,8 @@ msgstr "Adresáre"
 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 "Zložka"
 
@@ -1017,18 +1017,18 @@ msgstr "Aktualizácia adries"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizácia zlyhala. Zmeny neboli zapísané do adresára."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: 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 "Upozornenie"
 
-#: 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"
@@ -1061,43 +1061,43 @@ msgstr "LDAP meno"
 msgid "Attribute Value"
 msgstr "Hodnota atribútu"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Nič"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "zobrazovač"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "analyzátor MIME"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "zložiek"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "filtrovania"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "rozhrania zabezpečenia súkromia"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "oznamovača"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "nástroje"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "inú"
 
-#: 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."
@@ -1105,25 +1105,25 @@ msgstr ""
 "Tento zásuvný modul poskytuje funkciu %s (%s), ktorá už je poskytovaná "
 "modulom %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Zásuvný modul už je načítaný"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Zlyhalo pridelenie pamäte pre zásuvný 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 nie je licencovaný pod licenciou kompatibilnou s GPL v3 alebo "
 "vyššou."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Tento modul je pre 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 "
@@ -1132,7 +1132,7 @@ msgstr ""
 "Vaša verzia Claws Mail je novšia ako verzia, pre ktorú bol zásuvný modul "
 "„%s” zostavený."
 
-#: 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."
@@ -1140,12 +1140,12 @@ msgstr ""
 "Vaša verzia Claws Mail je novšia ako verzia, pre ktorú bol tento zásuvný "
 "modul zostavený."
 
-#: 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ša verzia Claws Mail je pre zásuvný modul „%s” príliš stará."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Vaša verzia Claws Mail je pre tento zásuvný modul príliš stará."
 
@@ -1315,212 +1315,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 "Nedeľa"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondelok"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Streda"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Piatok"
 
-#: 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 "Január"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Február"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marec"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Apríl"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Jún"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Júl"
 
-#: 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 "Október"
 
-#: 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 "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 "Ut"
 
-#: 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 "Pi"
 
-#: 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 "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 "Máj"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jún"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Júl"
 
-#: 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 "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."
@@ -1534,7 +1534,7 @@ msgstr "_Pridať…"
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Vlastnosti…"
 
@@ -1972,7 +1972,7 @@ msgstr "Do tela správy vkladáte súbor %s. Ste si istý, že to chcete urobiť
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: src/compose.c: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žiť"
 
@@ -2027,7 +2027,7 @@ msgstr ""
 "Pred odosielaním prosím zvoľte poštový úč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 "Odoslať"
 
@@ -2035,8 +2035,8 @@ msgstr "Odoslať"
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Jediný príjemca je prednastavená adresa Kópie. Odoslať i tak?"
 
-#: 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 "_Odoslať"
@@ -2070,7 +2070,7 @@ msgstr "Zaradiť do fronty i tak?"
 msgid "Send later"
 msgstr "Odoslať ho neskôr"
 
-#: 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"
@@ -2080,7 +2080,7 @@ msgstr ""
 "\n"
 "Zlyhala konverzia kódovania."
 
-#: 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"
@@ -2090,7 +2090,7 @@ msgstr ""
 "\n"
 "Nie je dostupný šifrovací kľúč príjemcu."
 
-#: 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"
@@ -2133,7 +2133,7 @@ msgstr ""
 "%s\n"
 "Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2144,7 +2144,7 @@ msgstr ""
 "kódovania na %s.\n"
 "Odoslať správu v kódovaní %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2157,72 +2157,72 @@ msgstr ""
 "\n"
 "Odoslať aj tak?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Nemožno zašifrovať správu: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Upozornenie šifrovania"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "_Pokračovať"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadny účet na odosielanie správ!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Zvolený účet nie je NNTP: Posielanie nie je možné."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Príloha %s už neexistuje. Ignorovať?"
 
-#: 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šiť posielanie"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ignorovať prílohu"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Pôvodná časť %s"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Pridať do _adresára"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Zmazať obsah položiek"
 
-#: 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 "Na automatické doplnenie z adresára použite <TAB>"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "Typ 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 "Veľkosť"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Uložiť sprá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
@@ -2233,23 +2233,23 @@ msgstr "Uložiť správu do "
 msgid "_Browse"
 msgstr "_Prechádzať"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "H_lavička"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Prí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 "Pre_dmet:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2258,19 +2258,19 @@ msgstr ""
 "Nemožno spustiť kontrolu preklepov.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "O_d:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Účet, použitý pre tento email"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Adresa odosielateľa"
 
-#: 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 "
@@ -2279,68 +2279,68 @@ msgstr ""
 "Nemožno načítať systém súkromia „%s”. Nebude možné podpísať ani zašifrovať "
 "túto správu."
 
-#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8480 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "Žiad_na"
 
-#: 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 "Telo šablóny má chybu v riadku %d."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Chyba v tvare hlavičky odosielateľa v šablóne."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Chyba v tvare hlavičky príjemcu v šablóne."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Chyba v tvare hlavičky kópie v šablóne."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Chyba v tvare hlavičky slepej kópie v šablóne."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Chyba vo formáte šablóny Odpovedať."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Chyba vo formáte predmetu šablóny."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2351,15 +2351,15 @@ msgstr ""
 "Vynútiť ukončenie procesu?\n"
 "ID skupiny 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 potrebuje na odoslanie tejto správy pripojenie k sieti."
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Nemožno zaradiť správu do fronty na odoslanie."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2370,15 +2370,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Koncept nemožno uložiť."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Koncept nemožno uložiť"
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2386,24 +2386,24 @@ msgstr ""
 "Koncept nemožno uložiť.\n"
 "Chcete pokračovať v písaní, alebo zahodiť rozpísanú správu?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "+_Zrušiť skončenie"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Zahodiť správu"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Zvoľte súbor"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor „%s” nemožno čítať."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2412,54 +2412,54 @@ msgstr ""
 "Súbor „%s” obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Zahodiť správu"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
-#: 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 "_Zahodiť"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
-#: 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žiť zmeny"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Táto správa bola zmenená. Uložiť posledné zmeny?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Neukladať"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použiť šablónu „%s”?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: 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 "_Nahradiť"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
-#: 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?"
@@ -2467,16 +2467,16 @@ msgstr ""
 "Chcete vložiť obsah súboru do tela správy, alebo ho chcete pripojiť k správe "
 "ako prílohu?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_Pripojiť"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare citácie na riadku %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 "
@@ -2693,7 +2693,7 @@ msgid " Check File "
 msgstr "Skontrolovať súbor"
 
 #: 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 "Súbor"
@@ -2843,7 +2843,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"
 
@@ -3020,7 +3020,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Najväčší počet vrátených výsledkov vyhľadávania."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Základné"
 
@@ -3735,61 +3735,61 @@ msgstr "Zložka „%s” už existuje."
 msgid "Can't create the folder '%s'."
 msgstr "Nemožno vytvoriť zložku „%s”."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Označiť _všetky ako prečítané"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Označiť _všetky ako prečítané rekurzívne"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "Sp_ustiť pravidlá spracovania"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "Pre_hľadať zložku…"
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "Spracovan_ie…"
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "V_yprázdniť kôš…"
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Odoslať _front…"
 
-#: 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 "Neprečítané"
 
-#: 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 "Celkom"
 
 #. 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 "Nastavujem informácie zložky…"
 
-#: 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?"
@@ -3797,99 +3797,99 @@ msgstr ""
 "Naozaj chcete označiť všetky správy tejto zložky a jej podzložiek ako "
 "prečítané?"
 
-#: 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 "Naozaj chcete označiť všetky správy tejto zložky ako prečítané?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Označiť všetky ako prečítané"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prehľadávanie zložky %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 "Prehľadávanie zložky %s…"
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom zložiek"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnovenie stromu zložiek spôsobí vymazanie lokálnych vyrovnávacích pamätí. "
 "Chcete pokračovať?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom zložiek…"
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Skenujem strom zložiek…"
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nemožno skenovať obsah zložky %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové správy vo všetkých zložkách…"
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zatváram zložku %s…"
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otváram zložku %s…"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Zložku nemožno otvoriť."
 
-#: 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ázdniť kôš"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Vymazať všetky správy z koša?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Vyprázdniť kôš"
 
-#: 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 "Varovanie odpojenia"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Pracujete odpojený. Pripojiť?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Odoslať správy vo fronte"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Odoslať všetky správy vo fronte?"
 
-#: 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 "Pri odosielaní správ vo fronte nastali chyby."
 
-#: 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"
@@ -3898,64 +3898,64 @@ msgstr ""
 "Pri odosielaní správ vo fronte nastali chyby:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Naozaj chcete kopírovať zložku „%s” do „%s”?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Naozaj chcete presunúť zložku „%s” ako podzložku „%s”?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Kopírovať zložku"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Presunúť zložku"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopírujem %s do %s…"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Presúvam %s do %s…"
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Zdroj je identický s cieľom."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Nie je možné skopírovať zložku do jeho potomka."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Nie je možné presunúť zložku do jeho potomka."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Zložky nemožno presúvať medzi rôznymi schránkami."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Kopírovanie zlyhalo!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Presun zlyhal!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Nastavenie spracovania zložky %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 "Zvolená cieľová zložka môže obsahovať len podzložky."
 
@@ -4294,63 +4294,63 @@ msgstr "_Poznámky k verzii"
 msgid "_Statistics"
 msgstr "Štati_stiky"
 
-#: 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 "Ruž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 "Svetlomodrá"
 
-#: 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 "Hnedá"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Sivá"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Svetlohnedá"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Tmavoč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 "Tmavoruž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 "Oceľovomodrá"
 
-#: 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 "Svetlozelená"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -5084,7 +5084,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"
 
@@ -5128,9 +5128,9 @@ msgid "_Hide"
 msgstr "_Skryť"
 
 #: 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"
@@ -5836,8 +5836,8 @@ msgstr "Spojenie k %s zlyhalo"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s bolo prerušené. Obnovujem…\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 "Na prístup k serveru IMAP potrebuje Claws Mail pripojenie k sieti."
 
@@ -5878,85 +5878,85 @@ msgstr "Nepodarilo sa pripojiť k serveru IMAP4: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru 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 "Nemožno vytvoriť TLS spojenie.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Pridávam správy…"
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopírujem správy…"
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "nemožno nastaviť príznak zmazania\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "nemožno odstrániť\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Hľadám neodoberané zložky v %s…"
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hľadám podzložky %s…"
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nemožno vytvoriť schránku: príkaz LIST zlyhal\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "nemožno vytvoriť schránku\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nemožno premenovať schránku: %s na %s\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "nemožno odstrániť schránku \n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST zlyhal\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Označujem správy…"
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nemožno vybrať zložku: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Server na prihlásenie vyžaduje TLS.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo  sa obnoviť možnosti servera.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5965,20 +5965,20 @@ msgstr ""
 "Pripojenie k %s zlyhalo: server vyžaduje TLS, ale Claws Mail bol zostavený "
 "bez podpory TLS.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Sťahujem správu…"
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nemožno nastaviť príznaky zmazania: %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 "Prepísať súbor mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento súbor už existuje. Chcete ho prepísať?"
 
-#: src/mbox.c: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 "Prepísať"
@@ -7966,7 +7966,7 @@ msgstr "Hľadanie dokončené"
 msgid "Compose _new message"
 msgstr "Napísať _novú sprá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 - Zobrazenie správy"
 
@@ -8005,64 +8005,64 @@ msgstr ""
 "oficiálne adresovaná vám.\n"
 "Neodporúčame toto potvrdenie odoslať."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Sťahovanie sprá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 "Nemožno dešifrovať: %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 "Správa nezodpovedá štandardu MIME. Môže byť zle zobrazená."
 
-#: 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žiť ako"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Prepísať existujúci súbor?"
 
-#: 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 "Nemožno uložiť súbor „%s”."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Zobraziť všetky %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Zobrazený je len prvý megabajt 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 "Dostali ste potvrdenie tejto správy: správa bola zobrazená príjemcom."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Vyžiadali ste si potvrdenie o prijatí tejto správy."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Táto správa chce aby ste odoslali potvrdenie o prijatí."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Odoslať potvrdenie"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8070,7 +8070,7 @@ msgstr ""
 "Táto správa bola čiastočne prijatá,\n"
 "a bola zmazaná zo servera."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8079,15 +8079,15 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\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čiť na stiahnutie"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Označiť na odstránenie"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8096,12 +8096,12 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s a bude stiahnutá."
 
-#: 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 "Odznačiť"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8110,11 +8110,11 @@ msgstr ""
 "Táto správa vola čiastočne prijatá;\n"
 "je %s a bude zmazaná."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Potvrdenie o príjme"
 
-#: 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"
@@ -8124,19 +8124,19 @@ msgstr ""
 "Viac ako jeden účet používa adresu, na ktorú bola táto správa odoslaná.\n"
 "Prosím vyberte účet, ktorý chcete použiť na odoslanie potvrdenia o príjme:"
 
-#: 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šiť"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "Odo_slať potvrdenie"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nemožno tlačiť: správa neobsahuje text."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8144,7 +8144,7 @@ msgstr ""
 "\n"
 "  V tejto zložke nie sú správy"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8152,7 +8152,7 @@ msgstr ""
 "\n"
 "  Správa bola odstránená"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8160,7 +8160,7 @@ msgstr ""
 "\n"
 "  Správa bola odstránená alebo presunutá do inej zlož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 "Nastala chyba pri učení.\n"
@@ -8391,34 +8391,34 @@ msgstr "Claws Mail potrebuje na prístup k serveru News pripojenie k sieti."
 msgid "couldn't select group: %s\n"
 msgstr "nemožno zvoliť 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 "nemožno nastaviť skupinu: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah článkov: %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 "nemožno získať xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "prijímam xover %d - %d v %s…\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "nemožno získať xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "neplatný xover riadok\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"
@@ -9367,7 +9367,7 @@ msgstr "Správy väčšie ako táto hodnota nebudú kontrolované"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "kB"
 
@@ -9937,7 +9937,7 @@ msgstr "CSS v tomto súbore bude použité na všetky časti 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 "P_rehliadať"
@@ -10242,7 +10242,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Zásuvný modul GData: Pokus o obnovenie autorizácie\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Autentifikácia"
 
@@ -10422,7 +10422,7 @@ msgstr "Uchováva ikony na disku namiesto vytvárania ďalšej sieťovej požiad
 msgid "Cache refresh interval"
 msgstr "Interval aktualizácie vyrovnávacej pamäte"
 
-#: 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 "hodín"
@@ -10801,7 +10801,7 @@ msgstr "Zadať autentifikáciu"
 #: 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 "Prihlasovacie meno"
 
@@ -10809,18 +10809,18 @@ msgstr "Prihlasovacie meno"
 #: 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 "Metóda autentifikácie"
 
-#: 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 "Automatické"
 
@@ -11764,7 +11764,7 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavenie na „0” (nula) bude uchovávať heslo počas celej relácie"
 
 #: src/plugins/pgpcore/prefs_gpg.c: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 "minút"
@@ -12383,8 +12383,8 @@ msgstr "Zobraziť konzolu Python…"
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: 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 "Prechádzať"
@@ -12711,7 +12711,7 @@ msgstr "Sťahovať komentáre príspevkov novšie ako"
 
 #: 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 "dní"
 
@@ -13332,7 +13332,7 @@ msgid "Next month"
 msgstr "Ďalší mesiac"
 
 #: 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"
 
@@ -13762,15 +13762,15 @@ msgstr "Tento týždeň"
 msgid "Later"
 msgstr "Neskôr"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Prijaté:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Odmietnuté:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Nezáväzne prijaté:"
 
@@ -14221,12 +14221,12 @@ msgstr "nastala chyba relácie POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "príkaz TOP nie je podporovaný\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"
 
@@ -14315,40 +14315,40 @@ msgstr "príkaz na odosielanie pošty"
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Lokálne"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Predvolený 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é správy budú umiestnené v tejto zložke"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Použiť bezpečnú autentifikáciu (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na servere po ich prijatí"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Vymazať 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 hodín: mazať ihneď"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Prijať správu veľkú najviac"
 
-#: 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."
@@ -14356,82 +14356,82 @@ msgstr ""
 "Správy väčšie ako táto hodnota budú stiahnuté čiastočne. Po ich zvolení ich "
 "bude možné buď stiahnuť úplne, alebo ich odstrániť."
 
-#: src/prefs_account.c: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álny počet príspevkov na stiahnutie"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "neobmedzené, ak je zadané 0"
 
-#: 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 "Zložka servera IMAP"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(zväčša prázdne)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Na šírku pásma efektívny režim (bráni prijímaniu vzdialených značiek)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "V tomto režime je prenášaných menej dát, ale komunikácia s niektorými "
 "servermi môže byť pomalšia."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtrovať správy pri prijatí aj pomocou zásuvných modulov"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "„Prijať poštu” kontroluje nové správy v tomto účte"
 
-#: src/prefs_account.c: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 "Hlavička"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Generovať hlavičku Message-ID"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Poslať emailovú adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Pridať hlavičku „user agent”"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Pridať používateľom definované hlavičky"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentifikácia 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."
@@ -14439,175 +14439,175 @@ msgstr ""
 "Ak necháte tieto polia prázdne, bude použité to isté prihlasovacie meno a "
 "heslo ako pri prijímaní."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentifikovať cez POP3 pred odosielaním"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "Časový limit autentifikácie POP: "
 
-#: 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žiť podpis"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Slovníky kontroly preklepov"
 
-#: 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 "Predvolený 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 "Prednastavený alternatívny 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 "Nová"
 
-#: 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 "Odpovedať"
 
-#: 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 "Poslať ďalej"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Predvolený systém súkromia"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Vždy podpisovať správy"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Vždy šifrovať správy"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Vždy podpísať správy pri odpovedi na podpísanú správu"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Vždy šifrovať odpoveď na šifrovanú správu"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Zašifrovať odoslané správy aj vlastným kľúčom"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť odoslané zašifrované správy ako prostý 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žívať SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre spojenie 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 "Použiť príkaz STARTTLS na nadviazanie relácie SSL"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívať SSL (v prípade potreby použiť STARTTLS)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Certifikáty klienta"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Certifikát na prijímanie"
 
-#: 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 "Súbor klientského certifikátu ako súbor PKCS12 alebo PEM"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Certifikát na odosielanie"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Automaticky akceptovať platné certifikáty SSL"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Použiť neblokujúce SSL"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Vypnite túto voľbu ak máte problémy pri SSL spojeniach"
 
-#: 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ázov 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."
@@ -14615,112 +14615,112 @@ msgstr ""
 "Názov domény bude použitý na generovanie Message-ID, a pri pripájaní k "
 "serverom SMTP."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz na komunikáciu so serverom"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Označiť správy posielané ďalej ako prečítané a zafarbiť:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Uložiť správy do fronty"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov účtu."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná emailová adresa."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Nebolo zadané ID používateľa."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "Nebol zadaný POP3 server."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Predvolená zložka doručených správ neexistuje."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "Nebol zadaný IMAP4 server."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "Nebol zadaný názov lokálnej schránky."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "Nebol zadaný príkaz na odosielanie pošty."
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Prijať"
 
-#: 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 "Šablóny"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Nastavenie nového účtu"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s – Nastavenie účtu"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Zlyhalo (zlá adresa)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Vyberte súbor so podpisom"
 
-#: 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 "Zvoľte súbor certifikátu"
 
-#: 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 (zásuvný modul nie je načítaný)"
@@ -14976,15 +14976,15 @@ msgstr "Aktuálne akcie"
 msgid "Action string is not valid."
 msgstr "Reťazec akcie je neplatný."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Dobrý deň,\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Dňa %d\\n%f napísal:\\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"
@@ -14993,7 +14993,7 @@ msgstr ""
 "t{Komu: %t\\n}?c{Cc: %c\\n}?n{Diskusné skupiny: %n\\n}?s{Predmet: %s\\n}\\n"
 "\\n%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
diff --git a/po/sv.po b/po/sv.po
index 94e4be2..7177d6b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,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-02 12:49+0100\n"
 "Last-Translator: Andreas Rönnquist <gusnan at openmailbox.org>\n"
 "Language-Team: Swedish\n"
@@ -84,7 +84,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hämta e-post' hämtar e-post från valda e-postkonton"
 
 #: src/account.c: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 "'Hämta e-post' hämtar e-post från valda e-postkonton"
 msgid "Name"
 msgstr "Namn"
 
-#: 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"
 
@@ -812,8 +812,8 @@ msgstr "Adressböcker"
 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 "Mapp"
 
@@ -953,19 +953,18 @@ msgstr "Adress(er) uppdaterade"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Uppdatering misslyckades. Ändringar inte skrivna till Katalogen."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Meddelande"
 
-#: 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 "Varning"
 
-#: 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 "Fel"
@@ -998,43 +997,43 @@ msgstr "LDAP Namn"
 msgid "Attribute Value"
 msgstr "Attributvärde"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Inget"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "en visare"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "en MIME-tolkare"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "mappar"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "filtrerar"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "ett sekretessgränssnitt"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "en notifierare"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "ett verktyg"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:77
 msgid "things"
 msgstr "Gör ingenting"
 
-#: 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."
@@ -1042,25 +1041,25 @@ msgstr ""
 "Denna insticksmodul tillhandahåller %s (%s), som redan tillhandahålls av "
 "insticksmodulen %s."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Insticksmodulen är redan laddad"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Kunde inte allokera minne till insticksmodul"
 
-#: 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 ""
 "Denna modul är inte licensierad under en licens som är kompatibel med GPL v3 "
 "eller senare."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Denna modul är 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 "
@@ -1069,7 +1068,7 @@ msgstr ""
 "Din version av Claws Mail är nyare än den version som '%s' insticksmodulen "
 "byggdes med. "
 
-#: 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."
@@ -1077,12 +1076,12 @@ msgstr ""
 "Din version av Claws Mail är nyare än den version som insticksmodulen "
 "byggdes 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 "Din version av Claws Mail är för gammal för '%s' insticksmodulen."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Din version av Claws Mail är för gammal för insticksmodulen."
 
@@ -1252,212 +1251,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 "måndag"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: 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 "januari"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: 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 "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 "augusti"
 
-#: 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 "mån"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "tis"
 
-#: 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"
@@ -1471,7 +1470,7 @@ msgstr "_Lägg till..."
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
@@ -1910,7 +1909,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: 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 "_Infoga"
 
@@ -1965,7 +1964,7 @@ msgstr ""
 "Var god välj ett e-postkonto innan du skickar."
 
 #: 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 "Skicka"
 
@@ -1973,8 +1972,8 @@ msgstr "Skicka"
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Den enda mottagaren är standard kopie-adressen. Skicka ändå?"
 
-#: 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 "_Skicka"
@@ -2008,7 +2007,7 @@ msgstr "Köa det ändå?"
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: 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"
@@ -2018,7 +2017,7 @@ msgstr ""
 "\n"
 "Fel vid omvandling av teckenuppsättning."
 
-#: 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"
@@ -2028,7 +2027,7 @@ msgstr ""
 "\n"
 "Kunde inte få tag i mottagarens krypteringsnyckel."
 
-#: 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"
@@ -2071,7 +2070,7 @@ msgstr ""
 "%s\n"
 "Använd \"Sänd köade meddelande\" från huvudfönstret för att försöka igen."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2082,7 +2081,7 @@ msgstr ""
 "till den specificerade %s kodningen.\n"
 "Skicka som det %s?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2095,73 +2094,72 @@ msgstr ""
 "\n"
 "Skicka ändå?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Kunde inte dekryptera e-posten: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Varning om kryptering"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "F_ortsätt"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "Det finns inget konto för att skicka e-post tillgängligt!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Valt konto är inte NNTP: Omöjligt att skicka."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bilagan %s existerar inte längre. Ignorera?"
 
-#: 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 "Avbryt sändning"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Ignorera bilaga"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Ursprunglig %s del"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Lägg till i adress_boken"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Ta bort innehållet i inmatningsfältet"
 
-#: 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 "Använd <tabb> för automatisk ifyllning från adressbok"
 
-#: 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 "Storlek"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "Spara meddelande 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
@@ -2172,23 +2170,23 @@ msgstr "Spara meddelande i "
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "Brevhuvud"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "Bilagor"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "Öv_rigt"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "Ämne:"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2197,19 +2195,19 @@ msgstr ""
 "Felstavningsprogram kunde inte starta.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_Från:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Konto att använda för denna e-post"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Avsändaradress att användas"
 
-#: 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 +2216,68 @@ msgstr ""
 "Sekretesssystemet '%s' kan inte laddas. Du kommer inte att kunna signera "
 "eller kryptera detta meddelande."
 
-#: 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 "Mallens meddelandetext har ett fel på rad %d."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Fel i Från-mallformat."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Fel i Till-mallformat."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Fel i Kopia-mallformat."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Fel i Blindkopia-mallformat."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Fel i malformat för Svara-Till."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Fel i Ärende-mallformat."
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Felaktig MIME-typ"
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: 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 "Kodning"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2290,17 +2288,17 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-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 vara uppkopplad mot ett nätverk för att kunna skicka "
 "denna e-post."
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "Kunde inte köa meddelandet."
 
-#: 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 "Kunde inte spara utkast."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Kunde inte spara utkast."
 
-#: 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 ""
 "Kunde inte spara utkast.\n"
 "Vill du avbryta avsluta eller kasta denna e-post?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "_Avbryt avslutande"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "_Överge e-post"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunde inte läsas."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2353,54 +2351,54 @@ msgstr ""
 "Filen '%s' innehåller ogiltiga tecken\n"
 "för den aktuella teckenkodningen, inmatning kan bli fel."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "Överge meddelande"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Detta meddelande har ändrats. Vill du överge det?"
 
-#: 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 "_Överge"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "_Spara till Utkast"
 
-#: 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 "Spara ändringar"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Detta meddelande har ändrats. Vill du spara de senaste ändringarna?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Spara inte"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vill du använda mallen '%s' ?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: 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 "_Ersätt"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Infoga eller bifoga"
 
-#: 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 ""
 "Vill du infoga innehållet i filen(-erna) i meddelandetexten, eller bifoga "
 "det till meddelandet?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Citatformatfel på rad %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 " Undersök 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"
@@ -2782,7 +2780,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"
 
@@ -2954,7 +2952,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Maximalt antal poster som ska returneras i sökresultatet."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Grundläggande"
 
@@ -3647,10 +3645,10 @@ msgstr "Välj mapp"
 msgid "NewFolder"
 msgstr "Nymapp"
 
-#: 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."
@@ -3671,61 +3669,61 @@ msgstr "Mappen '%s' finns redan."
 msgid "Can't create the folder '%s'."
 msgstr "Kan inte skapa mappen '%s'."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "_Markera alla som lästa"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Markera alla som lästa 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ök i mapp..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "Behandla..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "T_öm papperskorg..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "Skicka köade..."
 
-#: 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 "Ny(a)"
 
-#: 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 "Oläst(a)"
 
-#: 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 "Ställer in mappinfo..."
 
-#: 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?"
@@ -3733,99 +3731,99 @@ msgstr ""
 "Vill du verkligen markera all e-post i denna mapp och dess undermappar som "
 "lästa?"
 
-#: 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 "Vill du verkligen markera alla meddelanden i denna mapp som lästa?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Markera alla som lästa"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Avsöker mapp %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 "Avsöker mapp %s...."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mapplista"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Den lokala bufferten kommer att tas bort om du uppdaterar mapplistan. Vill "
 "du fortsätta?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mapplistan..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Söker igenom mapplistan..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kunde inte genomsöka mapp %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelande i alla mappar..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Stänger mapp %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öppnar mapp %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Mappen kunde inte öppnas."
 
-#: 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 papperskorg"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Ta bort alla meddelande från papperskorgen?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "_Töm papperskorg"
 
-#: 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 "Varning om frånkopplat läge"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Du arbetar frånkopplad. Åsidosätta?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Skicka köade meddelanden"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Skicka alla köade meddelanden?"
 
-#: 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 "Några fel uppstod vid avsändande av meddelanden i kö."
 
-#: 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"
@@ -3834,64 +3832,64 @@ msgstr ""
 "Några fel uppstod vid skickande av köade meddelanden:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Vill du verkligen kopiera mappen '%s' i '%s'?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Vill du verkligen göra mappen '%s' till en undermapp till '%s' ?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Kopiera mapp"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Flytta mapp"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiera %s till %s..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Flyttar %s till %s..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Källa och destination är de samma."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan inte kopiera en mapp till ett av dess barn."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Kan inte flytta en mapp till ett av dess barn."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "En mapp kan inte flyttas mellan olika brevlådor."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Kopiering misslyckades!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Flytt misslyckades!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Behandlar konfiguration för mappen %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 "Destinationsmappen kan bara användas till att spara undermappar."
 
@@ -4235,63 +4233,63 @@ msgstr "Ve_rsionsinformation"
 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 "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 "Himmelsblå"
 
-#: 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 "Ljusbrun"
 
-#: 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örkrö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örkrosa"
 
-#: 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 "Guld"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Ljusgrö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"
 
@@ -5028,7 +5026,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 "Insticksmoduler"
 
@@ -5070,9 +5068,9 @@ msgid "_Hide"
 msgstr "_Dölj"
 
 #: 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"
@@ -5779,8 +5777,8 @@ msgstr "Anslutning till %s misslyckades"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-anslutning till %s har blivit nedkopplad. Ansluter 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 vara uppkopplad mot ett nätverk för att kunna kontakta "
@@ -5823,85 +5821,85 @@ msgstr "Kan inte ansluta till IMAP4-server: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan inte ansluta till 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 inte starta TLS session.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunde inte logga in på IMAP4-server %s.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunde inte logga in på IMAP-server %s."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "Lägger till meddelanden..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "Kopierar meddelanden..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "kan inte sätta borttaget-flaggor\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Letar efter icke prenumererade mappar i %s..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Letar efter undermappar till %s...."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST mislyckades\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan inte döpa om brevlåda: %s till %s\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST misslyckades\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "Flaggar meddelande..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Servern kräver TLS för att logga in.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan inte uppdatera egenskaper.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
@@ -5910,20 +5908,20 @@ msgstr ""
 "Anslutning till %s misslyckades: servern kräver TLS, men Claws-Mail har "
 "kompilerats utan stöd för TLS.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Serverinloggningar är avaktiverade.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "Hämtar meddelande..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan inte sätta borttaget-flaggor: %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"
@@ -6107,8 +6105,8 @@ msgstr "prenumerera"
 msgid "unsubscribe"
 msgstr "säg upp prenumeration"
 
-#: 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 "Använd på undermappar"
 
@@ -7850,7 +7848,7 @@ msgstr "Skriv mbox-fil"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Filen finns redan. Vill du skriva över den?"
 
-#: src/mbox.c: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 "Skriv över"
@@ -7900,7 +7898,7 @@ msgstr "Sökning färdig"
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: 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 - Meddelandevy"
 
@@ -7939,46 +7937,46 @@ msgstr ""
 "officiellt adresserat till dig.\n"
 "Det rekommenderas att du inte skickar något läskvitto."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Hämtar meddelande (%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 "Kunde inte dekryptera: %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 "Meddelandet följer inte MIME-standarden. Det kan återges fel."
 
-#: 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 "Spara som"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Skriv över befintlig fil?"
 
-#: 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 "Kan inte spara filen '%s'."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "Visa alla %s."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Endast den första megabyten text visas."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1950
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -7986,19 +7984,19 @@ msgstr ""
 "Du har fått ett läskvitto för detta meddelande : det har visats för "
 "mottagaren."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Detta meddelande begär returkvitto."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Detta meddelande begär returkvitto."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Skicka kvitto"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8006,7 +8004,7 @@ msgstr ""
 "Detta meddelande har tagits emot delvis,\n"
 "och har tagits bort från servern."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8015,15 +8013,15 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "Markera för nerladdning"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Markera för borttagning"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8032,12 +8030,12 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s och kommer att laddas ner."
 
-#: 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 "Avmarkera"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8046,11 +8044,11 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s och kommer att tas bort."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Återsänd läskvittounderrättelse"
 
-#: 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 +8060,19 @@ msgstr ""
 "Vänligen välj vilket av kontona som du vill använda för att skicka "
 "läskvittot:"
 
-#: 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 "_Avbryt"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "_Skicka Underrättelse"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan inte skriva ut: meddelandet innehåller ingen text."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8082,7 +8080,7 @@ msgstr ""
 "\n"
 "  Det finns inga meddelanden i denna mapp"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8090,7 +8088,7 @@ msgstr ""
 "\n"
 "  Meddelandet har blivit borttaget"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8098,7 +8096,7 @@ msgstr ""
 "\n"
 "  Meddelandet har flyttats till papperskorgen eller till en annan mapp"
 
-#: 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 "fel uppstod vid inlärning.\n"
@@ -8209,8 +8207,7 @@ msgid "Go back to email"
 msgstr "Gå tillbaka till e-post"
 
 #: 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 "Kan inte spara del av flerdelsmeddelande: %s"
@@ -8334,34 +8331,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "kunde inte välja grupp: %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 "kunde inte ställa in grupp: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "felaktigt artikelomfång: %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 "kunde inte hämta xhdr\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "hämtar xover %d - %d i %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "kunde inte hämta xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "felaktig xover-rad\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"
@@ -9174,8 +9171,7 @@ msgstr ""
 "Kontrollera inte efter saknade bilagor vid vidarebefordran och "
 "omdirigeringar av meddelanden"
 
-#: 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 "Signaturer"
 
@@ -9284,14 +9280,12 @@ msgstr ""
 "\n"
 "Alternativ finns i /Konfiguration/Egenskaper/Insticksmoduler/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 "Skräppost"
 
-#: 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 "Skräppostinlärning"
@@ -9316,7 +9310,7 @@ msgstr "Meddelanden större än så här kommer inte kontrolleras"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c: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"
 
@@ -9882,7 +9876,7 @@ msgstr "CSSen i denna fil kommer att appliceras på alla HTML-delar"
 #: 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 "Bläddra"
@@ -10189,7 +10183,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-insticksmodul: Försöker förnya auktorisering\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Autentisering"
 
@@ -10374,7 +10368,7 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr "Interval för Cacheuppdatering"
 
-#: 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 "timmar"
@@ -10753,7 +10747,7 @@ msgstr "Specificera autentisering"
 #: 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 "Användar-ID"
 
@@ -10761,18 +10755,18 @@ msgstr "Användar-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 "Lösenord"
 
-#: 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 "Autentiseringsmetod"
 
-#: 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 "Automatiskt"
 
@@ -11706,9 +11700,8 @@ msgstr "Förfaller efter"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "'0' kommer att lagra lösenfrasen för hela sessionen"
 
-#: src/plugins/pgpcore/prefs_gpg.c: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 "minuter"
@@ -12331,8 +12324,8 @@ msgstr "Visa Python-konsol..."
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: 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 "Bläddra"
@@ -12658,8 +12651,7 @@ msgstr "Hämta kommentarer på poster som är yngre än"
 
 #: 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 "dagar"
 
@@ -13290,7 +13282,7 @@ msgid "Next month"
 msgstr "Nästa månad"
 
 #: 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"
 
@@ -13724,15 +13716,15 @@ msgstr "Denna vecka"
 msgid "Later"
 msgstr "Senare"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Accepterad:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Avvisad:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Preliminärt Accepterat:"
 
@@ -14179,12 +14171,12 @@ msgstr "fel uppstod i POP3 session\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-kommandot stöds ej\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"
 
@@ -14273,40 +14265,40 @@ msgstr "kommando för att skicka e-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 "Standardinkorg"
 
-#: 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 "Ofiltrerade meddelande kommer sparas i denna mapp"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Använd säker autentisering (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "Ta bort meddelanden på server när de mottagits"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Ta bort 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 dagar och 0 timmar : ta bort omedelbart"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Storleksgräns för mottagande"
 
-#: 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."
@@ -14314,82 +14306,82 @@ msgstr ""
 "Meddelande som är större än denna gräns kommer att tas emot delvis. När du "
 "väljer dem kommer du kunna ta emot hela eller ta bort dem."
 
-#: src/prefs_account.c: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 "Maximalt antal artiklar att ladda ner"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "obegränsad om 0 väljs"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Ren text"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "Mapp på IMAP server"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(vanligtvis tom)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Visa enbart prenumererade mappar"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreddseffektivt läge (förhindrar hämtning av fjärretiketter)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Detta läge använder mindre bandbredd, men kan vara långsammare med vissa "
 "servrar."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "Tillåt insticksmoduler filtrera vid mottagning"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Hämta e-post' hämtar nya meddelanden för detta konto"
 
-#: src/prefs_account.c: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 "Brevhuvud"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "Generera Meddelande-ID"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "Skicka kontots email-adress i Meddelande-ID"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Lägg till huvud för användaragent"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentisering (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."
@@ -14397,176 +14389,176 @@ msgstr ""
 "Om du ej fyller i dessa, kommer samma användar-ID och lösenord som vid "
 "mottagning att användas."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentisera med POP3 innan avsändning"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "POP autentiseringstimeout"
 
-#: 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 "Infoga signatur automatiskt"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Kommando utdata"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "Ordlistor för stavningskontroll"
 
-#: 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 "Standardordlista:"
 
-#: 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 "Standard alternativordlista"
 
-#: 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 "Nytt"
 
-#: 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 "Svara"
 
-#: 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 "Vidarebefordra"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Standard sekretesssystem"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "Signera alltid meddelanden"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "Kryptera alltid meddelanden"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "Signera alltid meddelanden som svar på ett signerat meddelande"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Kryptera alltid meddelanden som svar på ett krypterat meddelande"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Kryptera skickade meddelanden med din egen nyckel tillsammans med mottagarens"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Spara skickade krypterade meddelanden i klartext"
 
-#: 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 "Använd inte SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "Använd SSL för POP3-förbindelse"
 
-#: 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 "Använd STARTTLS-kommando för att starta SSL-session"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "Använd SSL för IMAP4-förbindelse"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "Använd SSL för NNTP-förbindelse"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Skicka (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Använd inte SSL (men, om nödvändigt, använd STARTTLS)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "Använd SSL för SMTP-förbindelse"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "Klientcertifikat"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Certifikat för mottagning"
 
-#: 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 "Klient-certifikat som PKCS12 eller PEM-fil"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Certifikat för sändning"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Acceptera giltiga SSL-certifikat automatiskt"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Använd icke-blockerande SSL"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Stäng av detta om du har SSL-anslutningsproblem"
 
-#: 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ännamn"
 
-#: 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."
@@ -14574,112 +14566,112 @@ msgstr ""
 "Domännamnet kommer att användas i det genererade Meddelande-ID't, och vid "
 "anslutning till SMTP-servrar."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Använd kommando för att kommunicera med server"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markera kross-postade meddelanden som läst med färg:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Spara skickade meddelanden i"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Spara köade meddelanden i"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Lagra utkast i"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Lagra bortagna meddelande i"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Konto har inte angivits"
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Epostadress har inte angivits"
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits"
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Användar-ID har inte angivits."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "POP3-server har inte angivits."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Standardmapp för Inkorgen finns inte."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-server har inte angivits"
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits"
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "lokal brevlåda har inte angivits"
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "Epost kommando har inte angivits"
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Ta emot"
 
-#: 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 "Mallar"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Sekretess"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Inställningar för nytt konto"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoegenskaper"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Misslyckades (fel adress)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "Välj fil med signatur"
 
-#: 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älj certifikatsfil"
 
-#: 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 (insticksmodulen kunde inte laddas)"
@@ -14801,21 +14793,20 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Vill du verkligen ta bort alla denna aktiviteter? "
 
 #: 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 "Posten sparades inte"
 
 #: 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 "Posten sparades inte. Stänga ändå?"
 
 #: 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 "_Fortsätt redigera"
 
@@ -14939,15 +14930,15 @@ msgstr "Aktuella aktiviteter"
 msgid "Action string is not valid."
 msgstr "Aktivitetssträngen är inte giltig."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hej!\\n"
 
-#: src/prefs_common.c:300
+#: src/prefs_common.c:301
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Den %d\\nskrev %s:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c: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"
@@ -14956,7 +14947,7 @@ msgstr ""
 "\\n}?t{Till: %t\\n}?c{Kopia: %c\\n}?n{Diskussionsgrupper: %n\\n}?s{Ämne: %s"
 "\\n}\\n\\n%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 
diff --git a/po/tr.po b/po/tr.po
index 278a0cc..144ad63 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.11.1git101\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-02 16:34+0300\n"
+"POT-Creation-Date: 2016-08-28 19:13+0200\n"
 "PO-Revision-Date: 2016-08-05 14:43+0300\n"
 "Last-Translator: Numan Demirdöğen <if.gnu.linux at gmail.com>\n"
 "Language-Team: Türkçe <if.gnu.linux at gmail.com>\n"
@@ -36,13 +36,13 @@ msgstr "Hesapları düzenle"
 
 #: 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."
+"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 ""
-"'Posta Al' sırasıyla Hesaplarınızdan posta almanızı sağlayacaktır, onay kutusu "
-"hangi hesapların seçildiğini göstermektedir. Koyu metinle gösterilen hesap, "
-"öntanımlı hesabınızdır."
+"'Posta Al' sırasıyla Hesaplarınızdan posta almanızı sağlayacaktır, onay "
+"kutusu hangi hesapların seçildiğini göstermektedir. Koyu metinle gösterilen "
+"hesap, öntanımlı hesabınızdır."
 
 #: src/account.c:816
 msgid " _Set as default account "
@@ -80,20 +80,20 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Posta Al' seçilen hesaplardan posta alır"
 
 #: 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
-#: 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/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: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 "İsim"
 
-#: 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"
 
@@ -149,7 +149,8 @@ msgstr ""
 "%s"
 
 #: 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:1821
+#: src/plugins/tnef_parse/tnef_parse.c:67
+#: src/plugins/vcalendar/vcal_folder.c:1821
 #: 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
@@ -290,8 +291,9 @@ msgstr ""
 "istediğinizden emin misiniz?"
 
 #: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
-#: src/addressbook.c:483 src/edittags.c:272 src/plugins/archive/archiver_gtk.c:1186
-#: src/prefs_actions.c:1090 src/prefs_filtering.c:1693 src/prefs_template.c:1119
+#: src/addressbook.c:483 src/edittags.c:272
+#: src/plugins/archive/archiver_gtk.c:1186 src/prefs_actions.c:1090
+#: src/prefs_filtering.c:1693 src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -689,8 +691,8 @@ msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
 msgstr ""
-"'%s' silinsin mi? Sadece dizini silerseniz, dizinin barındırdığı adresler ana "
-"dizine taşınacak."
+"'%s' silinsin mi? Sadece dizini silerseniz, dizinin barındırdığı adresler "
+"ana dizine taşınacak."
 
 #: 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
@@ -805,8 +807,8 @@ msgstr "Adres Defterleri"
 msgid "Person"
 msgstr "Kişi"
 
-#: 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 "Dizin"
 
@@ -834,8 +836,9 @@ msgstr "Adres Defteri"
 #: 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 src/plugins/bsfilter/bsfilter.c:107
-#: src/plugins/bsfilter/bsfilter_gtk.c:197 src/plugins/bsfilter/bsfilter_gtk.c:266
+#: src/plugins/bogofilter/bogofilter_gtk.c:424
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
+#: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:117
 #: src/plugins/spamassassin/spamassassin_gtk.c:442
@@ -884,7 +887,8 @@ msgid "Address book folder size:"
 msgstr "Adres defteri dizin boyutu:"
 
 #: src/addrgather.c:393 src/addrgather.c:403
-msgid "Maximum amount of entries per folder within the newly created address book"
+msgid ""
+"Maximum amount of entries per folder within the newly created address book"
 msgstr "Yeni oluşturulan adres defterindeki dizin başına azami girdi sayısı"
 
 #: src/addrgather.c:407
@@ -945,18 +949,18 @@ msgstr "Adres(ler)i güncelle"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Güncelleme başarısız. Değişiklikler dizine yazılmadı."
 
-#: src/alertpanel.c:146 src/compose.c:9473
+#: src/alertpanel.c:146 src/compose.c:9479
 msgid "Notice"
 msgstr "Not"
 
-#: 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/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 "Uyarı"
 
-#: 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 "Hata"
@@ -989,84 +993,89 @@ msgstr "LDAP Adı"
 msgid "Attribute Value"
 msgstr "Ek Bilgi Değeri"
 
-#: src/common/plugin.c:63
+#: src/common/plugin.c:69
 msgid "Nothing"
 msgstr "Yok"
 
-#: src/common/plugin.c:64
+#: src/common/plugin.c:70
 msgid "a viewer"
 msgstr "görüntüleyici"
 
-#: src/common/plugin.c:65
+#: src/common/plugin.c:71
 msgid "a MIME parser"
 msgstr "MIME ayrıştırıcı"
 
-#: src/common/plugin.c:66
+#: src/common/plugin.c:72
 msgid "folders"
 msgstr "dizinler"
 
-#: src/common/plugin.c:67
+#: src/common/plugin.c:73
 msgid "filtering"
 msgstr "süzme"
 
-#: src/common/plugin.c:68
+#: src/common/plugin.c:74
 msgid "a privacy interface"
 msgstr "gizlilik eklentisi"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:75
 msgid "a notifier"
 msgstr "bilgi sağlayan eklenti"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:76
 msgid "an utility"
 msgstr "araç"
 
-#: 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."
+msgid ""
+"This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 "Bu eklentinin sağladığı %s (%s), %s eklentisi tarafından zaten sağlanmakta."
 
-#: src/common/plugin.c:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "Eklenti zaten yüklendi"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "Eklenti için hafıza tahsis edilemedi"
 
-#: 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 ""
-"Bu modül GPL 3 ya da daha sonraki bir sürümle uyumlu bir lisansla lisanslanmamış."
+"Bu modül GPL 3 ya da daha sonraki bir sürümle uyumlu bir lisansla "
+"lisanslanmamış."
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "Bu modül Claws Mail GTK1 için."
 
-#: 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."
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
 msgstr ""
-"Kullandığınız Claws Mail sürümü '%s' eklentisiyle derlenen sürümden daha yeni."
+"Kullandığınız Claws Mail sürümü '%s' eklentisiyle derlenen sürümden daha "
+"yeni."
 
-#: 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 "Kullandığınız Claws Mail sürümü eklentiyle derlenen sürümden daha yeni."
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr ""
+"Kullandığınız Claws Mail sürümü eklentiyle derlenen sürümden daha yeni."
 
-#: 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 "Kullandığınız Claws Mail sürümü '%s' eklentisi için çok eski."
 
-#: src/common/plugin.c:785
+#: src/common/plugin.c:783
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Kullandığınız Claws Mail sürümü eklenti için çok eski."
 
@@ -1236,212 +1245,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 "Pazar"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Salı"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Cuma"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Ocak"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Şubat"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Mart"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Nisan"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayıs"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Haziran"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Temmuz"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Ağustos"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Eylül"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Ekim"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Kasım"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Aralık"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Paz"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Pzt"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Sal"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Çar"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Per"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Cum"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Cmt"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Oca"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Şub"
 
-#: 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 "Nis"
 
-#: 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 "Haz"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Tem"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ağu"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Eyl"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Eki"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Kas"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Ara"
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "ÖÖ"
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ÖS"
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "öö"
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "ös"
@@ -1455,7 +1464,7 @@ msgstr "_Ekle..."
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "_Özellikler..."
 
@@ -1527,7 +1536,8 @@ msgstr "_Katlanmış"
 msgid "_Unwrapped"
 msgstr "_Katlanmamış"
 
-#: src/compose.c:623 src/mainwindow.c:547 src/plugins/managesieve/sieve_editor.c:99
+#: src/compose.c:623 src/mainwindow.c:547
+#: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Hepsini _seç"
 
@@ -1791,9 +1801,11 @@ msgstr "Cevaplanamıyor. Asıl e-posta mutemelen mevcut değil."
 
 #: src/compose.c:1638 src/quote_fmt.c:586
 msgid ""
-"The \"From\" field of the \"Reply\" template contains an invalid email address."
+"The \"From\" field of the \"Reply\" template contains an invalid email "
+"address."
 msgstr ""
-"\"Cevapla\" şablonunun \"Kimden\" kısmı geçersiz bir e-posta adresi barındırıyor."
+"\"Cevapla\" şablonunun \"Kimden\" kısmı geçersiz bir e-posta adresi "
+"barındırıyor."
 
 #: src/compose.c:1686 src/quote_fmt.c:589
 #, c-format
@@ -1802,7 +1814,8 @@ msgstr "\"Cevapla\" şablonu gövdesinin %d. satırında hata bulundu."
 
 #: 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."
+"The \"From\" field of the \"Forward\" template contains an invalid email "
+"address."
 msgstr ""
 "\"Yönlendir\" şablonunun \"Kimden\" kısmı geçersiz bir e-posta adresi "
 "barındırıyor."
@@ -1833,7 +1846,8 @@ msgstr "Bcc:"
 msgid "Reply-To:"
 msgstr "Yanıtla:"
 
-#: src/compose.c:2615 src/compose.c:4946 src/compose.c:4948 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 "Haber grubu:"
 
@@ -1845,8 +1859,8 @@ msgstr "Takiben:"
 msgid "In-Reply-To:"
 msgstr "Yanıt-Olarak:"
 
-#: src/compose.c:2625 src/compose.c:4943 src/compose.c:4951 src/gtk/headers.h:13
-#: src/summary_search.c:433
+#: 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 "Alıcı:"
 
@@ -1878,8 +1892,8 @@ msgstr "'%s' dosyasının boyutu alınamadı."
 #: 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?"
+"You are about to insert a file of %s in the message body. Are you sure you "
+"want to do that?"
 msgstr ""
 "İleti gövdesine %s boyutunda bir dosya eklemek üzeresiniz. Bunu yapmak "
 "istediğinizden emin misiniz?"
@@ -1888,7 +1902,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Emin misiniz?"
 
-#: 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 "_Ekle"
 
@@ -1943,23 +1957,25 @@ msgstr ""
 "Lütfen göndermeden önce bir e-posta hesabı seçin."
 
 #: 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 "Gönder"
 
 #: src/compose.c:5043
 msgid "The only recipient is the default CC address. Send anyway?"
-msgstr "Alıcı olarak sadece öntanımlı CC adresi girilmiş. Yine de gönderilsin mi?"
+msgstr ""
+"Alıcı olarak sadece öntanımlı CC adresi girilmiş. Yine de gönderilsin mi?"
 
-#: 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 "_Gönder"
 
 #: src/compose.c:5075
 msgid "The only recipient is the default BCC address. Send anyway?"
-msgstr "Alıcı olarak sadece öntanımlı BCC adresi girilmiş. Yine de gönderilsin mi?"
+msgstr ""
+"Alıcı olarak sadece öntanımlı BCC adresi girilmiş. Yine de gönderilsin mi?"
 
 #: src/compose.c:5092
 msgid "Recipient is not specified."
@@ -1986,7 +2002,7 @@ msgstr "Yine de kuyruğa eklensin mı?"
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: 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"
@@ -1996,7 +2012,7 @@ msgstr ""
 "\n"
 "Karakter seti dönüştürmesi başarısız oldu."
 
-#: 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"
@@ -2006,7 +2022,7 @@ msgstr ""
 "\n"
 "Alıcının şifreleme anahtarı alınamadı."
 
-#: 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"
@@ -2049,7 +2065,7 @@ msgstr ""
 "%s\n"
 "Ana pencereden \"Kuyruktaki iletileri gönderi\"i kullanarak tekrar deneyin."
 
-#: src/compose.c:5629
+#: src/compose.c:5632
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2060,7 +2076,7 @@ msgstr ""
 "karakter kodlamasına dönüştürülemedi.\n"
 "%s olarak gönderilsin mi?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2073,74 +2089,74 @@ msgstr ""
 "\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "E-posta şifrelenemedi: %s"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "Şifreleme uyarısı"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "Devam _Et"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "E-posta göndermek için bir hesap mevcut değil!"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Seçilen hesap NNTP değil: Göndermek mümkün değil."
 
-#: src/compose.c:6213
+#: src/compose.c:6216
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "%s eki artık mevcut değil. Dikkate alma?"
 
-#: 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 "Göndermeyi iptal et"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "Eki dikkate alma"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
 #, c-format
 msgid "Original %s part"
 msgstr "Ozgün %s bölümü"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "Adres _defterine ekle"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "Girdi içeriğini sil"
 
-#: 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 "Adres defterinden otomatik tamamlamak için <tab> kullanın"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "Mime türü"
 
-#: src/compose.c:7218 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
+#: 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 "Boyut"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "İletiyi şuraya kaydet "
 
-#: src/compose.c:7318 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/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
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
@@ -2149,23 +2165,23 @@ msgstr "İletiyi şuraya kaydet "
 msgid "_Browse"
 msgstr "_Gözat"
 
-#: src/compose.c:7791
+#: src/compose.c:7797
 msgid "Hea_der"
 msgstr "Üst_bilgi"
 
-#: src/compose.c:7796
+#: src/compose.c:7802
 msgid "_Attachments"
 msgstr "_Ekler"
 
-#: src/compose.c:7810
+#: src/compose.c:7816
 msgid "Othe_rs"
 msgstr "_Diğerleri"
 
-#: src/compose.c:7825
+#: src/compose.c:7831
 msgid "S_ubject:"
 msgstr "_Konu"
 
-#: src/compose.c:8049
+#: src/compose.c:8055
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2174,19 +2190,19 @@ msgstr ""
 "İmlâ denetimi başlatılamadı.\n"
 "%s"
 
-#: src/compose.c:8188
+#: src/compose.c:8194
 msgid "_From:"
 msgstr "_Kimden:"
 
-#: src/compose.c:8205
+#: src/compose.c:8211
 msgid "Account to use for this email"
 msgstr "Bu e-posta için kullanılacak hesap"
 
-#: src/compose.c:8207
+#: src/compose.c:8213
 msgid "Sender address to be used"
 msgstr "Kullanılacak gönderen adresi"
 
-#: 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 "
@@ -2195,68 +2211,68 @@ msgstr ""
 "'%s' gizlilik sistemi yüklenemedi. Bu iletiyi imzalayamayacak ya da "
 "şifreleyemeyeceksiniz"
 
-#: 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 "_Hiç biri"
 
-#: 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 "Şablon gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:8691
+#: src/compose.c:8697
 msgid "Template From format error."
 msgstr "Kimden şablonu format hatası."
 
-#: src/compose.c:8709
+#: src/compose.c:8715
 msgid "Template To format error."
 msgstr "Kime şablonu format hatası."
 
-#: src/compose.c:8727
+#: src/compose.c:8733
 msgid "Template Cc format error."
 msgstr "Cc şablonu format hatası."
 
-#: src/compose.c:8745
+#: src/compose.c:8751
 msgid "Template Bcc format error."
 msgstr "Bcc şablonu format hatası."
 
-#: src/compose.c:8763
+#: src/compose.c:8769
 msgid "Template Reply-To format error."
 msgstr "Yanıtla şablonu format hatası."
 
-#: src/compose.c:8782
+#: src/compose.c:8788
 msgid "Template subject format error."
 msgstr "Konu şablonu format hatası"
 
-#: src/compose.c:9051
+#: src/compose.c:9057
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:9066
+#: src/compose.c:9072
 msgid "File doesn't exist or is empty."
 msgstr "Dosya mevcut değil ya da boş."
 
-#: src/compose.c:9140
+#: src/compose.c:9146
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:9157
+#: src/compose.c:9163
 msgid "MIME type"
 msgstr "MIME türü"
 
-#: src/compose.c:9198
+#: src/compose.c:9204
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:9218
+#: src/compose.c:9224
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:9219
+#: src/compose.c:9225
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:9470
+#: src/compose.c:9476
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2267,15 +2283,15 @@ msgstr ""
 "İşlemi sonlandırmaya zorla?\n"
 "işlem grup 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 "Bu e-postayı gönderebilmek için ağ erişimine ihtiyaç var."
 
-#: src/compose.c:9985
+#: src/compose.c:9991
 msgid "Could not queue message."
 msgstr "İleti kuyruğa eklenemedi."
 
-#: src/compose.c:9987
+#: src/compose.c:9993
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2286,15 +2302,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10165
+#: src/compose.c:10171
 msgid "Could not save draft."
 msgstr "Taslak kaydedilemedi."
 
-#: src/compose.c:10169
+#: src/compose.c:10175
 msgid "Could not save draft"
 msgstr "Taslak kaydedilemedi."
 
-#: src/compose.c:10170
+#: src/compose.c:10176
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2302,24 +2318,24 @@ msgstr ""
 "Taslak kaydedilemedi.\n"
 "Çıkmaktan ya da bu e-posdan vaz geçmek ister misiniz?"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Cancel exit"
 msgstr "Çıkmaktan _vazgeç"
 
-#: src/compose.c:10172
+#: src/compose.c:10178
 msgid "_Discard email"
 msgstr "E-postadan _vaz geç"
 
-#: src/compose.c:10332 src/compose.c:10346
+#: src/compose.c:10338 src/compose.c:10352
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:10360
+#: src/compose.c:10366
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "'%s' dosyası okunamadı."
 
-#: src/compose.c:10362
+#: src/compose.c:10368
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2328,54 +2344,54 @@ msgstr ""
 "'%s' dosyası mevcut karakter kodlaması için\n"
 "geçersiz karakterler barındırıyor, eklemek yanlış olabilir."
 
-#: src/compose.c:10449
+#: src/compose.c:10455
 msgid "Discard message"
 msgstr "İletiden vaz geç"
 
-#: src/compose.c:10450
+#: src/compose.c:10456
 msgid "This message has been modified. Discard it?"
 msgstr "Bu ileti değiştirilmiş. Vaz geç?"
 
-#: 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 "_Vaz geç"
 
-#: src/compose.c:10451 src/compose.c:10455
+#: src/compose.c:10457 src/compose.c:10461
 msgid "_Save to Drafts"
 msgstr "_Taslaklara Kaydet"
 
-#: 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 "Değişiklikleri kaydet"
 
-#: src/compose.c:10454
+#: src/compose.c:10460
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bu ileti değiştirilmiş. Son değişiklikleri kaydet?"
 
-#: src/compose.c:10455
+#: src/compose.c:10461
 msgid "_Don't save"
 msgstr "_Kaydetme"
 
-#: src/compose.c:10526
+#: src/compose.c:10532
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "'%s' şablonunun uygulanmasını istiyor musunuz?"
 
-#: src/compose.c:10528
+#: src/compose.c:10534
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: 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 "_Yer Değiştir"
 
-#: src/compose.c:11387
+#: src/compose.c:11399
 msgid "Insert or attach?"
 msgstr "Ekle ya da iliştir"
 
-#: 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?"
@@ -2383,23 +2399,23 @@ msgstr ""
 "Dosya içeriğinin ileti gövdesine eklenmesini ya da e-postaya iliştirilmesini "
 "istiyor musunuz?"
 
-#: src/compose.c:11390
+#: src/compose.c:11402
 msgid "_Attach"
 msgstr "_İliştir"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "%d. satırda alıntı biçimi hatası."
 
-#: 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 time. "
-"Do you want to continue?"
+"You are about to reply to %d messages. Opening the windows could take some "
+"time. Do you want to continue?"
 msgstr ""
-"%d adet iletiyi cevaplamak üzeresizini. Pencereleri açmak zaman alacaktır. Devam "
-"etmek istiyor musunuz?"
+"%d adet iletiyi cevaplamak üzeresizini. Pencereleri açmak zaman alacaktır. "
+"Devam etmek istiyor musunuz?"
 
 #: src/crash.c:140
 #, c-format
@@ -2608,9 +2624,9 @@ msgstr "Adres Defterini Düzenle"
 msgid " Check File "
 msgstr " Dosyayı Denetle "
 
-#: 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/wizard.c:1197
-#: src/wizard.c:1617
+#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
+#: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Dosya"
 
@@ -2743,9 +2759,9 @@ msgstr "Sunucuya vermek istediğiniz bir isim."
 
 #: 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 be "
-"used. You may specify \"localhost\" if running an LDAP server on the same "
+"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 "
+"be used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 msgstr ""
 "Bu, sunucunun makine adıdır. Misal, \"alanadım.com\" şirketi için \"ldap."
@@ -2757,7 +2773,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"
 
@@ -2795,8 +2811,8 @@ msgstr "Sunucu bağlantısını sınamak için bu düğmeye basın."
 
 #: src/editldap.c:511
 msgid ""
-"This specifies the name of the directory to be searched on the server. Examples "
-"include:\n"
+"This specifies the name of the directory to be searched on the server. "
+"Examples include:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
@@ -2808,7 +2824,8 @@ msgstr ""
 
 #: src/editldap.c:522
 msgid ""
-"Press this button to lookup the name of available directory names on the server."
+"Press this button to lookup the name of available directory names on the "
+"server."
 msgstr ""
 "Sunucu üzerindeki mevcut dizinlerin isimlerini aramak için bu düğmeye basın."
 
@@ -2818,8 +2835,8 @@ msgstr "Ek Bilgileri Ara"
 
 #: src/editldap.c:587
 msgid ""
-"A list of LDAP attribute names that should be searched when attempting to find a "
-"name or address."
+"A list of LDAP attribute names that should be searched when attempting to "
+"find a name or address."
 msgstr ""
 "Bir isim ya da adres bulmaya çalışırken aranması gereken LDAP ek bilgi "
 "isimlerinin listesi"
@@ -2830,11 +2847,11 @@ msgstr " Öntanımlı Ayarlar "
 
 #: 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."
+"This resets the attribute names to a default value that should find most "
+"names and addresses during a name or address search process."
 msgstr ""
-"Bu seçenek bir isim ya da adres arama sürecinde çoğu isim ve adresin bulunmasını "
-"sağlayacak ek bilgi isimlerini öntanımlı değere getirir."
+"Bu seçenek bir isim ya da adres arama sürecinde çoğu isim ve adresin "
+"bulunmasını sağlayacak ek bilgi isimlerini öntanımlı değere getirir."
 
 #: src/editldap.c:600
 msgid "Max Query Age (secs)"
@@ -2843,24 +2860,26 @@ msgstr "Azamî Sorgu Süresi (sn)"
 #: 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 in a "
-"cache until this period of time has passed and then retired. This will improve "
-"the response time when attempting to search for the same name or address on "
-"subsequent address completion requests. The cache will be searched in preference "
-"to performing a new server search request. The default value of 600 seconds (10 "
-"minutes), should be sufficient for most servers. A larger value will reduce the "
-"search time for subsequent searches. This is useful for servers that have slow "
-"response times at the expense of more memory to cache results."
-msgstr ""
-"Bu şeçenek adres tamamlama amacıyla kullanılan adres arama sonuçlarının azami ne "
-"kadar süreyle (sn) geçerli olduğunu tanımlar. Arama sonuçları belirtilen zaman "
-"süresince geçici bir bellekte tutulur. Bu yöntem aynı ad ve adres arandığında "
-"daha sonraki adres tamamlama tepki süresini iyileştirecektir. Yeni bir sunucu "
-"arama isteğinde öncelikle geçici bellek aranacaktır. Öntanımlı 600 saniye (10 "
-"dakika), bir çok sunucu için yeterlidir. Daha büyük bir değer müteakip aramalar "
-"için arama süresini azaltacaktır. Bu özellik, sonuçları geçici bellekte tutmak "
-"için gerekli daha fazla bellek pahasına, yavaş cevap süresine sahip sunucular "
-"için kullanışlıdır."
+"result is valid for address completion purposes. Search results are stored "
+"in a cache until this period of time has passed and then retired. This will "
+"improve the response time when attempting to search for the same name or "
+"address on subsequent address completion requests. The cache will be "
+"searched in preference to performing a new server search request. The "
+"default value of 600 seconds (10 minutes), should be sufficient for most "
+"servers. A larger value will reduce the search time for subsequent searches. "
+"This is useful for servers that have slow response times at the expense of "
+"more memory to cache results."
+msgstr ""
+"Bu şeçenek adres tamamlama amacıyla kullanılan adres arama sonuçlarının "
+"azami ne kadar süreyle (sn) geçerli olduğunu tanımlar. Arama sonuçları "
+"belirtilen zaman süresince geçici bir bellekte tutulur. Bu yöntem aynı ad ve "
+"adres arandığında daha sonraki adres tamamlama tepki süresini "
+"iyileştirecektir. Yeni bir sunucu arama isteğinde öncelikle geçici bellek "
+"aranacaktır. Öntanımlı 600 saniye (10 dakika), bir çok sunucu için "
+"yeterlidir. Daha büyük bir değer müteakip aramalar için arama süresini "
+"azaltacaktır. Bu özellik, sonuçları geçici bellekte tutmak için gerekli daha "
+"fazla bellek pahasına, yavaş cevap süresine sahip sunucular için "
+"kullanışlıdır."
 
 #: src/editldap.c:632
 msgid "Include server in dynamic search"
@@ -2868,11 +2887,11 @@ msgstr "Dinamik aramada sunucuyu dahil et"
 
 #: src/editldap.c:637
 msgid ""
-"Check this option to include this server for dynamic searches when using address "
-"completion."
+"Check this option to include this server for dynamic searches when using "
+"address completion."
 msgstr ""
-"Adres tamamlama kullanılırken bu sunucunun dinamik aramada dahil edilmesi için "
-"bu seçeneği işaretleyin."
+"Adres tamamlama kullanılırken bu sunucunun dinamik aramada dahil edilmesi "
+"için bu seçeneği işaretleyin."
 
 #: src/editldap.c:643
 msgid "Match names 'containing' search term"
@@ -2880,17 +2899,17 @@ msgstr "Arama koşulunu 'içeren' isimlerle eşleş"
 
 #: 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\" search; "
-"this type of search usually takes longer to complete. Note that for performance "
-"reasons, address completion uses \"begins-with\" for all searches against other "
-"address interfaces."
+"Searches for names and addresses can be performed either using \"begins-with"
+"\" or \"contains\" search term. Check this option to perform a \"contains\" "
+"search; this type of search usually takes longer to complete. Note that for "
+"performance reasons, address completion uses \"begins-with\" for all "
+"searches against other address interfaces."
 msgstr ""
 "İsim ve adres araması \"bununla başla\" ya da \"içeren\" arama "
 "koşullarıkullanılarak ifa edilebilir. \"içeren\" koşulunu kullanmak için bu "
-"seçeneği işaretleyin; bu tür arama genelde daha uzun sürmekte. Adres tamamlama, "
-"diğer adres arayüzleri için verim kaybı yaşanmaması adına \"bununla başla\" "
-"koşulunu kullanır."
+"seçeneği işaretleyin; bu tür arama genelde daha uzun sürmekte. Adres "
+"tamamlama, diğer adres arayüzleri için verim kaybı yaşanmaması adına "
+"\"bununla başla\" koşulunu kullanır."
 
 #: src/editldap.c:701
 msgid "Bind DN"
@@ -2898,14 +2917,15 @@ msgstr "Bind DN"
 
 #: 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 as: \"cn=user,"
-"dc=claws-mail,dc=org\". This is usually left empty when performing a search."
+"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 "
+"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "
+"performing a search."
 msgstr ""
 "Sunucuya bağlanmak için kullanılacak LDAP kullanıcı hesabı adı. Bu seçenek "
-"sadece korumalı sunucular için kullanılmakta. Bu isim genellikle \"cn=kullanıcı,"
-"dc=claws-mail,dc=org\" biçimini kullanmakta. Arama yapılırken bu seçenek "
-"genellikle boş bırakılır."
+"sadece korumalı sunucular için kullanılmakta. Bu isim genellikle "
+"\"cn=kullanıcı,dc=claws-mail,dc=org\" biçimini kullanmakta. Arama yapılırken "
+"bu seçenek genellikle boş bırakılır."
 
 #: src/editldap.c:717
 msgid "Bind Password"
@@ -2928,10 +2948,11 @@ msgid "Maximum Entries"
 msgstr "Azami Girdi Sayısı"
 
 #: src/editldap.c:764
-msgid "The maximum number of entries that should be returned in the search result."
+msgid ""
+"The maximum number of entries that should be returned in the search result."
 msgstr "Arama sonucunda gösterilecek azamî girdi sayısı."
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "Temel"
 
@@ -2943,7 +2964,8 @@ msgstr "Gelişmiş"
 msgid "Add New LDAP Server"
 msgstr "Yeni LDAP Sunucusu Ekle"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1446 src/prefs_summaries.c:441
+#: src/edittags.c:187 src/prefs_filtering_action.c:1446
+#: src/prefs_summaries.c:441
 msgid "Tag"
 msgstr "Etiket"
 
@@ -2983,7 +3005,8 @@ msgstr "Yani etiket:"
 #: src/edittags.c:570
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr ""
-"Lütfen uygulanacak/kaldırılacak etiketleri seçin. Değişiklikler anında uygulanır."
+"Lütfen uygulanacak/kaldırılacak etiketleri seçin. Değişiklikler anında "
+"uygulanır."
 
 #: src/editvcard.c:95
 msgid "File does not appear to be vCard format."
@@ -3182,11 +3205,11 @@ msgstr "Takı sağlanmadı"
 
 #: src/expldifdlg.c:243
 msgid ""
-"A suffix is required if data is to be used for an LDAP server. Are you sure you "
-"wish to proceed without a suffix?"
+"A suffix is required if data is to be used for an LDAP server. Are you sure "
+"you wish to proceed without a suffix?"
 msgstr ""
-"Veri, LDAP sunucu için kullanılacaksa bir takı sağlanmalı. Takı olmadan devam "
-"etmek istediğinizden emin misiniz?"
+"Veri, LDAP sunucu için kullanılacaksa bir takı sağlanmalı. Takı olmadan "
+"devam etmek istediğinizden emin misiniz?"
 
 #: src/expldifdlg.c:261
 msgid "Error creating LDIF file"
@@ -3202,7 +3225,8 @@ msgstr "LDIF Çıktı Dosyası"
 
 #: src/expldifdlg.c:431
 msgid ""
-"The address book Unique ID is used to create a DN that is formatted similar to:\n"
+"The address book Unique ID is used to create a DN that is formatted similar "
+"to:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 msgstr ""
 "Adres kitabı Benzersiz ID değişkeni DN oluşturmak için aşağıdaki biçimde "
@@ -3211,8 +3235,8 @@ msgstr ""
 
 #: src/expldifdlg.c:437
 msgid ""
-"The address book Display Name is used to create a DN that is formatted similar "
-"to:\n"
+"The address book Display Name is used to create a DN that is formatted "
+"similar to:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 msgstr ""
 "Adres kitabı Görünür Ad değişkeni DN oluşturmak için aşağıdaki biçimde "
@@ -3235,14 +3259,14 @@ msgstr "Takı"
 
 #: src/expldifdlg.c:499
 msgid ""
-"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP entry. "
-"Examples include:\n"
+"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
+"entry. Examples include:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
-"Takı, bir LDAP girdisi için \"Ayırt Edici İsim\" (DN) oluşturmada kullanılır. "
-"Örnek olarak:\n"
+"Takı, bir LDAP girdisi için \"Ayırt Edici İsim\" (DN) oluşturmada "
+"kullanılır. Örnek olarak:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=kullanıcı,dc=alanadı,dc=com\n"
 "  o=Kurum Adı,c=Ülke\n"
@@ -3257,17 +3281,17 @@ msgstr "Benzersiz ID"
 
 #: src/expldifdlg.c:523
 msgid ""
-"The LDIF file contains several data records that are usually loaded into an LDAP "
-"server. Each data record in the LDIF file is uniquely identified by a "
+"The LDIF file contains several data records that are usually loaded into an "
+"LDAP server. Each data record in the LDIF file is uniquely identified by a "
 "\"Distinguished Name\" (or DN). The suffix is appended to the \"Relative "
 "Distinguished Name\" (or RDN) to create the DN. Please select one of the "
 "available RDN options that will be used to create the DN."
 msgstr ""
-"LDIF dosyası genellikle bir LDAP sunucusuna yüklenen bir çok veri kaydı içerir. "
-"LDIF dosyasındaki her bir veri kaydı bir \"Ayırt Edici İsim\" (DN) tarafından "
-"benzersiz biçimde tanımlanır. Takı, bir DN oluşturmak için \"Göreceli Ayırt "
-"Edici İsim\" (RDN) değişkenine eklenir. DN oluturmak için kullanılacak RDN "
-"seçeneklerinden birini seçin lütfen."
+"LDIF dosyası genellikle bir LDAP sunucusuna yüklenen bir çok veri kaydı "
+"içerir. LDIF dosyasındaki her bir veri kaydı bir \"Ayırt Edici İsim\" (DN) "
+"tarafından benzersiz biçimde tanımlanır. Takı, bir DN oluşturmak için "
+"\"Göreceli Ayırt Edici İsim\" (RDN) değişkenine eklenir. DN oluturmak için "
+"kullanılacak RDN seçeneklerinden birini seçin lütfen."
 
 #: src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
@@ -3275,15 +3299,15 @@ msgstr "Veride mevcutsa DN değişkenini kullan"
 
 #: src/expldifdlg.c:548
 msgid ""
-"The addressbook may contain entries that were previously imported from an LDIF "
-"file. The \"Distinguished Name\" (DN) user attribute, if present in the address "
-"book data, may be used in the exported LDIF file. The RDN selected above will be "
-"used if the DN user attribute is not found."
+"The addressbook may contain entries that were previously imported from an "
+"LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
+"address book data, may be used in the exported LDIF file. The RDN selected "
+"above will be used if the DN user attribute is not found."
 msgstr ""
 "Adres defteri, bir LDIF dosyasından daha önce içe aktarılmış değerler "
 "içerebilir. Adres defteri verisinde mevcutsa, \"Ayırt Edici İsim\" (DN) "
-"kullanıcı değişkeni dışa aktarılan LDIF dosyasında kullanılabilir. DN kullanıcı "
-"değişkeni mevcut değilse yukarıda seçilen RDN kullanılacaktır."
+"kullanıcı değişkeni dışa aktarılan LDIF dosyasında kullanılabilir. DN "
+"kullanıcı değişkeni mevcut değilse yukarıda seçilen RDN kullanılacaktır."
 
 #: src/expldifdlg.c:558
 msgid "Exclude record if no Email Address"
@@ -3291,11 +3315,11 @@ msgstr "E-posta Adresi yoksa kaydı hariç tut"
 
 #: src/expldifdlg.c:563
 msgid ""
-"An addressbook may contain entries without Email Addresses. Check this option to "
-"ignore these records."
+"An addressbook may contain entries without Email Addresses. Check this "
+"option to ignore these records."
 msgstr ""
-"Adres defteri E-posta Adresi içermeyen değerler içerebilir. Bu kayıtları dikkate "
-"almamak için bu seçeneği işaretleyin."
+"Adres defteri E-posta Adresi içermeyen değerler içerebilir. Bu kayıtları "
+"dikkate almamak için bu seçeneği işaretleyin."
 
 #: src/expldifdlg.c:655
 msgid "Export Address Book to LDIF File"
@@ -3369,7 +3393,8 @@ msgstr "Belirtilmedi"
 #: src/file_checker.c:76
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
-msgstr "%s dosyası kayıp! %s tarihindeki yedek dosyayı kullanmak istiyor musunuz?"
+msgstr ""
+"%s dosyası kayıp! %s tarihindeki yedek dosyayı kullanmak istiyor musunuz?"
 
 #: src/file_checker.c:84 src/file_checker.c:106
 #, c-format
@@ -3379,10 +3404,11 @@ msgstr "%s, %s üzerine kopyalanamadı"
 #: 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 ""
-"%s dosyası boş ya da bozulmuş! %s tarihindeki yedek dosyayı kullanmak istiyor "
-"musunuz?"
+"%s dosyası boş ya da bozulmuş! %s tarihindeki yedek dosyayı kullanmak "
+"istiyor musunuz?"
 
 #: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
 msgid "rule is not account-based\n"
@@ -3391,15 +3417,15 @@ msgstr "kural hesap temelli değil\n"
 #: src/filtering.c:607
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], matching the account currently used to "
-"retrieve messages\n"
+"rule is account-based [id=%d, name='%s'], matching the account currently "
+"used to retrieve messages\n"
 msgstr ""
-"kural hesap temelli [id=%d, name='%s'], iletileri almak için şu an kullanılan "
-"hesapla eşleşiyor\n"
+"kural hesap temelli [id=%d, name='%s'], iletileri almak için şu an "
+"kullanılan hesapla eşleşiyor\n"
 
-#: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627 src/filtering.c:651
-#: src/filtering.c:669 src/filtering.c:696 src/filtering.c:697 src/filtering.c:714
-#: src/filtering.c:715
+#: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
+#: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
+#: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
 msgid "NON_EXISTENT"
 msgstr "NON_EXISTENT"
 
@@ -3408,7 +3434,8 @@ msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
-"kural hesap temelli, iletileri almak için şu an kullanılan hesapla eşleşmiyor\n"
+"kural hesap temelli, iletileri almak için şu an kullanılan hesapla "
+"eşleşmiyor\n"
 
 #: src/filtering.c:624
 #, c-format
@@ -3416,13 +3443,15 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
-"kural hesap temelli [id=%d, name='%s'], iletileri almak için şu an kullanılan "
-"hesapla eşleşmiyor [id=%d, name='%s']\n"
+"kural hesap temelli [id=%d, name='%s'], iletileri almak için şu an "
+"kullanılan hesapla eşleşmiyor [id=%d, name='%s']\n"
 
 #: src/filtering.c:643
-msgid "rule is not account-based, all rules are applied on user request anyway\n"
+msgid ""
+"rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
-"kural hesap temelli değil, yine de kurallar kullanıcı isteği gereği uygulanıyor\n"
+"kural hesap temelli değil, yine de kurallar kullanıcı isteği gereği "
+"uygulanıyor\n"
 
 #: src/filtering.c:649
 #, c-format
@@ -3445,8 +3474,8 @@ msgstr "kural hesap temelli, kullanıcı isteği gereği es geçiliyor\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 ""
 "kural hesap temelli [id=%d, name='%s'], şuanki hesapla eşleşmiyor [id=%d, "
 "name='%s']\n"
@@ -3458,7 +3487,8 @@ msgstr "kural hesap temelli, kullanılan hesapla eşleşmiyor\n"
 #: 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 ""
 "kural hesap temelli [id=%d, name='%s'], kullanılan hesap [id=%d, name='%s']\n"
 
@@ -3619,7 +3649,8 @@ msgstr "Yeni Dizin"
 #: 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
+#: 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 "'%c' dizin isminde kullanılamaz."
@@ -3639,159 +3670,162 @@ msgstr "`%s' dizini zaten var."
 msgid "Can't create the folder '%s'."
 msgstr "`%s' dizini oluşturulamıyor."
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "Tümünü _okunmuş say"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "Bütün dizinlerdekini okunmuş say"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "İşlem kurallarını _yürüt"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "Dizini _ara..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "İş_leniyor..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "Çöpü _boşalt..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "_Kuyruğa gönder..."
 
-#: src/folderview.c:385 src/folderview.c:432
-#: src/plugins/notification/notification_lcdproc.c:141 src/prefs_folder_column.c:79
-#: src/prefs_matcher.c:393 src/summaryview.c:6266
+#: 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 "Yeni"
 
-#: src/folderview.c:386 src/folderview.c:433
-#: src/plugins/notification/notification_lcdproc.c:145 src/prefs_folder_column.c:80
-#: src/prefs_matcher.c:392 src/summaryview.c:6268
+#: 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 "Okunmamış"
 
-#: 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 "Toplam"
 
 #. 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 "Dizin bilgisi ayarlanıyor..."
 
-#: 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?"
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
 msgstr ""
 "Bu ve bunun alt dizinlerindeki tüm e-postaları okunmuş olarak işaretlemek "
 "istiyor musunuz?"
 
-#: 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 "Bu dizindeki tüm e-postaları okunmuş olarak işaretlemek istiyor musunuz?"
+msgstr ""
+"Bu dizindeki tüm e-postaları okunmuş olarak işaretlemek istiyor musunuz?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "Hepsini okunmuş say"
 
-#: 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/%s dizini taranıyor..."
 
-#: 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 "%s dizini taranıyor..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "Dizin ağacını yeniden oluştur"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
-"Dizin ağacını yeniden oluşturmak yerel önbelleği silecektir. Devam edilsin mi?"
+"Dizin ağacını yeniden oluşturmak yerel önbelleği silecektir. Devam edilsin "
+"mi?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "Dizin ağacı yeniden oluşturuluyor..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "Dizin ağacı taranıyor..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "%s dizini taranamadı\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "Tüm dizinlerdeki yeni iletiler denetleniyor..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
 #, c-format
 msgid "Closing folder %s..."
 msgstr "%s dizini kapatılıyor..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
 #, c-format
 msgid "Opening folder %s..."
 msgstr "%s dizini açılıyor..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "Dizin açılamadı."
 
-#: 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 "Çöpü boşalt"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "Çöpü _boşalt"
 
-#: 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 "Çevrimdışı uyarı"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Çevrim dışı çalışıyorsunuz. Geçersiz kıl?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Kuyruktaki tüm iletileri gönder"
 
-#: 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 "Kuruktaki iletiler gönderilirken hata oluştu."
 
-#: 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"
@@ -3800,64 +3834,64 @@ msgstr ""
 "Kuyruktaki iletiler gönderilirken hata oluştu:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "'%s' dizinini '%s' içine kopyalamak istediğinizden emin misiniz?"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2545
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "'%s' dizinini '%s' dizininin alt dizini yapmak istiyor musunuz?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "Dizini copyala"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "Dizini taşı"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "%s %s içine kopyalanıyor..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s %s içine taşınıyor..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "Kaynak ve hedef aynı."
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "Bir dizin kendi alt dizinine kopyalanamaz."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "Bir dizin kendi alt dizinine taşınamaz."
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Bir dizin farklı posta kutuları arasında taşınamaz."
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "Kopyalama başarısız!"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "Taşıma başarısız!"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "%s dizini için düzenlemeler işleniyor"
 
-#: 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 "Hedef dizin sadece alt dizinleri kaydetmek için kullanılabilir."
 
@@ -3935,20 +3969,20 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Destek almak ve müzakere için Claws Mail kullanıcıları e-posta listesine abone "
-"olun:\n"
+"Destek almak ve müzakere için Claws Mail kullanıcıları e-posta listesine "
+"abone olun:\n"
 
 #: src/gtk/about.c:142
 msgid ""
 "\n"
 "\n"
-"Claws Mail is free software released under the GPL. If you wish to donate to the "
-"Claws Mail project you can do so at:\n"
+"Claws Mail is free software released under the GPL. If you wish to donate to "
+"the Claws Mail project you can do so at:\n"
 msgstr ""
 "\n"
 "\n"
-"Claws Mail GPL lisansıyla yayınlanan özgür bir yazılımdır. Claws Mail projesine "
-"bağışta bulunmak istiyorsanız:\n"
+"Claws Mail GPL lisansıyla yayınlanan özgür bir yazılımdır. Claws Mail "
+"projesine bağışta bulunmak istiyorsanız:\n"
 
 #: src/gtk/about.c:158
 msgid ""
@@ -4085,27 +4119,30 @@ msgstr "ağ bağlantısındaki değişimleri saptanması için destek sağlar\n"
 
 #: src/gtk/about.c:543
 msgid ""
-"This program is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 3, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 3, or (at your option) any later "
+"version.\n"
 "\n"
 msgstr ""
 "Bu program bir özgür yazılımdır, Özgür Yazılım Vakfı tarafından yayımlandığı "
-"üzere GNU Genel Kamu Lisansı sözleşme şartları altında bu programı dağıtabilir "
-"ve/ya da değiştirebilirsiniz; 3. sürümü ya da (tercih ettiğiniz) daha sonraki "
-"bir sürüm ile.\n"
+"üzere GNU Genel Kamu Lisansı sözleşme şartları altında bu programı "
+"dağıtabilir ve/ya da değiştirebilirsiniz; 3. sürümü ya da (tercih ettiğiniz) "
+"daha sonraki bir sürüm ile.\n"
 "\n"
 
 #: src/gtk/about.c:549
 msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A "
-"PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
 msgstr ""
-"Bu program yararlı olması umuduyla dağıtılmaktadır fakat HER HANGİ BİR GARANTİ "
-"VERİLMEDEN;  ORTALAMA KALİTE YA DA BELLİ BİR AMACA UYGUNLUK GARANTİSİ dahi ima "
-"edilmeden. Daha fazla ayrıntı için GNU Genel Kamu Lisansına bakın.\n"
+"Bu program yararlı olması umuduyla dağıtılmaktadır fakat HER HANGİ BİR "
+"GARANTİ VERİLMEDEN;  ORTALAMA KALİTE YA DA BELLİ BİR AMACA UYGUNLUK "
+"GARANTİSİ dahi ima edilmeden. Daha fazla ayrıntı için GNU Genel Kamu "
+"Lisansına bakın.\n"
 "\n"
 
 #: src/gtk/about.c:567
@@ -4113,8 +4150,8 @@ msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
 msgstr ""
-"Bu programla beraber GNU Genel Kamu Lisansının bir kopyasını almış olmalısınız. "
-"Almadıysanız, bakın "
+"Bu programla beraber GNU Genel Kamu Lisansının bir kopyasını almış "
+"olmalısınız. Almadıysanız, bakın "
 
 #: src/gtk/about.c:698 src/main.c:2567
 msgid "Session statistics\n"
@@ -4196,63 +4233,63 @@ msgstr "_Sürüm Notları"
 msgid "_Statistics"
 msgstr "İ_statistikler"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "Turuncu"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "Kırmızı"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "Pembe"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "Gök mavisi"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "Mavi"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "Yeşil"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "Kahverengi"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "Gri"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "Açık kahverengi"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "Koyu kırmızı"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "Koyu pembe"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "Çelik mavisi"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "Altın"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "Parlak yeşil"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "Eflatun"
 
@@ -4263,8 +4300,8 @@ msgstr "Posta kutusu sırasını ayarla"
 #: src/gtk/foldersort.c:190
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
-"Dizin listesindeki sırayı değiştirmek için posta kutularını aşağı ya da yukarı "
-"taşıyın."
+"Dizin listesindeki sırayı değiştirmek için posta kutularını aşağı ya da "
+"yukarı taşıyın."
 
 #: src/gtk/foldersort.c:216
 msgid "Mailboxes"
@@ -4396,9 +4433,9 @@ msgstr "Başarısız oldu: bilinmeyen hata (%d)."
 msgid "Configuring..."
 msgstr "Ayarlarnıyor..."
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259 src/prefs_matcher.c:2165
-#: src/prefs_summaries.c:435 src/prefs_summary_column.c:84 src/quote_fmt.c:49
-#: src/summaryview.c:443
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
+#: src/prefs_matcher.c:2165 src/prefs_summaries.c:435
+#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:443
 msgid "Date"
 msgstr "Tarih"
 
@@ -4406,9 +4443,9 @@ msgstr "Tarih"
 msgid "Date:"
 msgstr "Tarih:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256 src/prefs_matcher.c:2162
-#: src/prefs_summaries.c:437 src/prefs_summary_column.c:82 src/quote_fmt.c:50
-#: src/summaryview.c:441
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
+#: src/prefs_matcher.c:2162 src/prefs_summaries.c:437
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:441
 msgid "From"
 msgstr "Kimden"
 
@@ -4436,7 +4473,8 @@ msgid "To"
 msgstr "Alıcı"
 
 #: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164 src/quote_fmt.c:58
+#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
+#: src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4444,8 +4482,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260 src/prefs_matcher.c:2166
-#: src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
+#: src/prefs_matcher.c:2166 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "İleti-ID"
 
@@ -4457,8 +4495,8 @@ msgstr "İleti-ID:"
 msgid "In-Reply-To"
 msgstr "Yanıt-Olarak:"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262 src/prefs_matcher.c:2168
-#: src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
+#: src/prefs_matcher.c:2168 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referanslar"
 
@@ -4466,9 +4504,9 @@ msgstr "Referanslar"
 msgid "References:"
 msgstr "Referanslar:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255 src/prefs_matcher.c:2161
-#: src/prefs_summaries.c:439 src/prefs_summary_column.c:81 src/quote_fmt.c:56
-#: src/summaryview.c:440
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
+#: src/prefs_matcher.c:2161 src/prefs_summaries.c:439
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:440
 msgid "Subject"
 msgstr "Konu"
 
@@ -4565,8 +4603,8 @@ msgstr "Alındı"
 msgid "Received:"
 msgstr "Alındı:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261 src/prefs_matcher.c:2167
-#: src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
+#: src/prefs_matcher.c:2167 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Haber grubu"
 
@@ -4590,8 +4628,9 @@ msgstr "Görünen"
 msgid "Seen:"
 msgstr "Görünen:"
 
-#: 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:2786
+#: 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:2786
 msgid "Status"
 msgstr "Durum"
 
@@ -4880,7 +4919,8 @@ msgid "Icon Legend"
 msgstr "Simge Açıklamaları"
 
 #: src/gtk/icon_legend.c:140
-msgid "The following icons are used to show the status of messages and folders:"
+msgid ""
+"The following icons are used to show the status of messages and folders:"
 msgstr "Bu simgeler ileti ve dizinlerin durumlarını göstermek için kullanılır:"
 
 #: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
@@ -4888,8 +4928,8 @@ msgstr "Bu simgeler ileti ve dizinlerin durumlarını göstermek için kullanıl
 msgid "Input password for %s on %s:"
 msgstr "%s hesabının  %s  bağlantısı için sşifreyi girin:"
 
-#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239 src/gtk/inputdialog.c:258
-#: src/gtk/inputdialog.c:261
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
+#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "%s için şifreyi girin:"
@@ -4898,7 +4938,8 @@ msgstr "%s için şifreyi girin:"
 msgid "Input password:"
 msgstr "Şifreyi girin:"
 
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
+#: src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "Şifreyi girin"
 
@@ -4967,7 +5008,8 @@ msgstr ""
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:498
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:552 src/plugins/fancy/fancy_prefs.c:114
+#: 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:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
@@ -4983,7 +5025,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 "Eklentiler"
 
@@ -5002,7 +5044,8 @@ msgstr "Tanım"
 #: src/gtk/pluginwindow.c:374
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
-msgstr "Eklentiler hakkında daha fazla bilgi için %sClaws Mail sitesine%s bakın."
+msgstr ""
+"Eklentiler hakkında daha fazla bilgi için %sClaws Mail sitesine%s bakın."
 
 #: src/gtk/pluginwindow.c:415
 msgid "Click here to load one or more plugins"
@@ -5025,9 +5068,9 @@ msgid "_Hide"
 msgstr "_Gizle"
 
 #: 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"
@@ -5232,12 +5275,13 @@ msgstr "Gelişmiş Arama"
 
 #: src/gtk/quicksearch.c:510
 msgid ""
-"Extended Search allows the user to define criteria that messages must have in "
-"order to match and be displayed in the message list.\n"
+"Extended Search allows the user to define criteria that messages must have "
+"in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
 msgstr ""
 "Genişletilmiş Arama, kullanıcıya iletilerin eşleşmesi ve ileti listesinde "
-"görünmesi için sahip olmaları gereken kıstas tanımlama olanağı sağlamaktadır.\n"
+"görünmesi için sahip olmaları gereken kıstas tanımlama olanağı "
+"sağlamaktadır.\n"
 "Şu semboller bu iş için kullanılabilir:"
 
 #: src/gtk/quicksearch.c:610
@@ -5302,7 +5346,8 @@ msgstr "Sahibi"
 msgid "Signer"
 msgstr "İmzalayan"
 
-#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194 src/prefs_themes.c:836
+#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
+#: src/prefs_themes.c:836
 msgid "Name: "
 msgstr "Ad: "
 
@@ -5654,8 +5699,8 @@ msgstr "Bilinmeyen hata [%d]"
 msgid ""
 "\n"
 "\n"
-"CRAM-MD5 logins only work if libetpan has been compiled with SASL support and "
-"the CRAM-MD5 SASL plugin is installed."
+"CRAM-MD5 logins only work if libetpan has been compiled with SASL support "
+"and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
@@ -5666,20 +5711,20 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"DIGEST-MD5 logins only work if libetpan has been compiled with SASL support and "
-"the DIGEST-MD5 SASL plugin is installed."
+"DIGEST-MD5 logins only work if libetpan has been compiled with SASL support "
+"and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
-"DIGEST-MD5 ile oturum açma, libetpan SASL desteğiyle derlendiyse ve DIGEST-MD5 "
-"SASL eklentisi yüklüyse çalışmakta."
+"DIGEST-MD5 ile oturum açma, libetpan SASL desteğiyle derlendiyse ve DIGEST-"
+"MD5 SASL eklentisi yüklüyse çalışmakta."
 
 #: src/imap.c:964
 msgid ""
 "\n"
 "\n"
-"SCRAM-SHA-1 logins only work if libetpan has been compiled with SASL support and "
-"the SCRAM SASL plugin is installed."
+"SCRAM-SHA-1 logins only work if libetpan has been compiled with SASL support "
+"and the SCRAM SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
@@ -5690,8 +5735,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"PLAIN logins only work if libetpan has been compiled with SASL support and the "
-"PLAIN SASL plugin is installed."
+"PLAIN logins only work if libetpan has been compiled with SASL support and "
+"the PLAIN SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
@@ -5702,8 +5747,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"LOGIN logins only work if libetpan has been compiled with SASL support and the "
-"LOGIN SASL plugin is installed."
+"LOGIN logins only work if libetpan has been compiled with SASL support and "
+"the LOGIN SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
@@ -5730,10 +5775,11 @@ msgstr "%s adresine bağlanma başarısız oldu."
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s adresine yapılmış IMAP4 bağlantısı koptu. Yeniden bağlanılıyor...\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 sunucusuna bağlanmak için Claws Mail'in ağ erişimine ihtiyacı var."
+msgstr ""
+"IMAP sunucusuna bağlanmak için Claws Mail'in ağ erişimine ihtiyacı var."
 
 #: src/imap.c:1154 src/inc.c:811 src/news.c:388 src/send_message.c:282
 msgid "Insecure connection"
@@ -5741,16 +5787,17 @@ msgstr "Güvensiz bağlantı"
 
 #: 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"
+"This connection is configured to be secured using SSL, but SSL is not "
+"available in this build of Claws Mail. \n"
 "\n"
-"Do you want to continue connecting to this server? The communication would not "
-"be secure."
+"Do you want to continue connecting to this server? The communication would "
+"not be secure."
 msgstr ""
-"Bu bağlantı güvenli olması için SSL kullanılarak ayarlandı fakat Claws Mail'in "
-"bu sürümünde SSL mevcut değil. \n"
+"Bu bağlantı güvenli olması için SSL kullanılarak ayarlandı fakat Claws "
+"Mail'in bu sürümünde SSL mevcut değil. \n"
 "\n"
-"Bu sunucuya bağlanmaya devam etmek istiyor musunuz? İletişim güvenli olmayacak."
+"Bu sunucuya bağlanmaya devam etmek istiyor musunuz? İletişim güvenli "
+"olmayacak."
 
 #: src/imap.c:1161 src/inc.c:818 src/news.c:395 src/send_message.c:289
 msgid "Con_tinue connecting"
@@ -5771,110 +5818,110 @@ msgstr "IMAP4 sunucusuna bağlanılamıyor: %s:%d"
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 sunucusuna bağlanılamıyor: %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 oturumu başlatılamıyor.\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "%s IMAP4 sunucusunda oturum açılamadı.\n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "%s IMAP sunucusunda oturum açılamadı."
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "İletiler ekleniyor..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "İletiler kopyalanıyor..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "silinen işaretler atanamaz\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "%s içindeki abonelikten çıkılan dizinler aranıyor..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "%s içindeki alt dizinler aranıyor..."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu oluşturulamıyor: LIST hatası\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "posta kutusu oluşturulamıyor\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s posta kutusunun adı %s olarak değiştilemiyor\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemiyor\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST başarısız oldu\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "İletiler işaretleniyor..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemiyor: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "Oturum açabilmek için TLS gerekli.\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "Kabiliyeler tazelenemedi.\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
 #, c-format
 msgid ""
-"Connection to %s failed: server requires TLS, but Claws Mail has been compiled "
-"without TLS support.\n"
+"Connection to %s failed: server requires TLS, but Claws Mail has been "
+"compiled without TLS support.\n"
 msgstr ""
-"%s sunucusuna bağlanılamadı: sunucuya bağlanmak için TLS gerek, fakat Claws Mail "
-"TLS desteği olmadan derlenmiş.\n"
+"%s sunucusuna bağlanılamadı: sunucuya bağlanmak için TLS gerek, fakat Claws "
+"Mail TLS desteği olmadan derlenmiş.\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "Sunucuya oturum açma kapatılmış.\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "İleti alınıyor..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "silinen işaretler atanamaz: %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"
+"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 ""
@@ -5964,7 +6011,8 @@ msgid "Input new name for '%s':"
 msgstr "`%s' için yeni bir ad girin:"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:412
-#: src/plugins/rssyl/rssyl_cb_menu.c:198 src/plugins/vcalendar/vcal_folder.c:2049
+#: src/plugins/rssyl/rssyl_cb_menu.c:198
+#: src/plugins/vcalendar/vcal_folder.c:2049
 msgid "Rename folder"
 msgstr "Dizin adını değiştir"
 
@@ -5981,18 +6029,19 @@ msgstr ""
 #: 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 will "
-"not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted. Recovery "
+"will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"'%s' altındaki tüm dizinler ve iletiler kalıcı olarak silinecektir. Bu işlemi "
-"geri almak mümkün değil.\n"
+"'%s' altındaki tüm dizinler ve iletiler kalıcı olarak silinecektir. Bu "
+"işlemi geri almak mümkün değil.\n"
 "\n"
 "Silmek istediğinizden emin misiniz?"
 
 #: 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
+#: 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 "'%s' dizini kaldırılamıyor."
@@ -6127,11 +6176,11 @@ msgstr "LDIF Dosyasını Seçin"
 
 #: src/importldif.c:667
 msgid ""
-"Specify the name for the address book that will be created from the LDIF file "
-"data."
+"Specify the name for the address book that will be created from the LDIF "
+"file data."
 msgstr ""
-"LDIF dosyasından elde edilecek veri ile oluşturulacak adres kitabı için bir isim "
-"belirtin."
+"LDIF dosyasından elde edilecek veri ile oluşturulacak adres kitabı için bir "
+"isim belirtin."
 
 #: src/importldif.c:672
 msgid "File Name"
@@ -6171,19 +6220,21 @@ msgstr "Ek Bilgi"
 
 #: src/importldif.c:807
 msgid ""
-"Choose the LDIF field that will be renamed or selected for import in the list "
-"above. Reserved fields (marked with a tick in the \"R\" column), are "
-"automatically imported and cannot be renamed. A single click in the Select (\"S"
-"\") column will select the field for import with a tick. A single click anywhere "
-"in the row will select that field for rename in the input area below the list. A "
-"double click anywhere in the row will also select the field for import."
+"Choose the LDIF field that will be renamed or selected for import in the "
+"list above. Reserved fields (marked with a tick in the \"R\" column), are "
+"automatically imported and cannot be renamed. A single click in the Select "
+"(\"S\") column will select the field for import with a tick. A single click "
+"anywhere in the row will select that field for rename in the input area "
+"below the list. A double click anywhere in the row will also select the "
+"field for import."
 msgstr ""
 "Yukarıdaki listeden içe aktarmak için adı değiştirlecek ya da seçilecek LDIF "
 "alanını seçin. Ayrılmış alanlar (\"R\" sütununda kalın olarak işaretlenmiş) "
-"doğrudan içe aktarılır ve adı değiştirlemez. Seçim (\"S\") sütununa tek tıklama "
-"ile içe aktarılacak alan seçilecektir. Satırdaki herhangi bir yere tek tıklama "
-"listenin altındaki girdi alanında adı değirilecek alanı seçecektir. Satırdaki "
-"herhangi bir yere çift tıklama ayrıca içe aktarılacak alanı seçecektir."
+"doğrudan içe aktarılır ve adı değiştirlemez. Seçim (\"S\") sütununa tek "
+"tıklama ile içe aktarılacak alan seçilecektir. Satırdaki herhangi bir yere "
+"tek tıklama listenin altındaki girdi alanında adı değirilecek alanı "
+"seçecektir. Satırdaki herhangi bir yere çift tıklama ayrıca içe aktarılacak "
+"alanı seçecektir."
 
 #: src/importldif.c:822
 msgid "The LDIF field can be renamed to the User Attribute name."
@@ -6327,7 +6378,8 @@ msgstr "POP3 sunucusuna bağlanılamıyor: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucusuna bağlanılamıyor: %s:%d\n"
 
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423 src/send_message.c:496
+#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
+#: src/send_message.c:496
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
@@ -6439,8 +6491,8 @@ msgstr ""
 
 #: 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."
+"Session timed out. You may be able to recover by increasing the timeout "
+"value in Preferences/Other/Miscellaneous."
 msgstr ""
 "Oturum zaman aşımına uğradı. Tercihler/Diğer/Muhtelif içindeki zaman aşımı "
 "süresini artırarak kurtarabilirsiniz."
@@ -6513,13 +6565,13 @@ msgstr "Eski ayarları koru"
 
 #: 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."
+"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 ""
 "Bir yedek bulundurmak daha eski bir sürüme dönmenizi sağlayacaktır fakat "
-"önbelleklenmiş IMAP ya da Haberler veriniz varsa bu işlem zaman alacak ve diskte "
-"daha fazla alan kapsayacaktır."
+"önbelleklenmiş IMAP ya da Haberler veriniz varsa bu işlem zaman alacak ve "
+"diskte daha fazla alan kapsayacaktır."
 
 #: src/main.c:390
 msgid "Migration of configuration"
@@ -6548,16 +6600,16 @@ msgstr "(ya da daha eski)"
 #: src/main.c:1448
 #, c-format
 msgid ""
-"The following plugin failed to load. Check the Plugins configuration for more "
-"information:\n"
+"The following plugin failed to load. Check the Plugins configuration for "
+"more information:\n"
 "%s"
 msgid_plural ""
-"The following plugins failed to load. Check the Plugins configuration for more "
-"information:\n"
+"The following plugins failed to load. Check the Plugins configuration for "
+"more information:\n"
 "%s"
 msgstr[0] ""
-"Eklentinin yüklenmesi başarısız oldu. Daha fazla bilgi için Eklenti ayarlarını "
-"denetleyin:\n"
+"Eklentinin yüklenmesi başarısız oldu. Daha fazla bilgi için Eklenti "
+"ayarlarını denetleyin:\n"
 "%s "
 
 #: src/main.c:1499
@@ -6566,19 +6618,21 @@ msgid ""
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
 "mailbox parent folder's context menu to try to fix it."
 msgstr ""
-"Claws Mail ayarlanmış fakat tamamlanmamış bir posta kutusu buldu. Sorunun hatalı "
-"bir IMAP hesabından kaynaklanması muhtemel. Sorunu çözmek için posta kutusunun "
-"ana dizini üzerinde \"Dizin ağacını yenden oluştur\" seçeneğini kullanın."
+"Claws Mail ayarlanmış fakat tamamlanmamış bir posta kutusu buldu. Sorunun "
+"hatalı bir IMAP hesabından kaynaklanması muhtemel. Sorunu çözmek için posta "
+"kutusunun ana dizini üzerinde \"Dizin ağacını yenden oluştur\" seçeneğini "
+"kullanın."
 
 #: 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."
+"probably provided by an out-of-date external plugin. Please reinstall the "
+"plugin and try again."
 msgstr ""
-"Claws Mail ayarlanmış bir posta kutusu buldu fakat posta kutusunu yükleyemedi. "
-"Posta kutusu muhtemelen güncelliğini yitirmiş haricî bir eklenti tarafından "
-"sağlanmakta. Lütfen eklentiyi tekrar yükleyip yeniden deneyin."
+"Claws Mail ayarlanmış bir posta kutusu buldu fakat posta kutusunu "
+"yükleyemedi. Posta kutusu muhtemelen güncelliğini yitirmiş haricî bir "
+"eklenti tarafından sağlanmakta. Lütfen eklentiyi tekrar yükleyip yeniden "
+"deneyin."
 
 #: src/main.c:1750
 msgid "Missing filename\n"
@@ -6613,8 +6667,10 @@ msgstr "  --compose [adres]    posta yazma penceresini açar"
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
-"                         use - as file name for reading from standard input;\n"
-"                         content format: headers first (To: required) until an\n"
+"                         use - as file name for reading from standard "
+"input;\n"
+"                         content format: headers first (To: required) until "
+"an\n"
 "                         empty line, then mail body until end of file."
 msgstr ""
 "  --compose-from-file dosya\n"
@@ -6661,14 +6717,15 @@ msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
 "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\"\n"
-"                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or g: "
-"tag\n"
+"                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or "
+"g: tag\n"
 "                         request: search string\n"
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 "  --search dizin tür terim [yinelenen]\n"
 "                         postaları arar\n"
-"                         dizin ör.: \"#mh/Postakutusu/gelen\" ya da \"Posta\"\n"
+"                         dizin ör.: \"#mh/Postakutusu/gelen\" ya da \"Posta"
+"\"\n"
 "                         tür: s[konu],f[kimden],t[kime],e[genişletilmiş],"
 "m[karışık] ya da g: etiket\n"
 "                         terim: aranacak terim\n"
@@ -6737,10 +6794,11 @@ msgstr "  --version -v           sürüm bilgisini yazdır ve çık"
 
 #: src/main.c:1967
 msgid ""
-"  --version-full -V      output version and built-in features information and "
-"exit"
+"  --version-full -V      output version and built-in features information "
+"and exit"
 msgstr ""
-"  --version-full -V      sürüm ve gömülü özelliklere dair bilgileri yazdır ve çık"
+"  --version-full -V      sürüm ve gömülü özelliklere dair bilgileri yazdır "
+"ve çık"
 
 #: src/main.c:1968
 msgid "  --config-dir           output configuration directory"
@@ -7621,7 +7679,8 @@ msgstr "Posta kutusu"
 #: 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."
+"Maybe some files already exist, or you don't have the permission to write "
+"there."
 msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar zaten mevcut olabilir ya da buraya yazma izniniz olmayabilir."
@@ -7689,7 +7748,8 @@ msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail öntanımlı istemci olarak atandı."
 
 #: src/mainwindow.c:5174
-msgid "Can not register as default client: impossible to write to the registry."
+msgid ""
+"Can not register as default client: impossible to write to the registry."
 msgstr "Öntanımlı istemci olarak atanamıyor: kayıt defterine yazmak olanaksız."
 
 #: src/mainwindow.c:5188 src/setup.c:91
@@ -7775,8 +7835,8 @@ msgstr "mbox dosyasının üzerine yaz"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Bu dosya zaten var. Üzerine yazmak istiyor musunuz?"
 
-#: src/mbox.c:555 src/messageview.c:1852 src/mimeview.c:1842 src/prefs_themes.c:533
-#: src/textview.c:3075
+#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
+#: src/prefs_themes.c:533 src/textview.c:3075
 msgid "Overwrite"
 msgstr "Üzerine yaz"
 
@@ -7825,7 +7885,7 @@ msgstr "Arama tamamlandı"
 msgid "Compose _new message"
 msgstr "Yeni ileti _oluştur"
 
-#: 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 - İleti Görünümü"
 
@@ -7864,64 +7924,64 @@ msgstr ""
 "size gönderilmemiş.\n"
 "Okundu bilgisini göndermemeniz tavsiye edilir."
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "İleti (%s) alınıyor..."
 
-#: src/messageview.c:1409 src/procmime.c:1008
+#: src/messageview.c:1412 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Şifre çözümeledi: %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 "İleti MIME standartlarına uymuyor. Yanlış yorumlanabilir."
 
-#: 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 "Farklı kaydet"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "Var olan dosyanın üzerine yazılsın mı?"
 
-#: 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 "'%s' dosyası kaydedilemedi."
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
 #, c-format
 msgid "Show all %s."
 msgstr "%s tümünü göster."
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "Metnin sadece ilk megabiti gösterilir."
 
-#: 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 "Bu ileti için okundu bilgisi aldınız : ileti alıcı tarafından okundu."
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "Bu ileetide okundu bilgisi istediniz."
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "Bu ileti okundu bilgisi istemekte."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "Bilgiyi gönder"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7929,7 +7989,7 @@ msgstr ""
 "Bu iletinin bir bölümü alındı,\n"
 "ve ileti sunucudan silindi."
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7938,15 +7998,15 @@ msgstr ""
 "Bu iletinin bir bölümü alındı;\n"
 "%s."
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "İndirmek için işaretle"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "Silmek için işaretle"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7955,11 +8015,12 @@ msgstr ""
 "Bu iletinin bir bölümü alındı;\n"
 "%s ve indirilecek."
 
-#: src/messageview.c:2021 src/messageview.c:2034 src/prefs_filtering_action.c:180
+#: src/messageview.c:2024 src/messageview.c:2037
+#: src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "İşareti kaldır"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7968,31 +8029,33 @@ msgstr ""
 "This message has been partially retrieved;\n"
 "%s ve silinecek."
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "Okundu Bilgisi Uyarısı"
 
-#: 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"
-"Please choose which account you want to use for sending the receipt notification:"
+"More than one of your accounts uses the address that this message was sent "
+"to.\n"
+"Please choose which account you want to use for sending the receipt "
+"notification:"
 msgstr ""
 "Hesaplarınızdan bir kaçı bu ileetinin gönderildiği adresi kullanıyor.\n"
 "Lütfen okundu bilgisini göndermek için hangi hesabı kullanacağınızı seçin:"
 
-#: 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 "İ_ptal"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "Uyarı _Gönder"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Yazdırılamıyor: ileti metin barındırmıyor."
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8000,7 +8063,7 @@ msgstr ""
 "\n"
 "  Bu dizinde ileti yok"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8008,7 +8071,7 @@ msgstr ""
 "\n"
 "  İleti silindi"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8016,7 +8079,7 @@ msgstr ""
 "\n"
 "  İleti silindi ya da başka bir dizine taşındı"
 
-#: 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 "Öğrenirken bir sorun meydana geldi.\n"
@@ -8085,7 +8148,8 @@ msgstr "_Hepsini kaydet..."
 msgid "MIME Type"
 msgstr "Mime Türü"
 
-#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036 src/mimeview.c:1041
+#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
+#: src/mimeview.c:1041
 msgid "View full information"
 msgstr "Tüm bilgileri göster"
 
@@ -8105,14 +8169,16 @@ msgstr "%s Denetlemek için simgeye tıklayın ya da '%s' tuşuna basın."
 
 #: src/mimeview.c:1071
 msgid "Timeout checking the signature. Click the icon to try again."
-msgstr "İmza denetimi zaman aşımına uğradı. Tekrar denemek için simgeye tıklayın."
+msgstr ""
+"İmza denetimi zaman aşımına uğradı. Tekrar denemek için simgeye tıklayın."
 
 #: src/mimeview.c:1073
 #, c-format
-msgid "Timeout checking the signature. Click the icon or hit '%s' to try again."
+msgid ""
+"Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
-"İmza denetimi zaman aşımına uğradı. Tekrar denemek için simgeye tıklayın ya da "
-"'%s' tuşuna basın."
+"İmza denetimi zaman aşımına uğradı. Tekrar denemek için simgeye tıklayın ya "
+"da '%s' tuşuna basın."
 
 #: src/mimeview.c:1313
 msgid "Checking signature..."
@@ -8122,8 +8188,8 @@ msgstr "İmza denetleniyor..."
 msgid "Go back to email"
 msgstr "E-postaya geri dön"
 
-#: 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:1761 src/mimeview.c:1850 src/mimeview.c:2042
+#: 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 "Çok bölümlü iletinin bir bölümü kaydedilemedi: %s"
@@ -8172,13 +8238,13 @@ msgstr "Güvenilmeyen ikilik çalıştırılsın mı?"
 
 #: src/mimeview.c:2237
 msgid ""
-"This attachment is an executable file. Executing untrusted binaries is dangerous "
-"and could probably lead to compromission of your computer.\n"
+"This attachment is an executable file. Executing untrusted binaries is "
+"dangerous and could probably lead to compromission of your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
-"Bu eklenti çalıştırılabilir bir dosyadır. Güvenilmeyen ikilikleri çalıştırmak "
-"tehlikelidir ve bilgisayarınızda açığa neden olabilir.\n"
+"Bu eklenti çalıştırılabilir bir dosyadır. Güvenilmeyen ikilikleri "
+"çalıştırmak tehlikelidir ve bilgisayarınızda açığa neden olabilir.\n"
 "\n"
 "Bu dosyayı çalıştırmak istiyor musunuz?"
 
@@ -8219,7 +8285,8 @@ msgstr "%s:%d sunuusuna oturum açmada sorun...\n"
 #: src/news.c:438
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
-msgstr "Libetpan 480 geri dönüş kodunu desteklemediğinden devam etmeyi seçtik\n"
+msgstr ""
+"Libetpan 480 geri dönüş kodunu desteklemediğinden devam etmeyi seçtik\n"
 
 #: src/news.c:447
 msgid "Mode reader failed, continuing nevertheless\n"
@@ -8237,49 +8304,50 @@ msgstr "%s:%d sunucusuna kimlik denetimi hatası yaşandı... \n"
 
 #: src/news.c:491
 msgid "Claws Mail needs network access in order to access the News server."
-msgstr "Haberler sunucusuna erişmek için Claws Mail'in ağ erişimine ihtiyacı var."
+msgstr ""
+"Haberler sunucusuna erişmek için Claws Mail'in ağ erişimine ihtiyacı var."
 
 #: src/news.c:862
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "grup seçilemedi: %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 "grup ayarlanamadı: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "geçersiz makale aralığı: %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 alınamadı\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover alınıyor %d - %d içeren %s...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "xover alınamadı\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "geçersiz xover satırı\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"
+"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 ""
-"Bir ya da daha fazla Haber hesabı tanımladınız. Lâkin Claws Mail'in bu sürümü "
-"Haber desteğine sahip değil; Haber hesab(lar)ınız etkisiz kılındı.\n"
+"Bir ya da daha fazla Haber hesabı tanımladınız. Lâkin Claws Mail'in bu "
+"sürümü Haber desteğine sahip değil; Haber hesab(lar)ınız etkisiz kılındı.\n"
 "\n"
 "Muhtemelen libetpan'ı kurup Claws Mail'i yeniden derlemelisiniz."
 
@@ -8484,8 +8552,9 @@ msgstr "Adreslerin kaydedildiği adres defterinin yolu"
 #: src/plugins/address_keeper/address_keeper_prefs.c:121
 #: src/plugins/bogofilter/bogofilter_gtk.c:278
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:446 src/prefs_filtering_action.c:573
-#: src/prefs_filtering_action.c:580 src/prefs_matcher.c:679
+#: src/plugins/spamassassin/spamassassin_gtk.c:446
+#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
+#: src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Seç..."
 
@@ -8506,7 +8575,8 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "'Bcc' üstbilgisinde bulunan adresleri tut"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-msgid "Exclude addresses matching the following regular expressions (one per line)"
+msgid ""
+"Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
 "Aşağıdaki düzenli ifadelerle eşleşen adresleri hariç tut (satır başına bir)"
 
@@ -8523,10 +8593,10 @@ msgstr "Yedek Oluştur...."
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
 "\n"
-"It enables you to select a mail folder that you want to be archived, and then "
-"choose a name, format and location for the archive. Subfolders can be included "
-"and MD5 checksums can be added for each file in the archive. Several archiving "
-"options are also available.\n"
+"It enables you to select a mail folder that you want to be archived, and "
+"then choose a name, format and location for the archive. Subfolders can be "
+"included and MD5 checksums can be added for each file in the archive. "
+"Several archiving options are also available.\n"
 "\n"
 "The archive can be stored as:\n"
 "\tTAR\n"
@@ -8543,14 +8613,15 @@ msgid ""
 "\n"
 "To activate the archiving feature go to /Tools/Create Archive\n"
 "\n"
-"Default options can be set in /Configuration/Preferences/Plugins/Mail Archiver"
+"Default options can be set in /Configuration/Preferences/Plugins/Mail "
+"Archiver"
 msgstr ""
 "Bu eklenti Claws Mail'e yedekleme özellikleri sağlamakta.\n"
 "\n"
-"Yedeklenmesini istediğiniz bir e-posta dizinini seçtikten sonra, bir isim, arşiv "
-"türü ve yedeğin kaydedileceği yeri seçebilirsiniz. Altdizinlerin içerilmesinin "
-"yanı sıra yedekteki tüm dosyalar için MD5 bütünlüğü de eklenebilir. Daha başka "
-"yedekleme özellikleri de bulunmakta.\n"
+"Yedeklenmesini istediğiniz bir e-posta dizinini seçtikten sonra, bir isim, "
+"arşiv türü ve yedeğin kaydedileceği yeri seçebilirsiniz. Altdizinlerin "
+"içerilmesinin yanı sıra yedekteki tüm dosyalar için MD5 bütünlüğü de "
+"eklenebilir. Daha başka yedekleme özellikleri de bulunmakta.\n"
 "\n"
 "Yedek, aşağıdaki türlerde kaydedilebilir:\n"
 "\tTAR\n"
@@ -8684,13 +8755,15 @@ msgstr "Dizin Boyutu"
 msgid "Compression level"
 msgstr "Sıkıştırma düzeyi"
 
-#: src/plugins/archive/archiver_gtk.c:799 src/plugins/archive/archiver_gtk.c:807
+#: src/plugins/archive/archiver_gtk.c:799
+#: src/plugins/archive/archiver_gtk.c:807
 #: src/plugins/archive/archiver_gtk.c:815
 #: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:507
 msgid "Yes"
 msgstr "Evet"
 
-#: src/plugins/archive/archiver_gtk.c:799 src/plugins/archive/archiver_gtk.c:807
+#: src/plugins/archive/archiver_gtk.c:799
+#: src/plugins/archive/archiver_gtk.c:807
 #: src/plugins/archive/archiver_gtk.c:815
 #: src/plugins/pdf_viewer/poppler_viewer.c:722 src/prefs_folder_item.c:506
 #: src/prefs_summaries.c:372
@@ -8709,7 +8782,8 @@ msgstr "Açıklayıcı adlar"
 msgid "Delete selected files"
 msgstr "Seçilen dosyaları sil"
 
-#: src/plugins/archive/archiver_gtk.c:827 src/plugins/archive/archiver_gtk.c:1203
+#: src/plugins/archive/archiver_gtk.c:827
+#: src/plugins/archive/archiver_gtk.c:1203
 msgid "Select mails before"
 msgstr "Önce e-postaları seç"
 
@@ -8752,7 +8826,8 @@ msgstr "Yedeğin adı"
 msgid "Archive location and name"
 msgstr "Yedek konumu ve adı"
 
-#: src/plugins/archive/archiver_gtk.c:1042 src/plugins/archive/archiver_prefs.c:194
+#: src/plugins/archive/archiver_gtk.c:1042
+#: src/plugins/archive/archiver_prefs.c:194
 #: src/plugins/pgpcore/select-keys.c:421
 msgid "_Select"
 msgstr "_Seç"
@@ -8831,7 +8906,8 @@ msgstr ""
 msgid "R_ename"
 msgstr "Yeniden _adlandır"
 
-#: src/plugins/archive/archiver_gtk.c:1182 src/plugins/archive/archiver_prefs.c:325
+#: src/plugins/archive/archiver_gtk.c:1182
+#: src/plugins/archive/archiver_prefs.c:325
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from at to@subject.\n"
@@ -8868,7 +8944,8 @@ msgstr "Öntanımlı kayıt dizini"
 
 #: src/plugins/archive/archiver_prefs.c:198
 msgid "Click this button to select the default location for saving archives"
-msgstr "Yedeklerin kaydedileceği öntanımlı dizini seçmek için bu dümeye tıklayın"
+msgstr ""
+"Yedeklerin kaydedileceği öntanımlı dizini seçmek için bu dümeye tıklayın"
 
 #: src/plugins/archive/archiver_prefs.c:207
 msgid "Default compression"
@@ -8929,8 +9006,8 @@ msgid ""
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archives"
 msgstr ""
-"Yedekteki her bir dosyaya öntanımlı olarak MD5 değeri eklemek için bu seçeneği "
-"seçin.\n"
+"Yedekteki her bir dosyaya öntanımlı olarak MD5 değeri eklemek için bu "
+"seçeneği seçin.\n"
 "Bu seçeneğin yedek oluşturma süresini oldukça artıracağını\n"
 "göz önünde bulundurun"
 
@@ -9003,8 +9080,8 @@ msgstr "Ek yönetici"
 #: src/plugins/attachwarner/attachwarner.c:217
 #, c-format
 msgid ""
-"An attachment is mentioned in the mail you're sending, but no file was attached. "
-"Mention appears on line %d, which begins with text: %s\n"
+"An attachment is mentioned in the mail you're sending, but no file was "
+"attached. Mention appears on line %d, which begins with text: %s\n"
 "\n"
 "%s"
 msgstr ""
@@ -9025,8 +9102,8 @@ msgstr "Ek uyarıcı"
 
 #: src/plugins/attachwarner/attachwarner.c:296
 msgid ""
-"Warns user if some reference to attachments is found in the message text and no "
-"file is attached."
+"Warns user if some reference to attachments is found in the message text and "
+"no file is attached."
 msgstr ""
 "İleti metninde ekten bahsedilmesine rağmen herhangi bir dosya eklenmediyse "
 "kullanıcıyı uyarır."
@@ -9053,11 +9130,12 @@ msgstr "Alıntı işaretiyle başlayan satırlar"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:122
 msgid ""
-"Exclude quoted lines from checking for the regular expressions above. Note that "
-"handmade quotes cannot be distinguished from quotes generated by replying."
+"Exclude quoted lines from checking for the regular expressions above. Note "
+"that handmade quotes cannot be distinguished from quotes generated by "
+"replying."
 msgstr ""
-"Alıntılanmış satırları yukarıdaki düzenli ifadeler denetlenirken hariç tut. El "
-"ile girilmiş alıntılar cevaplama sırasında ouşturulan alıntılardan ayırt "
+"Alıntılanmış satırları yukarıdaki düzenli ifadeler denetlenirken hariç tut. "
+"El ile girilmiş alıntılar cevaplama sırasında ouşturulan alıntılardan ayırt "
 "edilemez."
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:125
@@ -9065,7 +9143,8 @@ msgid "Forwarded or redirected messages"
 msgstr "Yönlendirilmiş iletiler"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:132
-msgid "Don't check for missing attachments when forwarding or redirecting messages"
+msgid ""
+"Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "İletileri yönlendirirken eksik ekler için denetleme yapma"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
@@ -9074,11 +9153,11 @@ msgstr "İmzalar"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:142
 msgid ""
-"Exclude lines from the first signature-separator onwards from checking for the "
-"regular expressions above"
+"Exclude lines from the first signature-separator onwards from checking for "
+"the regular expressions above"
 msgstr ""
-"İlk imza ayracınından itibaren devam eden satırları yukarıdaki düzenli ifadeler "
-"denetlenirken hariç tut"
+"İlk imza ayracınından itibaren devam eden satırları yukarıdaki düzenli "
+"ifadeler denetlenirken hariç tut"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:148
 msgid "Warn when"
@@ -9107,29 +9186,30 @@ msgstr "Bogofilter: iletiler süzülüyor..."
 
 #: src/plugins/bogofilter/bogofilter.c:612
 msgid ""
-"The Bogofilter plugin couldn't filter a message. The probable cause of the error "
-"is that it didn't learn from any mail.\n"
-"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter with a "
-"few hundred spam and ham messages."
+"The Bogofilter plugin couldn't filter a message. The probable cause of the "
+"error is that it didn't learn from any mail.\n"
+"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter "
+"with a few hundred spam and ham messages."
 msgstr ""
 "Bogofilter eklentisi bir iletiyi süzemedi. Hatanın muhtemel sebebi süzmenin "
 "nasıl yapacağının herhangi bir postadan öğrenilememesi\n"
-".Bogofilter'ı eğitmek için bir kaç yüz iletiyi \"/İşaretle/İstenmeyen\" ve \"/"
-"İşaretle/Zararsız\" seçenekleriyle işaretleyin."
+".Bogofilter'ı eğitmek için bir kaç yüz iletiyi \"/İşaretle/İstenmeyen\" ve "
+"\"/İşaretle/Zararsız\" seçenekleriyle işaretleyin."
 
 #: src/plugins/bogofilter/bogofilter.c:619
 #, c-format
 msgid ""
-"The Bogofilter plugin couldn't filter a message. The command `%s %s %s` couldn't "
-"be run."
-msgstr "Bogofilter eklentisi bir iletiyi süzemedi. `%s %s %s` komutu yürütlemedi."
+"The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
+"couldn't be run."
+msgstr ""
+"Bogofilter eklentisi bir iletiyi süzemedi. `%s %s %s` komutu yürütlemedi."
 
 #: src/plugins/bogofilter/bogofilter.c:766
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: iletiden öğreniyor..."
 
-#: src/plugins/bogofilter/bogofilter.c:779 src/plugins/bogofilter/bogofilter.c:826
-#: src/plugins/bsfilter/bsfilter.c:513
+#: src/plugins/bogofilter/bogofilter.c:779
+#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:513
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Öğrenme başarısız; `%s` %d durumuyla geri döndü."
@@ -9149,15 +9229,16 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter.c:1010
 msgid ""
-"This plugin can check all messages that are received from an IMAP, LOCAL or POP "
-"account for spam using Bogofilter. You will need Bogofilter installed locally.\n"
+"This plugin can check all messages that are received from an IMAP, LOCAL or "
+"POP account for spam using Bogofilter. You will need Bogofilter installed "
+"locally.\n"
 "\n"
-"Before Bogofilter can recognize spam messages, you have to train it by marking a "
-"few hundred spam and ham messages with the use of \"/Mark/Mark as spam\" and \"/"
-"Mark/Mark as ham\".\n"
+"Before Bogofilter can recognize spam messages, you have to train it by "
+"marking a few hundred spam and ham messages with the use of \"/Mark/Mark as "
+"spam\" and \"/Mark/Mark as ham\".\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a specially "
-"designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a "
+"specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
@@ -9169,8 +9250,8 @@ msgstr ""
 "İşaretle/İstenmeyen\" ve \"/İşaretle/Zararsız\" seçenekleriyle işaretleyerek "
 "Bogofilter'ı eğitin.\n"
 "\n"
-"Bir ileti istenmeyen olarak tanımlandığında ileti silinebilir ya da belirtilen "
-"bir dizinde saklanabilir.\n"
+"Bir ileti istenmeyen olarak tanımlandığında ileti silinebilir ya da "
+"belirtilen bir dizinde saklanabilir.\n"
 "\n"
 "Seçeneklere /Yapılandırma/Tercihler/Eklentiler/Bogofilter yoluyla "
 "ulaşabilirsiniz."
@@ -9205,7 +9286,7 @@ msgstr "Bundan daha büyük iletiler denetlenmez"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "KB"
 
@@ -9224,7 +9305,8 @@ msgstr "Sadece istenmeyen olarak işaretle"
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
 #: src/plugins/spamassassin/spamassassin_gtk.c:415
-msgid "Folder for storing identified spam. Leave empty to use the trash folder."
+msgid ""
+"Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "İstenmeyen iletilerin kaydedileceği dizin. Çöpü kullanmak için boş bırakın."
 
@@ -9240,11 +9322,11 @@ msgstr "Emin olunmadığında, taşı"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:250
 msgid ""
-"Folder for storing mail for which spam status is Unsure. Leave empty to use the "
-"Inbox folder."
+"Folder for storing mail for which spam status is Unsure. Leave empty to use "
+"the Inbox folder."
 msgstr ""
-"İstenmeyen olup olmadığından emin olmadığınız iletilerin kaydedileceği dizin. "
-"Gelen kutusunu kullanmak için boş bırakın."
+"İstenmeyen olup olmadığından emin olmadığınız iletilerin kaydedileceği "
+"dizin. Gelen kutusunu kullanmak için boş bırakın."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
 msgid "Click this button to select a folder for storing Unsure mails."
@@ -9268,8 +9350,8 @@ msgstr "Adres defterinde bulunan beyaz listedeki gönderenler"
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
 #: src/plugins/spamassassin/spamassassin_gtk.c:440
 msgid ""
-"Messages coming from your address book contacts will be received in the normal "
-"folder even if detected as spam"
+"Messages coming from your address book contacts will be received in the "
+"normal folder even if detected as spam"
 msgstr ""
 "Adres defterindeki kişilerden gelen iletiler istenmeyen olarak tespit edilse "
 "dahi istenmeyen dizinine taşınmayacak."
@@ -9287,11 +9369,11 @@ msgstr "Beyaz listedeki e-postaları zararsız say"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:286
 msgid ""
-"If Bogofilter thought an email was spam or unsure, but it was whitelisted, learn "
-"it as ham."
+"If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
+"learn it as ham."
 msgstr ""
-"Eğer Bogofilter bir postayı beyaz listede olmasına rağmen istenmeyen ya da emin "
-"olunmayan sayıyorsa, zararsız olarak öğret."
+"Eğer Bogofilter bir postayı beyaz listede olmasına rağmen istenmeyen ya da "
+"emin olunmayan sayıyorsa, zararsız olarak öğret."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:295
 msgid "Bogofilter call"
@@ -9321,20 +9403,21 @@ msgstr "Bsfilter: iletiler süzülüyor..."
 
 #: 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"
-"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with a "
-"few hundred spam and ham messages."
+"The Bsfilter plugin couldn't filter a message. The probable cause of the "
+"error is that it didn't learn from any mail.\n"
+"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with "
+"a few hundred spam and ham messages."
 msgstr ""
-"Bsfilter eklentisi bir iletiyi süzemedi. Hatanın muhtemel sebebi süzmenin nasıl "
-"yapacağının herhangi bir postadan öğrenilememesi\n"
+"Bsfilter eklentisi bir iletiyi süzemedi. Hatanın muhtemel sebebi süzmenin "
+"nasıl yapacağının herhangi bir postadan öğrenilememesi\n"
 ".Bsfilter'ı eğitmek için bir kaç yüz iletiyi \"/İşaretle/İstenmeyen\" ve \"/"
 "İşaretle/Zararsız\" seçenekleriyle işaretleyin."
 
 #: src/plugins/bsfilter/bsfilter.c:401
 #, c-format
 msgid ""
-"The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be run."
+"The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
+"run."
 msgstr "Bsfilter eklentisi bir iletiyi süzemedi. `%s` komutu yürütlemedi."
 
 #: src/plugins/bsfilter/bsfilter.c:502
@@ -9343,15 +9426,16 @@ msgstr "Bsfilter: iletiden öğreniyor..."
 
 #: 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 locally.\n"
+"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 "
+"locally.\n"
 "\n"
-"Before Bsfilter can recognize spam messages, you have to train it by marking a "
-"few hundred spam and ham messages with the use of \"/Mark/Mark as spam\" and \"/"
-"Mark/Mark as ham\".\n"
+"Before Bsfilter can recognize spam messages, you have to train it by marking "
+"a few hundred spam and ham messages with the use of \"/Mark/Mark as spam\" "
+"and \"/Mark/Mark as ham\".\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a specially "
-"designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a "
+"specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
 msgstr ""
@@ -9362,10 +9446,11 @@ msgstr ""
 "İşaretle/İstenmeyen\" ve \"/İşaretle/Zararsız\" seçenekleriyle işaretleyerek "
 "Bsfilter'ı eğitin.\n"
 "\n"
-"Bir ileti istenmeyen olarak tanımlandığında ileti silinebilir ya da belirtilen "
-"bir dizinde saklanabilir.\n"
+"Bir ileti istenmeyen olarak tanımlandığında ileti silinebilir ya da "
+"belirtilen bir dizinde saklanabilir.\n"
 "\n"
-"Seçeneklere /Yapılandırma/Tercihler/Eklentiler/Bsfilter yoluyla ulaşabilirsiniz."
+"Seçeneklere /Yapılandırma/Tercihler/Eklentiler/Bsfilter yoluyla "
+"ulaşabilirsiniz."
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
 #: src/plugins/spamassassin/spamassassin_gtk.c:407
@@ -9374,11 +9459,11 @@ msgstr "İstenmeyeni kaydet"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:209
 msgid ""
-"If Bsfilter thought an email was spam or unsure, but it was whitelisted, learn "
-"it as ham."
+"If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
+"learn it as ham."
 msgstr ""
-"Eğer Bsfilter bir postayı beyaz listede olmasına rağmen istenmeyen ya da emin "
-"olunmayan saydıyorsa, zararsız olarak öğret."
+"Eğer Bsfilter bir postayı beyaz listede olmasına rağmen istenmeyen ya da "
+"emin olunmayan saydıyorsa, zararsız olarak öğret."
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:218
 msgid "Bsfilter call"
@@ -9388,7 +9473,8 @@ msgstr "Bsfilter komutu"
 msgid "Path to bsfilter executable"
 msgstr "Bogofilter ikiliğinin yolu"
 
-#: src/plugins/clamd/clamav_plugin.c:47 src/plugins/clamd/clamav_plugin_gtk.c:553
+#: src/plugins/clamd/clamav_plugin.c:47
+#: src/plugins/clamd/clamav_plugin_gtk.c:553
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
@@ -9461,11 +9547,11 @@ msgstr ""
 
 #: src/plugins/clamd/clamav_plugin.c:328
 msgid ""
-"This plugin uses Clam AntiVirus to scan all messages that are received from an "
-"IMAP, LOCAL or POP account.\n"
+"This plugin uses Clam AntiVirus to scan all messages that are received from "
+"an IMAP, LOCAL or POP account.\n"
 "\n"
-"When a message attachment is found to contain a virus it can be deleted or saved "
-"in a specially designated folder.\n"
+"When a message attachment is found to contain a virus it can be deleted or "
+"saved in a specially designated folder.\n"
 "\n"
 "Because this plugin communicates with clamd via a\n"
 "socket then there are some minimum requirements to\n"
@@ -9662,8 +9748,8 @@ msgstr "Kayıt metni kancası kaydedilemedi"
 
 #: src/plugins/demo/demo.c:76
 msgid ""
-"This Plugin is only a demo of how to write plugins for Claws Mail. It installs a "
-"hook for new log output and writes it to stdout.\n"
+"This Plugin is only a demo of how to write plugins for Claws Mail. It "
+"installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "It is not really useful."
 msgstr ""
@@ -9761,7 +9847,7 @@ msgstr "Bu dosyadaki CSS tüm HTML parçalarına uygulanacak"
 #: 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 "Göz_at"
@@ -9860,12 +9946,13 @@ msgstr "Fancy HTML Okuyucu"
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
-"By default all remote content is blocked. Options can be found in /Configuration/"
-"Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in /"
+"Configuration/Preferences/Plugins/Fancy"
 msgstr ""
-"Bu eklenti WebKit %d.%d.%d kütüphanesini kullanarak HTML e-postaları yorumlar.\n"
-"Öntanımlı olarak tüm uzak içerik engellenmiştir. Seçenekler için /Yapılandırma/"
-"Tercihler/Eklentiler/Fancy"
+"Bu eklenti WebKit %d.%d.%d kütüphanesini kullanarak HTML e-postaları "
+"yorumlar.\n"
+"Öntanımlı olarak tüm uzak içerik engellenmiştir. Seçenekler için /"
+"Yapılandırma/Tercihler/Eklentiler/Fancy"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:200
@@ -9879,15 +9966,15 @@ msgstr "Posta alma kancası kaydedilemedi"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:209
 msgid ""
-"This plugin modifies the downloaded messages. It inserts headers containing some "
-"download information: UIDL, Claws Mail account name, POP server, user ID and "
-"retrieval time.\n"
+"This plugin modifies the downloaded messages. It inserts headers containing "
+"some download information: UIDL, Claws Mail account name, POP server, user "
+"ID and retrieval time.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
 "Bu eklenti indirilen iletileri değiştirir. İndirme bilgilerini içeren bazı "
-"üstbilgileri iletiye ekler: UIDL, Claws Mail hesap adı, POP sunucu, kullanıcı ID "
-"ve iletinin alındığı zaman.\n"
+"üstbilgileri iletiye ekler: UIDL, Claws Mail hesap adı, POP sunucu, "
+"kullanıcı ID ve iletinin alındığı zaman.\n"
 "\n"
 "Seçenekler için /Yapılandırma/Tercihler/Eklentiler/fetchinfo yolunu izleyin"
 
@@ -9908,8 +9995,10 @@ msgid "UIDL"
 msgstr "UIDL"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
-msgid "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
-msgstr "X-FETCH-UIDL üstbilgisini iletiyi dinleyen benzersiz ID ile ekler (POP3)"
+msgid ""
+"Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
+msgstr ""
+"X-FETCH-UIDL üstbilgisini iletiyi dinleyen benzersiz ID ile ekler (POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
@@ -9944,8 +10033,8 @@ msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
-"X-FETCH-TIME üstbilgisini RFC822 formatındaki iletinin alındığı tarih ve zamanla "
-"ekler"
+"X-FETCH-TIME üstbilgisini RFC822 formatındaki iletinin alındığı tarih ve "
+"zamanla ekler"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid "GData plugin: Authorization required"
@@ -9953,20 +10042,21 @@ msgstr "GData eklentisi: Kimlik denetimi gerekmekte"
 
 #: 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"
+"You need to authorize Claws Mail to access your Google contact list to use "
+"the GData plugin.\n"
 "\n"
 "Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that code "
-"in the field below to grant Claws Mail access to your Google contact list."
+"confirmed the authorization, you will get an authorization code. Enter that "
+"code in the field below to grant Claws Mail access to your Google contact "
+"list."
 msgstr ""
-"GData eklentisini kullanabilmeniz için Claws Mail'e Google kişilerinize erişme "
-"iznini vermelisiniz.\n"
+"GData eklentisini kullanabilmeniz için Claws Mail'e Google kişilerinize "
+"erişme iznini vermelisiniz.\n"
 "\n"
 "Aşağıdaki düğmeye basarak Google'ın erişim izinleri sayfasına ulaşın. Erişim "
 "iznine onay verdikten sonra bir erişim izni kodu alacaksınız. Aldığınız kodu "
-"aşağıdaki alana girerek Claws Mail'in Google kişislerinize erişme iznini vermiş "
-"olacaksınız."
+"aşağıdaki alana girerek Claws Mail'in Google kişislerinize erişme iznini "
+"vermiş olacaksınız."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:144
 msgid "Step 1:"
@@ -10039,9 +10129,11 @@ msgstr "GData eklentisi: Erişim izni kodu alındı, erişim izni isteniyor\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:478
 msgid ""
-"GData plugin: No authorization code received, authorization request cancelled\n"
+"GData plugin: No authorization code received, authorization request "
+"cancelled\n"
 msgstr ""
-"GData eklentisi: Erişim izni kodu alınmadı, erişim izni isteği sonlandırıldı\n"
+"GData eklentisi: Erişim izni kodu alınmadı, erişim izni isteği "
+"sonlandırıldı\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:495
 #, c-format
@@ -10056,8 +10148,8 @@ msgstr "GData eklentisi: Kimlik denetimi yenileme başarılı\n"
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData eklentisi: Kimlik denetimi yenileniyor\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78 src/plugins/managesieve/sieve_prefs.c:203
-#: src/prefs_account.c:1749
+#: src/plugins/gdata/cm_gdata_prefs.c:78
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "Kimlik Doğrulama"
 
@@ -10092,8 +10184,8 @@ msgid ""
 "This plugin provides access to the GData protocol for Claws Mail.\n"
 "\n"
 "The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts into "
-"the Tab-address completion.\n"
+"Currently, the only implemented functionality is to include Google Contacts "
+"into the Tab-address completion.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
@@ -10109,7 +10201,8 @@ msgstr ""
 msgid "GData integration"
 msgstr "GData entegrasyonu"
 
-#: src/plugins/libravatar/libravatar.c:374 src/plugins/libravatar/libravatar.c:439
+#: src/plugins/libravatar/libravatar.c:374
+#: src/plugins/libravatar/libravatar.c:439
 #: src/plugins/libravatar/libravatar.c:499
 #: src/plugins/libravatar/libravatar_prefs.c:546
 msgid "Libravatar"
@@ -10224,14 +10317,15 @@ msgid "_Use cached icons"
 msgstr "_Geçici belleğe atılmış simgeleri kullan"
 
 #: src/plugins/libravatar/libravatar_prefs.c:214
-msgid "Keep icons on disk for reusing instead of making another network request"
+msgid ""
+"Keep icons on disk for reusing instead of making another network request"
 msgstr "Tekrar ağdan çekmektense simgeleri diskte tut"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
 msgid "Cache refresh interval"
 msgstr "Geçici bellek yineleme sıklığı"
 
-#: 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 "saat"
@@ -10290,11 +10384,11 @@ msgstr "Kullanıcının tanımladığı bir URL'ye yönlendir"
 
 #: src/plugins/libravatar/libravatar_prefs.c:333
 msgid ""
-"Enter the URL you want to be redirected when no user icon is available. Leave an "
-"empty URL to use the default libravatar orange icon."
+"Enter the URL you want to be redirected when no user icon is available. "
+"Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
-"Kullanıcı simgesi olmadığında yönlendirilmel istediğiniz URL'yi yazın. Öntanımlı "
-"turuncu simgeyi kullanmak istiyorsanız boş bırakın."
+"Kullanıcı simgesi olmadığında yönlendirilmel istediğiniz URL'yi yazın. "
+"Öntanımlı turuncu simgeyi kullanmak istiyorsanız boş bırakın."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
@@ -10326,11 +10420,11 @@ msgstr "saniye"
 
 #: src/plugins/libravatar/libravatar_prefs.c:411
 msgid ""
-"Set to 0 to use global socket I/O timeout. Maximum value must be also less than "
-"global socket I/O timeout."
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
+"than global socket I/O timeout."
 msgstr ""
-"Global socket G/Ç zaman aşımını kullanmak için 0 yap. Azamî değer global soket G/"
-"Ç zaman aşımından az olmalı."
+"Global socket G/Ç zaman aşımını kullanmak için 0 yap. Azamî değer global "
+"soket G/Ç zaman aşımından az olmalı."
 
 #: src/plugins/libravatar/libravatar_prefs.c:455
 msgid "Icon cache"
@@ -10550,7 +10644,8 @@ msgstr "Sieve Filtrelerini Yönet"
 
 #: src/plugins/managesieve/sieve_plugin.c:114
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
-msgstr "Sunucudaki Sieve filtrelerini ManageSieve protokolünü kullanarak yönet."
+msgstr ""
+"Sunucudaki Sieve filtrelerini ManageSieve protokolünü kullanarak yönet."
 
 #: src/plugins/managesieve/sieve_prefs.c:149
 msgid "Enable Sieve"
@@ -10605,27 +10700,29 @@ msgstr "Posta lımı için kullanılan kimlik denetimini kullan"
 msgid "Specify authentication"
 msgstr "Kimlik denetimini belirt"
 
-#: src/plugins/managesieve/sieve_prefs.c:240 src/plugins/vcalendar/vcal_prefs.c:348
+#: 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 "Kullanıcı ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:395 src/plugins/vcalendar/vcal_prefs.c:356
+#: 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 "Parola"
 
-#: 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 "Kimlik doğrulama yöntemi"
 
-#: 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 "Otomatik"
 
@@ -10657,15 +10754,15 @@ msgstr "Kayıt dosyası %s açılamadı: %s\n"
 #: src/plugins/newmail/newmail.c:141
 #, c-format
 msgid ""
-"This plugin writes a header summary to a log file for each mail received after "
-"sorting.\n"
+"This plugin writes a header summary to a log file for each mail received "
+"after sorting.\n"
 "\n"
 "Default is ~/Mail/NewLog\n"
 "\n"
 "Current log is %s"
 msgstr ""
-"Bu eklenti sıraladıktan sonra alınan her ileti için kayıt dosyasına bir üstbilgi "
-"özeti yazar.\n"
+"Bu eklenti sıraladıktan sonra alınan her ileti için kayıt dosyasına bir "
+"üstbilgi özeti yazar.\n"
 "\n"
 "Öntanımlı dizin: ~/Mail/NewLog\n"
 "\n"
@@ -10731,12 +10828,14 @@ msgstr "Bildirim eklentisindeki ana pencere kapatma kancası kaydedilemedi"
 #: src/plugins/notification/notification_plugin.c:280
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr ""
-"Bildirim eklentisindeki simge durumuna küçültmeyi bildirir kanca kaydedilemedi"
+"Bildirim eklentisindeki simge durumuna küçültmeyi bildirir kanca "
+"kaydedilemedi"
 
 #: src/plugins/notification/notification_plugin.c:293
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
-"Bildirim eklentisindeki hesap listesinin değişimini bildirir kanca kaydedilemedi"
+"Bildirim eklentisindeki hesap listesinin değişimini bildirir kanca "
+"kaydedilemedi"
 
 #: src/plugins/notification/notification_plugin.c:306
 msgid "Failed to register theme change hook in the Notification plugin"
@@ -10744,9 +10843,10 @@ msgstr "Bildirim eklentisindeki tema değiştirme kancası kaydedilemedi"
 
 #: src/plugins/notification/notification_plugin.c:422
 msgid ""
-"This plugin provides various ways to notify the user of new and unread email.\n"
-"The plugin is extensively configurable in the plugins section of the preferences "
-"dialog.\n"
+"This plugin provides various ways to notify the user of new and unread "
+"email.\n"
+"The plugin is extensively configurable in the plugins section of the "
+"preferences dialog.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
@@ -11000,8 +11100,9 @@ msgid "Foreground color"
 msgstr "Önplan rengi"
 
 #: src/plugins/notification/notification_prefs.c:928
-#: src/plugins/notification/notification_prefs.c:1147 src/prefs_msg_colors.c:281
-#: src/prefs_msg_colors.c:302 src/prefs_msg_colors.c:323
+#: src/plugins/notification/notification_prefs.c:1147
+#: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
+#: src/prefs_msg_colors.c:323
 msgid "Background"
 msgstr "Arkaplan"
 
@@ -11253,7 +11354,8 @@ msgid "Enter password"
 msgstr "Şifreyi girin"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1327
-msgid "This document is locked and requires a password before it can be opened."
+msgid ""
+"This document is locked and requires a password before it can be opened."
 msgstr "Bu belge kilitlenmiş ve açılması için bir şifre girilmelidir."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1342
@@ -11355,9 +11457,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Uyarı: Postscript ekleri işleyecek %s eklentisi için gerekli olan ghostscript "
-"ikiliği (gs) bulunamadı. Sadece PDF biçimindeki ekler gösterilecek. PostScript "
-"desteğini kullanmak için gs uygulamasını kurun.\n"
+"Uyarı: Postscript ekleri işleyecek %s eklentisi için gerekli olan "
+"ghostscript ikiliği (gs) bulunamadı. Sadece PDF biçimindeki ekler "
+"gösterilecek. PostScript desteğini kullanmak için gs uygulamasını kurun.\n"
 "\n"
 "%s"
 
@@ -11483,8 +11585,8 @@ msgstr "PGP/Core"
 
 #: src/plugins/pgpcore/plugin.c:71
 msgid ""
-"This plugin handles PGP core operations and provides address autocompletion from "
-"the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
+"This plugin handles PGP core operations and provides address autocompletion "
+"from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/GPG and /"
 "Configuration/[Account Preferences]/Plugins/GPG\n"
@@ -11529,10 +11631,11 @@ msgstr "Kullanımda kaldırma süresi"
 
 #: src/plugins/pgpcore/prefs_gpg.c:159
 msgid "Setting to '0' will store the passphrase for the whole session"
-msgstr "'0' olarak ayarlamak parolanın oturum boyunca hafıza tutulmasını sağlar"
+msgstr ""
+"'0' olarak ayarlamak parolanın oturum boyunca hafıza tutulmasını sağlar"
 
 #: 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 "dakikada"
@@ -11553,7 +11656,8 @@ msgstr "GnuPG ikiliğinin yolu"
 msgid ""
 "If left blank the location of the GnuPG executable will be automatically "
 "determined."
-msgstr "Boş bırakıldığında GnuPG ikiliğinin konumu otomatik olarak saptanacaktır."
+msgstr ""
+"Boş bırakıldığında GnuPG ikiliğinin konumu otomatik olarak saptanacaktır."
 
 #: src/plugins/pgpcore/prefs_gpg.c:229
 msgid "Select GnuPG executable"
@@ -11865,7 +11969,8 @@ msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
-"Bir anahtar çifti üretmeden önce hesab bilgilerini \"OK\" ile kaydetmeniz gerek\n"
+"Bir anahtar çifti üretmeden önce hesab bilgilerini \"OK\" ile kaydetmeniz "
+"gerek\n"
 
 #: src/plugins/pgpcore/sgpgme.c:871
 msgid "No PGP key found"
@@ -11873,8 +11978,8 @@ msgstr "PGP anahtarı bulunmadı"
 
 #: 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"
+"Claws Mail did not find a secret PGP key, which means that you won't be able "
+"to sign emails or receive encrypted emails.\n"
 "Do you want to create a new key pair now?"
 msgstr ""
 "Claws Mail bir gizli PGP anahtarı bulamadı, dolayısıyla e-postaları "
@@ -11888,8 +11993,8 @@ msgstr "Yeni bir anahtar çifti üretilemedi: %s"
 
 #: src/plugins/pgpcore/sgpgme.c:971
 msgid ""
-"Generating your new key pair... Please move the mouse around to help generate "
-"entropy..."
+"Generating your new key pair... Please move the mouse around to help "
+"generate entropy..."
 msgstr ""
 "Yeni anahtar çiftiniz üretiliyor... Entropiyi üretimine yardımcı olması için "
 "fareyi hareket ettirin..."
@@ -12020,8 +12125,8 @@ msgstr "Veri imzalama başarısız oldu, içerik yok."
 
 #: src/plugins/pgpinline/pgpinline.c:623
 msgid ""
-"Please note that attachments are not encrypted by the PGP/Inline system, nor are "
-"email headers, like Subject."
+"Please note that attachments are not encrypted by the PGP/Inline system, nor "
+"are email headers, like Subject."
 msgstr ""
 "Ne eklerin ne de 'Konu' gibi e-posta üstbilgilerinin PGP/Inline sistemiyle "
 "şifrelenmediğini dikkate alın."
@@ -12051,20 +12156,21 @@ msgstr "PGP/inline"
 
 #: src/plugins/pgpinline/plugin.c:60
 msgid ""
-"This plugin handles the deprecated Inline method of signing and/or encrypting "
-"mails. You can decrypt mails, verify signatures or sign and encrypt your own "
-"mails.\n"
+"This plugin handles the deprecated Inline method of signing and/or "
+"encrypting mails. You can decrypt mails, verify signatures or sign and "
+"encrypt your own mails.\n"
 "\n"
 "It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy System\n"
+"Preferences]/Privacy and when composing a message from /Options/Privacy "
+"System\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Bu eklenti e-postaları imzalamak ve şifrelemek için artık kullanılmayan Inline "
-"metodunu yönetir. Şifre çözme, imza doğrulama, imzalama ve şifreleme özellikleri "
-"kullanılabilir.\n"
+"Bu eklenti e-postaları imzalamak ve şifrelemek için artık kullanılmayan "
+"Inline metodunu yönetir. Şifre çözme, imza doğrulama, imzalama ve şifreleme "
+"özellikleri kullanılabilir.\n"
 "\n"
 "/Yapılandırma/[Hesap Seçenekleri]/Gizlilik ya da ileti yazarken /Seçenekler/"
 "Gizlilik Sistemi altından Öntanımlı Gizlilik Sistemi olarak seçilebilir\n"
@@ -12096,11 +12202,11 @@ msgstr "Dijital OpenPGP imzası"
 
 #: src/plugins/pgpmime/pgpmime.c:618
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the PGP/Mime "
-"system."
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
 msgstr ""
-"'Konu' gibi e-posta üstbilgilerinin PGP/Mime sistemi tarafından şifrelenmediğini "
-"dikkate alın."
+"'Konu' gibi e-posta üstbilgilerinin PGP/Mime sistemi tarafından "
+"şifrelenmediğini dikkate alın."
 
 #: src/plugins/pgpmime/pgpmime.c:790
 msgid "PGP/Mime"
@@ -12116,15 +12222,16 @@ msgid ""
 "mails, verify signatures or sign and encrypt your own mails.\n"
 "\n"
 "It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy System\n"
+"Preferences]/Privacy and when composing a message from /Options/Privacy "
+"System\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Bu eklenti PGP/Mime ile imzalanmış ve şifrelenmiş postaları yönetir. Postaların "
-"şifresini çözebilir ve imzalarını doğrulayabilir; kendi postalarınızı "
-"imzalayabilir ve şifreleyebilirisiniz.\n"
+"Bu eklenti PGP/Mime ile imzalanmış ve şifrelenmiş postaları yönetir. "
+"Postaların şifresini çözebilir ve imzalarını doğrulayabilir; kendi "
+"postalarınızı imzalayabilir ve şifreleyebilirisiniz.\n"
 "\n"
 "/Yapılandırma/[Hesap Seçenekleri]/Gizlilik ya da ileti yazarken /Seçenekler/"
 "Gizlilik Sistemi altından Öntanımlı Gizlilik Sistemi olarak seçilebilir\n"
@@ -12133,7 +12240,8 @@ msgstr ""
 "\n"
 "GPGME Werner Koch <dd9jn at gnu.org> tarafından 2001 yılında tescillenmiştir."
 
-#: src/plugins/python/python_plugin.c:358 src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:358
+#: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "Python betikleri"
 
@@ -12141,17 +12249,19 @@ msgstr "Python betikleri"
 msgid "Show Python console..."
 msgstr "Python uçbirimini göster..."
 
-#: src/plugins/python/python_plugin.c:503 src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/python/python_plugin.c:503
+#: src/plugins/rssyl/rssyl_feed_props.c:483
 msgid "Refresh"
 msgstr "Yenile"
 
-#: 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 "Gözat"
 
-#: src/plugins/python/python_plugin.c:651 src/plugins/python/python_plugin.c:735
+#: src/plugins/python/python_plugin.c:651
+#: src/plugins/python/python_plugin.c:735
 msgid "Python"
 msgstr "Python"
 
@@ -12162,22 +12272,23 @@ msgstr "Python eklentisindeki \"compose create hook\" kaydedilemedi"
 #: src/plugins/python/python_plugin.c:740
 msgid ""
 "This plugin provides Python integration features.\n"
-"Python code can be entered interactively into an embedded Python console, under "
-"Tools -> Show Python console, or stored in scripts.\n"
+"Python code can be entered interactively into an embedded Python console, "
+"under Tools -> Show Python console, or stored in scripts.\n"
 "\n"
-"These scripts are then available via the menu. You can assign keyboard shortcuts "
-"to them just like it is done with other menu items. You can also put buttons for "
-"script invocation into the toolbars using Claws Mail's builtin toolbar editor.\n"
+"These scripts are then available via the menu. You can assign keyboard "
+"shortcuts to them just like it is done with other menu items. You can also "
+"put buttons for script invocation into the toolbars using Claws Mail's "
+"builtin toolbar editor.\n"
 "\n"
 "You can provide scripts working on the main window by placing files into ~/."
 "claws-mail/python-scripts/main.\n"
 "\n"
-"You can also provide scripts working on an open compose window by placing files "
-"into ~/.claws-mail/python-scripts/compose.\n"
+"You can also provide scripts working on an open compose window by placing "
+"files into ~/.claws-mail/python-scripts/compose.\n"
 "\n"
-"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that are "
-"automatically executed when certain events occur. Currently, the following files "
-"in this directory are recognised:\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
+"are automatically executed when certain events occur. Currently, the "
+"following files in this directory are recognised:\n"
 "\n"
 "compose_any\n"
 "Gets executed whenever a compose window is opened, no matter if that opening "
@@ -12197,10 +12308,10 @@ msgid ""
 "\n"
 "in the interactive Python console.\n"
 "\n"
-"The source distribution of this plugin comes with various example scripts in the "
-"\"examples\" subdirectory. If you wrote a script that you would be interested in "
-"sharing, feel free to send it to me to have it considered for inclusion in the "
-"examples.\n"
+"The source distribution of this plugin comes with various example scripts in "
+"the \"examples\" subdirectory. If you wrote a script that you would be "
+"interested in sharing, feel free to send it to me to have it considered for "
+"inclusion in the examples.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
@@ -12224,9 +12335,9 @@ msgstr ""
 "dizindeki aşağıdaki dosyalar tanınmakta:\n"
 "\n"
 "compose_any\n"
-"İleti yazma penceresi açılınca çalıştırılır, ileti yazma penceresinin açılması "
-"yeni ileti yazma, cevaplama ya da yönlendirme eylemlerinden herhangi biri "
-"olabilir.\n"
+"İleti yazma penceresi açılınca çalıştırılır, ileti yazma penceresinin "
+"açılması yeni ileti yazma, cevaplama ya da yönlendirme eylemlerinden "
+"herhangi biri olabilir.\n"
 "\n"
 "startup\n"
 "Eklenti yüklenirken çalıştırılır\n"
@@ -12295,17 +12406,17 @@ msgstr ""
 
 #: src/plugins/rssyl/plugin.c:65
 msgid ""
-"This plugin allows you to create a mailbox tree where you can add newsfeeds in "
-"RSS 1.0, RSS 2.0 or Atom format.\n"
+"This plugin allows you to create a mailbox tree where you can add newsfeeds "
+"in RSS 1.0, RSS 2.0 or Atom format.\n"
 "\n"
-"Each newsfeed will create a folder with appropriate entries, fetched from the "
-"web. You can read them, and delete or keep old entries."
+"Each newsfeed will create a folder with appropriate entries, fetched from "
+"the web. You can read them, and delete or keep old entries."
 msgstr ""
 "Bu eklenti RSS 1.0, RSS 2.0 ya da Atom türünde haber beslemeleri "
 "ekleyebileceğiniz bir posta kutusu ağacı oluşturmanızı sağlar.\n"
 "\n"
-"Her haber beslemesi web'den alınan uygun girdilerle bir dizin oluşturacaktır. Bu "
-"beslemeleri okuyabilir, silebilir ya da saklayabilirsiniz."
+"Her haber beslemesi web'den alınan uygun girdilerle bir dizin "
+"oluşturacaktır. Bu beslemeleri okuyabilir, silebilir ya da saklayabilirsiniz."
 
 #: src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
@@ -12442,13 +12553,14 @@ msgstr "Başlığın yeniden isimlendirilmesini önemseme"
 
 #: 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."
+"Enable this to keep current folder name, even if feed author changes title "
+"of the feed."
 msgstr ""
-"Besleme yazasrı beslemenin başlığını değiştirse bile mevcut dizin adını korumak "
-"için bunu seç."
+"Besleme yazasrı beslemenin başlığını değiştirse bile mevcut dizin adını "
+"korumak için bunu seç."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:372 src/plugins/vcalendar/vcal_prefs.c:550
+#: src/plugins/rssyl/rssyl_feed_props.c:372
+#: src/plugins/vcalendar/vcal_prefs.c:550
 msgid "Verify SSL certificate validity"
 msgstr "SSL sertifika geçerliliğini doğrula"
 
@@ -12464,9 +12576,9 @@ msgstr "Kaynak URL"
 msgid "Fetch comments on posts aged less than"
 msgstr "Şu tarihten daha yeni tarihli iletilerdeki yorumları al"
 
-#: 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/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 "gün"
 
@@ -12541,7 +12653,8 @@ msgstr "Yeni RSS dizin ağacı için isim girin."
 #: src/plugins/rssyl/rssyl_gtk.c:143
 msgid ""
 "Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write there?"
+"Maybe some files already exist, or you don't have the permission to write "
+"there?"
 msgstr ""
 "Dizin ağacı oluşturulamadı.\n"
 "Bazı dosyalar zaten mevcut olabilir ya da yazmak için yeterli izine sahip "
@@ -12593,10 +12706,11 @@ msgstr "Besleme dizini"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
 msgid ""
-"Instead of using official title, you can enter a different folder name for the "
-"feed."
+"Instead of using official title, you can enter a different folder name for "
+"the feed."
 msgstr ""
-"Resmî ismini kullanmak yerine, besleme için farklı bir dizin adı girebilirsiniz."
+"Resmî ismini kullanmak yerine, besleme için farklı bir dizin adı "
+"girebilirsiniz."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
 msgid "_Edit feed properties after subscribing"
@@ -12683,8 +12797,8 @@ msgstr "Beslemeyi güncellemek için Claws Mail'in ağa erişebilmesi lazım."
 
 #: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
-"Internal problem while upgrading storage format. This should not happen. Please "
-"report this, with debug output attached.\n"
+"Internal problem while upgrading storage format. This should not happen. "
+"Please report this, with debug output attached.\n"
 msgstr ""
 "Depo türü güncellenirken sorunla karşılaşıldı. Bunun olmaması gerekiyordu. "
 "Lütfen debug çıktısıyla beraber bu sorunu bildirin.\n"
@@ -12696,23 +12810,25 @@ msgstr "S/MIME"
 
 #: src/plugins/smime/plugin.c:59
 msgid ""
-"This plugin handles S/MIME signed and/or encrypted mails. You can decrypt mails, "
-"verify signatures or sign and encrypt your own mails.\n"
+"This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
+"mails, verify signatures or sign and encrypt your own mails.\n"
 "\n"
 "It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy System\n"
+"Preferences]/Privacy and when composing a message from /Options/Privacy "
+"System\n"
 "\n"
 "This plugin uses the GPGME library as a wrapper for GnuPG.\n"
-"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and configured.\n"
+"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and "
+"configured.\n"
 "\n"
-"Information about how to get S/MIME certificates working with GPGSM can be found "
-"at:\n"
+"Information about how to get S/MIME certificates working with GPGSM can be "
+"found at:\n"
 "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Bu eklenti S/MIME ile imzalanmış ve şifrelenmiş postaları yönetir. Şifre çözme, "
-"imza doğrulama, imzalama ve şifreleme özellikleri kullanılabilir.\n"
+"Bu eklenti S/MIME ile imzalanmış ve şifrelenmiş postaları yönetir. Şifre "
+"çözme, imza doğrulama, imzalama ve şifreleme özellikleri kullanılabilir.\n"
 "\n"
 "/Yapılandırma/[Hesap Seçenekleri]/Gizlilik altından ya da ileti yazarken /"
 "Seçenekler/Gizlilik Sistemi altından Öntanımlı Gizlilik Sistemi olarak "
@@ -12722,8 +12838,8 @@ msgstr ""
 "Bu eklenti için ayrıca gpgsm, gnupg-agent ve dirmngr uygulamalarına ihtiyaç "
 "var.\n"
 "\n"
-"S/MIME sertifikalarının GPGSM ile nasıl kullanılacağına dair bilgiye bu adresten "
-"ulaşabilirsiniz:\n"
+"S/MIME sertifikalarının GPGSM ile nasıl kullanılacağına dair bilgiye bu "
+"adresten ulaşabilirsiniz:\n"
 "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
 "\n"
 "GPGME Werner Koch <dd9jn at gnu.org> tarafından 2001 yılında tescillenmiştir."
@@ -12747,11 +12863,11 @@ msgstr "Geçici dosya kapatılamadı"
 
 #: src/plugins/smime/smime.c:708
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the S/MIME "
-"system."
+"Please note that email headers, like Subject, are not encrypted by the S/"
+"MIME system."
 msgstr ""
-"'Konu' gibi e-posta üstbilgilerinin S/Mime sistemi tarafından şifrelenmediğini "
-"dikkate alın."
+"'Konu' gibi e-posta üstbilgilerinin S/Mime sistemi tarafından "
+"şifrelenmediğini dikkate alın."
 
 #: src/plugins/spam_report/spam_report.c:299
 msgid "Reporting spam..."
@@ -12826,12 +12942,14 @@ msgid ""
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 "accessible."
 msgstr ""
-"SpamAssassin eklentisi iletiyi süzemedi. Hatanın muhtemele sebebi ulaşılamayan "
-"smapd daemon'u. smapd'nin çalıştığından ve ulaşılabilir olduğundan emin olun."
+"SpamAssassin eklentisi iletiyi süzemedi. Hatanın muhtemele sebebi "
+"ulaşılamayan smapd daemon'u. smapd'nin çalıştığından ve ulaşılabilir "
+"olduğundan emin olun."
 
 #: src/plugins/spamassassin/spamassassin.c:429
 msgid ""
-"Claws Mail needs network access in order to feed the mail to the remote learner."
+"Claws Mail needs network access in order to feed the mail to the remote "
+"learner."
 msgstr ""
 "Bu postayı uzak sunucuya göndermek için Claws Mail'in ağa erişebilmesi gerek."
 
@@ -12845,14 +12963,14 @@ msgstr "SpamAssassin eklentisi yüklenmiş fakat seçeneklerden kapatılmış.\n
 
 #: src/plugins/spamassassin/spamassassin.c:620
 msgid ""
-"This plugin can check all messages that are received from an IMAP, LOCAL or POP "
-"account for spam using a SpamAssassin server. You will need a SpamAssassin "
-"Server (spamd) running somewhere.\n"
+"This plugin can check all messages that are received from an IMAP, LOCAL or "
+"POP account for spam using a SpamAssassin server. You will need a "
+"SpamAssassin Server (spamd) running somewhere.\n"
 "\n"
 "It can also be used for marking messages as Ham or Spam.\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a specially "
-"designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a "
+"specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
@@ -12860,12 +12978,14 @@ msgstr ""
 "hesaplarından alınan bütün iletileri denetleyebilir. Bir yerde çalışan bir "
 "SpamAssassin sunucunuzun (spamd) olmadı gerek.\n"
 "\n"
-"İletileri istenmeyen ya da zararsız olarak işaretlemek için de kullanılabilir.\n"
+"İletileri istenmeyen ya da zararsız olarak işaretlemek için de "
+"kullanılabilir.\n"
 "\n"
-"Bir ileti istenmeyen olarak tanımlandığında ileti silinebilir ya da belirtilen "
-"bir dizinde saklanabilir.\n"
+"Bir ileti istenmeyen olarak tanımlandığında ileti silinebilir ya da "
+"belirtilen bir dizinde saklanabilir.\n"
 "\n"
-"Seçenekler /Yapılandırma/Tercihler/Eklentiler/SpamAssassin altında bulunabilir."
+"Seçenekler /Yapılandırma/Tercihler/Eklentiler/SpamAssassin altında "
+"bulunabilir."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:90
 msgid "Localhost"
@@ -12917,9 +13037,11 @@ msgstr "Unix soketinin konumu"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:386
 msgid ""
-"Maximum time allowed for checking. If the check takes longer it will be aborted."
+"Maximum time allowed for checking. If the check takes longer it will be "
+"aborted."
 msgstr ""
-"Denetleme için izin verilen azamî süre. Denetleme uzun sürerse iptal edilebilir."
+"Denetleme için izin verilen azamî süre. Denetleme uzun sürerse iptal "
+"edilebilir."
 
 #: src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
@@ -12934,7 +13056,8 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:122 src/plugins/tnef_parse/tnef_parse.c:129
+#: src/plugins/tnef_parse/tnef_parse.c:122
+#: src/plugins/tnef_parse/tnef_parse.c:129
 msgid "Failed to write the part data."
 msgstr "Parça verisi yazılamadı."
 
@@ -12950,7 +13073,8 @@ msgstr "VTask verisi ayrıştırılamadı."
 msgid "Failed to parse VCard data."
 msgstr "VCard verisi ayrıştırılamadı."
 
-#: src/plugins/tnef_parse/tnef_parse.c:399 src/plugins/tnef_parse/tnef_parse.c:423
+#: src/plugins/tnef_parse/tnef_parse.c:399
+#: src/plugins/tnef_parse/tnef_parse.c:423
 msgid "TNEF Parser"
 msgstr "TNEF Parser"
 
@@ -12958,8 +13082,8 @@ msgstr "TNEF Parser"
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
-"The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall Hand "
-"<yerase at yerot.com>"
+"The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
+"Hand <yerase at yerot.com>"
 msgstr ""
 "Bu Claws Mail eklentisi uygulama/ms-tnef eklerini okumanızı sağlar.\n"
 "\n"
@@ -13079,25 +13203,25 @@ msgid "Next month"
 msgstr "Sonraki ay"
 
 #: 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"
 
 #: src/plugins/vcalendar/plugin.c:73
 msgid ""
-"This plugin enables vCalendar message handling like that produced by Evolution "
-"or Outlook.\n"
+"This plugin enables vCalendar message handling like that produced by "
+"Evolution or Outlook.\n"
 "\n"
-"When loaded, it will create a vCalendar mailbox in the Folder List, which will "
-"be populated by meetings that you have accepted or created.\n"
-"Meeting requests that you receive will be presented in an appropriate form and "
-"you will be able to accept or decline them.\n"
-"To create a meeting right-click on the vCalendar or Meetings folder and choose "
-"\"New meeting...\".\n"
+"When loaded, it will create a vCalendar mailbox in the Folder List, which "
+"will be populated by meetings that you have accepted or created.\n"
+"Meeting requests that you receive will be presented in an appropriate form "
+"and you will be able to accept or decline them.\n"
+"To create a meeting right-click on the vCalendar or Meetings folder and "
+"choose \"New meeting...\".\n"
 "\n"
-"You will also be able to subscribe to remote webCal feeds,export your meetings "
-"and calendars, publish your free/busy information and retrieve that information "
-"from others."
+"You will also be able to subscribe to remote webCal feeds,export your "
+"meetings and calendars, publish your free/busy information and retrieve that "
+"information from others."
 msgstr ""
 "Bu eklenti Evolution ve Outlook tarafından oluşturulmuş vCalendar ileti "
 "yönetimini sağlar.\n"
@@ -13109,9 +13233,9 @@ msgstr ""
 "Yeni bir toplantı oluşturmak için vCalendar ya da Toplantılar dizinine sağ "
 "tıklayıp \"Yeni tolantı...\" seçin.\n"
 "\n"
-"Ayrıca uzak webCal beslemelerine abone olabilecek; toplantı ve takvimlerinizi "
-"dışarı aktarabilecek; müsait/meşgul bilgisini sunabilecek ve diğerlerinden bu "
-"bilgiyi alabileceksiniz."
+"Ayrıca uzak webCal beslemelerine abone olabilecek; toplantı ve "
+"takvimlerinizi dışarı aktarabilecek; müsait/meşgul bilgisini sunabilecek ve "
+"diğerlerinden bu bilgiyi alabileceksiniz."
 
 #: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
@@ -13123,7 +13247,8 @@ msgstr "İletiden tolantı oluştur..."
 
 #: src/plugins/vcalendar/vcalendar.c:120
 #, c-format
-msgid "You are about to create %d meetings, one by one. Do you want to continue?"
+msgid ""
+"You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr ""
 "Tek tek %d adet toplantı oluşturma üzeresiniz. Devam etmek istiyor musunuz?"
 
@@ -13427,7 +13552,8 @@ msgstr "%s dinizi oluşturulamadı"
 
 #: src/plugins/vcalendar/vcal_folder.c:1908
 msgid "Claws Mail needs network access in order to update the Webcal feed."
-msgstr "Webcal beslemesini güncellemek için Claws Mail'in ağa erişebilmesi lazım."
+msgstr ""
+"Webcal beslemesini güncellemek için Claws Mail'in ağa erişebilmesi lazım."
 
 #: src/plugins/vcalendar/vcal_folder.c:1919
 #, c-format
@@ -13510,15 +13636,15 @@ msgstr "Bu hafta"
 msgid "Later"
 msgstr "Daha sonra"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "Kabul edildi: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "Reddedildi: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "Kesinleştirilmeden Kabul Edildi: "
 
@@ -13627,13 +13753,13 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"It isn't possible to have this meeting with everyone in the previous or next 6 "
-"hours."
+"It isn't possible to have this meeting with everyone in the previous or next "
+"6 hours."
 msgstr ""
 "\n"
 "\n"
-"Bu toplantının önceki ya da sonraki 6 saat içerisinde herkesle yapılması mümkün "
-"değil."
+"Bu toplantının önceki ya da sonraki 6 saat içerisinde herkesle yapılması "
+"mümkün değil."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:817
 #, c-format
@@ -13703,7 +13829,8 @@ msgstr "Herke müsait"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1174
 msgid ""
-"Everyone seems available, but some free/busy information failed to be retrieved."
+"Everyone seems available, but some free/busy information failed to be "
+"retrieved."
 msgstr "Herkes müsait görünüyor; fakat bazı müsait/meşgul bilgileri alınamadı."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1353
@@ -13839,7 +13966,8 @@ msgstr "Takvim dışa akrarımı"
 msgid "Automatically export calendar to"
 msgstr "Takvimi doğrudan buraya aktar"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338 src/plugins/vcalendar/vcal_prefs.c:457
+#: 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 "Yerel bir doya da ya URL'ye aktarabilirsiniz"
 
@@ -13862,16 +13990,19 @@ msgstr "Claws'ın takvimini XFCE'nin Orange saatine kaydet"
 #: src/plugins/vcalendar/vcal_prefs.c:411
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
-"Orange'ın (4.4'den daha üst sürümlerin) Claws Mail'in takvimini görmesini sağlar"
+"Orange'ın (4.4'den daha üst sürümlerin) Claws Mail'in takvimini görmesini "
+"sağlar"
 
 #: src/plugins/vcalendar/vcal_prefs.c:424
 msgid "Export as GNOME shell calendar server"
 msgstr "GNOME Shell takvim sunucusu olarak dışa aktar"
 
 #: src/plugins/vcalendar/vcal_prefs.c:426
-msgid "Register D-Bus calendar server interface to export Claws Mail's calendar"
+msgid ""
+"Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
-"Claws Mail'in takvimini dışa aktarmak için D-Bus takvim sunucusu arayüzünü kayder"
+"Claws Mail'in takvimini dışa aktarmak için D-Bus takvim sunucusu arayüzünü "
+"kayder"
 
 #: src/plugins/vcalendar/vcal_prefs.c:436
 msgid "Free/Busy information"
@@ -13896,11 +14027,11 @@ msgstr "Diğerlerinin müsait/meşgul bilgisini buradan al"
 #: 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"
+"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 ""
-"Yerel bir dosya ya da URL (http://sunucu/yol/dosya.ifb) belirtin. Postanın sol "
-"kısmı için %u; alan adı kısmı için %d kullanın."
+"Yerel bir dosya ya da URL (http://sunucu/yol/dosya.ifb) belirtin. Postanın "
+"sol kısmı için %u; alan adı kısmı için %d kullanın."
 
 #: src/plugins/vcalendar/vcal_prefs.c:538
 msgid "SSL options"
@@ -13957,12 +14088,12 @@ msgstr "POP3 oturumunda hata oluştu\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP komutu desteklenmiyor\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"
 
@@ -14051,122 +14182,123 @@ msgstr "postaları gönderecek komut"
 msgid "Account%d"
 msgstr "Hesap%d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "Yerel"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "Öntanımlı Gelen Kutusu"
 
-#: 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 "Süzülmemiş iletiler bu dizinde tutulacak"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "Güvenli kimlik doğrulaması kullan (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "Sonra sil"
 
-#: 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 gün ve 0 saat : derhal sil"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "Alınan ileti boyutu sınırı"
 
-#: 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."
+"Messages over this limit will be partially retrieved. When selecting them "
+"you will be able to download them fully or delete them."
 msgstr ""
-"Bu boyutun üstündeki iletiler tamamen indirilmeyecek. Seçtiğiniz zaman tamamen "
-"indirebilecek ya da silebileceksiniz."
+"Bu boyutun üstündeki iletiler tamamen indirilmeyecek. Seçtiğiniz zaman "
+"tamamen indirebilecek ya da silebileceksiniz."
 
-#: 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 "Azamî indirilecek yazı sayısı"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "0 girildiyse sonsuz"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "Düz metin"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "IMAP sunucu dizini"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(genellikle boş)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "Sadece abone olunan dizinleri göster"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Verimli ağ kullanımı yöntemi (etiketlerin alınmasını önler)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
-"Bu yöntem daha az ağ verisi kullanır; fakat bazı sunucularla yavaş çalışabilir."
+"Bu yöntem daha az ağ verisi kullanır; fakat bazı sunucularla yavaş "
+"çalışabilir."
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "İletileri alırken süz"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "İletileri alırken eklenti kullanarak süzmeye izin ver"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'E-Posta Al' bu hesap için yeni iletileri denetler"
 
-#: src/prefs_account.c:1722 src/prefs_customheader.c:208 src/prefs_matcher.c:623
-#: src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
+#: 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 "Üstbilgi"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "İleti-ID Oluştur"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "İleti-ID içinde hesap posta adresini gönder"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "Uygulama adı üstbilgisini ekle"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı üstbilgi ekle"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Kimlik Doğrulama (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."
@@ -14174,287 +14306,290 @@ msgstr ""
 "Eğer bu girdileri boş bırakırsanız, posta alımı ile aynı kullanıcı ID ve "
 "parolası kullanılır."
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "Göndermeden önce POP3 ile kimlik denetimi yap"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "POP kimlik doğrulaması zaman aşımı: "
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "İmza"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "İmzayı doğrudan ekle"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "İmza ayracı"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "Aşağıdaki adresleri doğrudan olarak ata"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "İmlâ denetim sözlükleri"
 
-#: src/prefs_account.c:2076 src/prefs_folder_item.c:1080 src/prefs_spelling.c:163
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
+#: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Öntanımlı sözlük"
 
-#: src/prefs_account.c:2089 src/prefs_folder_item.c:1114 src/prefs_spelling.c:176
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
+#: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Öntanımlı diğer sözlü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 "Yaz"
 
-#: 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 "Yanıtla"
 
-#: 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 "Yönlendir"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "Öntanımlı gizlilik sistemi"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "İletileri her zaman imzala"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "İletileri her zaman şifrele"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "İmzalı bir iletiyi yanıtlarken iletileri her zaman imzala"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Şifrelenmiş bir iletiyi yanıtlarken iletileri her zaman şifrele"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Gönderilen iletileri alıcının anahtarının yanı sıra kendi anahtarınızla "
 "şifreleyin"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "Şifrelenmiş iletileri metin dosyası olarak kaydet"
 
-#: 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 "SSL kullanma"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 bağlantısı için SSL kullan"
 
-#: 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 "SSL oturumuna başlamak için STARTTLS komutunu kullan"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 bağlantısı için SSL kullan"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP bağlantısı için SSL kullan"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "Gönder (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "SSL kullanma (fakat, gerekliyse, STARTTLS kullan)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP bağlantısı için SSL kullan"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "İstemci sertifikaları"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "Alım için sertifika"
 
-#: 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 "PKCS12 ya da PEM olarak istemci sertifikası"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "Gönderim için sertifika"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "Geçerli SSL sertifikaları doğrudan kabul et"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "Bloklanmamış SSL Kullan"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "SSL bağlantı sorunlarınız varsa bunu kapatın"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP portu"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "POP3 portu"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "IMAP4 portu"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "NNTP portu"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "Alan adı"
 
-#: 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."
+"The domain name will be used in the generated Message-ID, and when "
+"connecting to SMTP servers."
 msgstr ""
-"Alan adı, oluşturulan İleti-ID'sinde ve SMTP sunuculara bağlanırken kullanılacak."
+"Alan adı, oluşturulan İleti-ID'sinde ve SMTP sunuculara bağlanırken "
+"kullanılacak."
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "Sunucuyla iletişim kurmak için komut kullan"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mükerrer iletileri okundu olarak ve renkle işaretle:"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "Gönderilen iletileri buraya koy"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "Kuyruktaki iletileri buraya koy"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "Taslak iletilerini buraya koy"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "Silinen iletileri buraya koy"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "Hesap adı girilmemiş."
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "Posta adresi girilmemiş."
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "SMTP sunucu girilmemiş."
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "Kullanıcı ID girilmemiş."
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "POP3 sunucu girilmemiş."
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "Öntanımlı Gelen Kutusu yok."
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 sunucu girilmemiş."
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "NNTP sunucu girilmemiş."
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "yerel posta kutusunun adı girilmemiş."
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "mail komutu girilmemiş"
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "Al"
 
-#: 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 "Şablonlar"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "Yeni hesap için tercihler"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Hesap tercihleri"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Başarısız oldu (yanlış adres)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "İmza dosyasını seç"
 
-#: 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 "Sertifika dosyasını seç"
 
-#: 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 (eklenti yüklü değil)"
@@ -14514,8 +14649,9 @@ msgid "Move selected action down"
 msgstr "Seçilen eylemi aşağı taşı"
 
 #: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:838 src/prefs_filtering.c:839
-#: src/prefs_filtering.c:949 src/prefs_matcher.c:896 src/prefs_template.c:472
+#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:896
+#: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Yeni)"
 
@@ -14586,9 +14722,9 @@ msgid "The entry was not saved. Close anyway?"
 msgstr "Girdi kaydedilmesi. Yine de kapat?"
 
 #: 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: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
 msgid "_Continue editing"
 msgstr "_Düzenlemeye devam et"
 
@@ -14626,7 +14762,8 @@ msgstr "kullanıcının sunduğu metni komutun standart girdisine göndererek"
 
 #: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
-msgstr "kullanıcının sunduğu gizli metni komutun standart girdisinne göndererek"
+msgstr ""
+"kullanıcının sunduğu gizli metni komutun standart girdisinne göndererek"
 
 #: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
@@ -14653,7 +14790,8 @@ msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "RFC822/2822 türündeki seçilen iletinin dosyası için"
 
 #: src/prefs_actions.c:988
-msgid "for the list of the files of the selected messages in RFC822/2822 format"
+msgid ""
+"for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "RFC822/2822 türündeki seçilen iletilerin dosyalarının listesi için"
 
 #: src/prefs_actions.c:989
@@ -14686,13 +14824,14 @@ msgstr "Eylemler"
 
 #: src/prefs_actions.c:1005
 msgid ""
-"The Actions feature is a way for the user to launch external commands to process "
-"a complete message file or just one of its parts."
+"The Actions feature is a way for the user to launch external commands to "
+"process a complete message file or just one of its parts."
 msgstr ""
-"Eylemler özelliği kullanıcının harici bir komutu bir iletinin tamamını ya da bir "
-"bölümünü işlemek için kullanabileceği bir yöntemtim."
+"Eylemler özelliği kullanıcının harici bir komutu bir iletinin tamamını ya da "
+"bir bölümünü işlemek için kullanabileceği bir yöntemtim."
 
-#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695 src/prefs_template.c:1121
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
+#: src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "Çoğal_t"
 
@@ -14700,29 +14839,30 @@ msgstr "Çoğal_t"
 msgid "Current actions"
 msgstr "Mevcut eylemler"
 
-#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074 src/prefs_filtering.c:1132
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
+#: src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "Eylem dizisi geçerli değil."
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Merhaba.\\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 yazdı:\\n\\n%q\\n%X\n"
 "%d tarihinde\\n%f yazdı:\\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"
+"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
+"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
 "\\n\\nYönlendirilen iletiye başla:\\n\\n?d{Tarih: %d\\n}?f{Kimden: %f\\n}?"
 "t{Kime: %t\\n}?c{Cc: %c\\n}?n{Habergrubu: %n\\n}?s{Konu: %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"
 
@@ -14865,7 +15005,8 @@ msgstr "Görüntü doğru türde değil (XBM)."
 
 #: src/prefs_customheader.c:614
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
-msgstr "`compface` çalıştırılamadı. $PATH değişkeni içinde olduğundna emin olun."
+msgstr ""
+"`compface` çalıştırılamadı. $PATH değişkeni içinde olduğundna emin olun."
 
 #: src/prefs_customheader.c:620
 #, c-format
@@ -14939,13 +15080,14 @@ msgstr "'Metin olarak görüntüle' için komut"
 
 #: src/prefs_ext_prog.c:223
 msgid ""
-"This option enables MIME parts to be displayed in the message view via a script "
-"when using the 'Display as text' contextual menu item"
+"This option enables MIME parts to be displayed in the message view via a "
+"script when using the 'Display as text' contextual menu item"
 msgstr ""
 "Bu seçenek, 'Metin olarak göster' menü seçeneği kullanıldığında bir betik "
 "aracılığıyla ileti görünümünde gösterilecek MIME bölümleri etkinleştirir."
 
-#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138 src/prefs_message.c:354
+#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
+#: src/prefs_message.c:354
 msgid "Message View"
 msgstr "İleti Görünümü"
 
@@ -15013,7 +15155,8 @@ msgstr "Yeniden yönlendir"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
 #: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87 src/summaryview.c:446
+#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87
+#: src/summaryview.c:446
 msgid "Score"
 msgstr "Önem"
 
@@ -15096,7 +15239,8 @@ msgstr "Etiket adı boş bırakılmış."
 msgid "No action was defined."
 msgstr "Eylem tanımlanmamış."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160 src/quote_fmt.c:79
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
+#: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "lafzî %"
 
@@ -15104,7 +15248,8 @@ msgstr "lafzî %"
 msgid "filename (should not be modified)"
 msgstr "dosya adı (düzenlenmemeli)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170 src/quote_fmt.c:87
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
+#: src/quote_fmt.c:87
 msgid "new line"
 msgstr "yeni satır"
 
@@ -15122,8 +15267,8 @@ msgstr "Süzme Eylemi: 'Çalıştır'"
 
 #: src/prefs_filtering_action.c:1276
 msgid ""
-"'Execute' allows you to send a message or message element to an external program "
-"or script.\n"
+"'Execute' allows you to send a message or message element to an external "
+"program or script.\n"
 "The following symbols can be used:"
 msgstr ""
 "'Çalıştır' bir iletiyi ya da ileti elemanını harici bir program ya da betiğe "
@@ -15154,7 +15299,8 @@ msgstr "Mevcut eylemlerin listesi"
 msgid "Filtering/Processing configuration"
 msgstr "Süzme/İşleme yapılandırması"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:867 src/prefs_filtering.c:981
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
+#: src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Hepsi"
@@ -15296,9 +15442,9 @@ msgid ""
 "However, you can set them for the whole mailbox tree by using \"Apply to "
 "subfolders\"."
 msgstr ""
-"Bu dizin üst seviye bir dizin olduğu için bu seçenekler kaydedilmeyecek. Lâkin, "
-"bu seçenekleri \"Alt dizinlere uyggula\" seçeneğini kullanarak tüm posta kutusu "
-"ağacı için atayabilirsiniz."
+"Bu dizin üst seviye bir dizin olduğu için bu seçenekler kaydedilmeyecek. "
+"Lâkin, bu seçenekleri \"Alt dizinlere uyggula\" seçeneğini kullanarak tüm "
+"posta kutusu ağacı için atayabilirsiniz."
 
 #: src/prefs_folder_item.c:274 src/prefs_folder_item.c:876
 msgid ""
@@ -15358,8 +15504,8 @@ msgstr "Yeni posta için tara"
 
 #: src/prefs_folder_item.c:475
 msgid ""
-"Turn this option on if mail is delivered directly to this folder by server side "
-"filtering on IMAP or by an external application"
+"Turn this option on if mail is delivered directly to this folder by server "
+"side filtering on IMAP or by an external application"
 msgstr ""
 "Eğer posta, sunucu tarafındaki IMAP süzmesinde ya da harici bir programdan "
 "dolayı doğrudan bu dizine taşınıyorsa, bu seçeneği açın."
@@ -15370,8 +15516,8 @@ msgstr "Çk bölümlü iletilerin HTML bölümünü seç"
 
 #: src/prefs_folder_item.c:512
 msgid ""
-"\"Default\" will follow global preference (found in /Preferences/Message View/"
-"Text Options)"
+"\"Default\" will follow global preference (found in /Preferences/Message "
+"View/Text Options)"
 msgstr ""
 "\"Öntanımlı\" (/Tercihler/İleti Görünümü/Metin Seçenekleri altında bulunan) "
 "globaltercihleri uygulayacak"
@@ -15425,7 +15571,8 @@ msgstr "Geçici bellekten vaz geç"
 #: src/prefs_folder_item.c:1673
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr ""
-"Bu dizin için yerel geçici belleğe alınmış veriden vaz geçmek istiyor musunuz?"
+"Bu dizin için yerel geçici belleğe alınmış veriden vaz geçmek istiyor "
+"musunuz?"
 
 #: src/prefs_folder_item.c:1803
 msgid "General"
@@ -15530,8 +15677,8 @@ msgid ""
 msgstr ""
 "İşaretlendiğinde, süzme ve işleme kurallarını kayıt edilmesini açar.\n"
 "İlgili kayıt 'Araçlar/Süzme kayıtları' altındadır.\n"
-"Dikkat: bu seçeneği açmak süzme ve işlemeyi yavaşlatacaktır, binlerce iletiye "
-"kurallar uygulanırken dikkate alınması gerekir."
+"Dikkat: bu seçeneği açmak süzme ve işlemeyi yavaşlatacaktır, binlerce "
+"iletiye kurallar uygulanırken dikkate alınması gerekir."
 
 #: src/prefs_logging.c:187
 msgid "Log filtering/processing when..."
@@ -15576,10 +15723,10 @@ msgstr "Yüksek"
 #: src/prefs_logging.c:238
 msgid ""
 "Select the level of detail of the logging.\n"
-"Choose Low to see when rules are applied, which conditions match or don't match "
-"and what actions are performed.\n"
-"Choose Medium to see more details about the message that is being processed, and "
-"why rules are skipped.\n"
+"Choose Low to see when rules are applied, which conditions match or don't "
+"match and what actions are performed.\n"
+"Choose Medium to see more details about the message that is being processed, "
+"and why rules are skipped.\n"
 "Choose High to explicitly show the reason why all rules are processed or "
 "skipped, and why all conditions are matched or not matched.\n"
 "Caution: the higher the level, the greater the impact on performance."
@@ -15587,8 +15734,8 @@ msgstr ""
 "Kayıt detaylarının seviyesini seçin.\n"
 "Kuralların uygulandığını, hangi koşulların eşleşip eşleşmediğini ve hangi "
 "eylemlerin gerçekleştirildiğini görmek için Düşük'ü seçin.\n"
-"İşlenen ileti hakkında daha fazla detay ve kuralların neden atlandığını görmek "
-"için Orta'yı seçin.\n"
+"İşlenen ileti hakkında daha fazla detay ve kuralların neden atlandığını "
+"görmek için Orta'yı seçin.\n"
 "Bütün kuralların neden işlendiğinin ya da atlandığının sebebini ve neden tüm "
 "koşulların eşleşip eşleşmediğini özellikle göstermek için Yüksek'i seçin.\n"
 "Dikkat: seviye yükseldikte peformansa etkisi o oranda yüksek olacaktır."
@@ -15871,13 +16018,13 @@ msgstr "'%s' üstbilgisindeki adres(ler)"
 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 ""
 "Defter/dizin konumu atanmamış.\n"
 "\n"
-"%s yolunun tüm adres defterini ifade etmesini istiyorsanız, '%s' yolunu defter/"
-"dizin listesinden seçmelisiniz. "
+"%s yolunun tüm adres defterini ifade etmesini istiyorsanız, '%s' yolunu "
+"defter/dizin listesinden seçmelisiniz. "
 
 #: src/prefs_matcher.c:1841
 msgid "Headers part"
@@ -15969,8 +16116,8 @@ msgstr "Tür Eşleştir: 'Test'"
 
 #: src/prefs_matcher.c:2182
 msgid ""
-"'Test' allows you to test a message or message element using an external program "
-"or script. The program will return either 0 or 1.\n"
+"'Test' allows you to test a message or message element using an external "
+"program or script. The program will return either 0 or 1.\n"
 "\n"
 "The following symbols can be used:"
 msgstr ""
@@ -16066,8 +16213,8 @@ msgstr "Metin Seçenekleri"
 #: 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"
+"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"
@@ -16112,7 +16259,8 @@ msgstr "Üçden fazla alıntı seviyesi varsa renkler tekrar kullanılacaktır"
 msgid "1st Level"
 msgstr "1. Seviye"
 
-#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216 src/prefs_msg_colors.c:242
+#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
+#: src/prefs_msg_colors.c:242
 msgid "Text"
 msgstr "Metin"
 
@@ -16181,8 +16329,8 @@ msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgstr ""
-"Hedef dizin için renk seçin. Hedef dizin, 'İletileri silerken ve taşırken hemen "
-"çalıştır' şeçeneği kapalı olduğunda kullanılır. "
+"Hedef dizin için renk seçin. Hedef dizin, 'İletileri silerken ve taşırken "
+"hemen çalıştır' şeçeneği kapalı olduğunda kullanılır. "
 
 #: src/prefs_msg_colors.c:384
 msgid "Target folder"
@@ -16319,12 +16467,12 @@ msgstr "İsteğe göre uyarlanabilen klavye kısayollarını aç"
 
 #: 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"
+"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 ""
-"Seçildiğinde, menü ögesine odaklanıp bir tuş terkibine basarak menü ögelerinin "
-"çoğunun klavye kısayollarını değiştirebilirsiniz.\n"
+"Seçildiğinde, menü ögesine odaklanıp bir tuş terkibine basarak menü "
+"ögelerinin çoğunun klavye kısayollarını değiştirebilirsiniz.\n"
 "Varolan klavye kısayollarının değişmemesini istiyorsanız, seçimi kaldırın."
 
 #: src/prefs_other.c:527
@@ -16380,8 +16528,9 @@ 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 ""
-"Silmeden önce dosyaların üzerine rassal veri yazmak için 'shred' uygulamasını "
-"kullan. Silme işlemi yavaşlayacaktır. Uyarılar için shred man sayfasını okuyun."
+"Silmeden önce dosyaların üzerine rassal veri yazmak için 'shred' "
+"uygulamasını kullan. Silme işlemi yavaşlayacaktır. Uyarılar için shred man "
+"sayfasını okuyun."
 
 #: src/prefs_other.c:604
 msgid "Synchronise offline folders as soon as possible"
@@ -16522,8 +16671,8 @@ msgstr "Giden Kodlaması"
 
 #: src/prefs_send.c:218
 msgid ""
-"If 'Automatic' is selected, the optimal encoding for the current locale will be "
-"used"
+"If 'Automatic' is selected, the optimal encoding for the current locale will "
+"be used"
 msgstr ""
 "Eğer 'Doğrudan' seçildiyse, kullanılan yerel ayar için en uygun kodlama "
 "seçilecektir."
@@ -16790,7 +16939,8 @@ msgstr "ondalık sayı olarak yıl"
 msgid "the time zone or name or abbreviation"
 msgstr "zaman dilimi, adı ya da kısaltılmış adı"
 
-#: src/prefs_summaries.c:192 src/prefs_summaries.c:240 src/prefs_summaries.c:561
+#: src/prefs_summaries.c:192 src/prefs_summaries.c:240
+#: src/prefs_summaries.c:561
 msgid "Date format"
 msgstr "Tarih biçimi"
 
@@ -16880,10 +17030,11 @@ msgstr "İletileri silerken ve taşırken hemen çalıştır"
 
 #: src/prefs_summaries.c:518
 msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/Execute'"
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
 msgstr ""
-"'Araçlar/Çalıştır' seçeneğini seçene kadar iletilerin taşınması, kopyalanmasıve "
-"silinmesini ötele"
+"'Araçlar/Çalıştır' seçeneğini seçene kadar iletilerin taşınması, "
+"kopyalanmasıve silinmesini ötele"
 
 #: src/prefs_summaries.c:521
 msgid "Mark message as read"
@@ -16919,8 +17070,8 @@ msgstr "Üstbilgi adlarını çevir"
 
 #: src/prefs_summaries.c:604
 msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be translated "
-"into your language."
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
 msgstr ""
 "Öntanımlı üstbilgilerin görünümü ('Kimden:', 'Konu:' gibi) ana dilinize "
 "çevrilecektir."
@@ -17054,7 +17205,8 @@ msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Şablonunun \"Bcc\" kısmı geçersiz bir e-posta adresi barındırıyor."
 
 #: src/prefs_template.c:835
-msgid "The \"Reply-To\" field of the template contains an invalid email address."
+msgid ""
+"The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "Şablonunun \"Yanıtla\" kısmı geçersiz bir e-posta adresi barındırıyor."
 
 #: src/prefs_template.c:841
@@ -17411,16 +17563,16 @@ msgstr "SMTP oturumunda hata meydana geldi."
 
 #: src/procmsg.c:1660
 msgid ""
-"No specific account has been found to send, and an error happened during SMTP "
-"session."
+"No specific account has been found to send, and an error happened during "
+"SMTP session."
 msgstr ""
-"Göndermek için belirli bir hesap bulunamadı ve SMTP oturumu sırasında bir hata "
-"meydana geldi."
+"Göndermek için belirli bir hesap bulunamadı ve SMTP oturumu sırasında bir "
+"hata meydana geldi."
 
 #: src/procmsg.c:1668
 msgid ""
-"Couldn't determine sending information. Maybe the email hasn't been generated by "
-"Claws Mail."
+"Couldn't determine sending information. Maybe the email hasn't been "
+"generated by Claws Mail."
 msgstr ""
 "Gönderme bilgisi saptanamadı. E-posta Claws Mail tarafından oluşturulmamış "
 "olabilir."
@@ -17582,7 +17734,8 @@ msgstr ""
 
 #: src/quote_fmt.c:91
 msgid ""
-"insert <span style=\"oblique\">expr</span> if x is not set, where x is one of\n"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
+"of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
 msgstr ""
@@ -17593,8 +17746,8 @@ msgstr ""
 #: src/quote_fmt.c:92
 msgid ""
 "insert file:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file to "
-"insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to insert"
 msgstr ""
 "dosya ekle:\n"
 "<span style=\"oblique\">sub_expr</span> eklenecek dosya yolu olarak "
@@ -17603,11 +17756,13 @@ msgstr ""
 #: src/quote_fmt.c:93
 msgid ""
 "insert program output:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to get\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
+"get\n"
 "the output from"
 msgstr ""
 "uygulama çıktısı ekle:\n"
-"<span style=\"oblique\">sub_expr</span> çıktıyı almak için kullanılacak komut\n"
+"<span style=\"oblique\">sub_expr</span> çıktıyı almak için kullanılacak "
+"komut\n"
 "satırı olarak değerlendirilir"
 
 #: src/quote_fmt.c:94
@@ -17623,8 +17778,8 @@ msgstr ""
 #: src/quote_fmt.c:95
 msgid ""
 "attach file:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file to "
-"attach"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to attach"
 msgstr ""
 "dosya ekle:\n"
 "<span style=\"oblique\">sub_expr</span> eklenecek dosya yolu olarak "
@@ -17676,11 +17831,11 @@ msgstr "Yeni ileti yazarken şablon kullan"
 
 #: src/quote_fmt.c:197
 msgid ""
-"Override From header. This doesn't change the account used to compose the new "
-"message."
+"Override From header. This doesn't change the account used to compose the "
+"new message."
 msgstr ""
-"Kimden üstbilgisinin üstüne yaz. Yeni iletiyi göndermek için kullanılan hesabı "
-"değiştirmez."
+"Kimden üstbilgisinin üstüne yaz. Yeni iletiyi göndermek için kullanılan "
+"hesabı değiştirmez."
 
 #: src/quote_fmt.c:299
 msgid "Use template when replying to messages"
@@ -17689,7 +17844,8 @@ msgstr "İletileri cevaplarken şablon kullan"
 #: src/quote_fmt.c:323
 msgid "Override From header. This doesn't change the account used to reply."
 msgstr ""
-"Kimden üstbilgisinin üstüne yaz. Cevaplamak için kullanılan hesabı değiştirmez."
+"Kimden üstbilgisinin üstüne yaz. Cevaplamak için kullanılan hesabı "
+"değiştirmez."
 
 #: src/quote_fmt.c:334 src/quote_fmt.c:464
 msgid "Quotation mark"
@@ -17937,8 +18093,10 @@ msgstr "Okunmamış ileti bulunamadı. Sondan aratılsın mı?"
 
 #: 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 "İçsel hata: prefs_common.next_unread_msg_dialog için beklenmedik değer\n"
+msgid ""
+"Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
+msgstr ""
+"İçsel hata: prefs_common.next_unread_msg_dialog için beklenmedik değer\n"
 
 #: src/summaryview.c:1844
 msgid "No unread messages."
@@ -18141,8 +18299,10 @@ msgstr "Ü_zerine yaz"
 
 #: src/summaryview.c:4861
 #, c-format
-msgid "You are about to print %d messages, one by one. Do you want to continue?"
-msgstr "%d adet iletiyi bir bir yazdırmak üzeresiniz. Devam etmek istiyor musunuz?"
+msgid ""
+"You are about to print %d messages, one by one. Do you want to continue?"
+msgstr ""
+"%d adet iletiyi bir bir yazdırmak üzeresiniz. Devam etmek istiyor musunuz?"
 
 #: src/summaryview.c:5321
 msgid "Building threads..."
@@ -18314,7 +18474,8 @@ msgstr "     - Kaydetmek için seçim yapın "
 msgid "'Save as...'"
 msgstr "'Farklı kaydet...'"
 
-#: src/textview.c:992 src/textview.c:1004 src/textview.c:1016 src/textview.c:1026
+#: src/textview.c:992 src/textview.c:1004 src/textview.c:1016
+#: src/textview.c:1026
 msgid " (Shortcut key: '"
 msgstr " (Kısayol tuşu: '"
 
@@ -18832,7 +18993,8 @@ msgstr "Posta kutusu adı:"
 
 #: src/wizard.c:1039
 msgid ""
-"You can also specify an absolute path, for example: \"/home/john/Documents/Mail\""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
 msgstr ""
 "Ayrıca tam yolu da girebilirsiniz, misal: \"/home/ahmed/Belgeler/Postalar\""
 
@@ -18928,14 +19090,15 @@ msgstr "Claws Mail'e Hoş Geldiniz"
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
-"We will begin by defining some basic information about you and your most common "
-"mail options so that you can start to use Claws Mail in less than five minutes."
+"We will begin by defining some basic information about you and your most "
+"common mail options so that you can start to use Claws Mail in less than "
+"five minutes."
 msgstr ""
 "Claws Mail kurulum sihirbazına hoş geldiniz.\n"
 "\n"
 "Size ve en sık kullandığınız kimi e-posta seçeneklerine dair bazı bilgileri "
-"tanımlayarak başlayacağız böylece Claws Mail'i beş dakikadan daha az bir süre "
-"içerisinde kullanmaya başlayabilesiniz."
+"tanımlayarak başlayacağız böylece Claws Mail'i beş dakikadan daha az bir "
+"süre içerisinde kullanmaya başlayabilesiniz."
 
 #: src/wizard.c:1842
 msgid "About You"
@@ -19049,7 +19212,8 @@ msgstr ""
 #~ "\n"
 
 #~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">\"%s\" şununla değiştir: </span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">\"%s\" şununla değiştir: </span>"
 
 #~ msgid "IMAP error on %s: authenticated\n"
 #~ msgstr "%s üzerinde IMAP hatası: onaylanmış\n"
@@ -19109,7 +19273,8 @@ msgstr ""
 #~ msgstr "<b>Dosya adı: </b>"
 
 #~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr "<span weight=\"red\">Geçici bellek istatistikleri okunurken hata</span>"
+#~ msgstr ""
+#~ "<span weight=\"red\">Geçici bellek istatistikleri okunurken hata</span>"
 
 #~ msgid "+_Save"
 #~ msgstr "+_Kaydet"
@@ -19948,31 +20113,31 @@ msgstr ""
 #~ msgid ""
 #~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
 #~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location of "
-#~ "senders from their E-Mails with any amount of certainty. The results "
+#~ "Warning: It is technically impossible to derive the geographic location "
+#~ "of senders from their E-Mails with any amount of certainty. The results "
 #~ "presented by this plugin are only rough estimates. In particular, mailing "
-#~ "list managers often strip sender information from the mails, so mails from "
-#~ "mailing lists may be assigned to the location of the mailing list server "
-#~ "instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on this "
-#~ "information to divorce your spouse.\n"
+#~ "list managers often strip sender information from the mails, so mails "
+#~ "from mailing lists may be assigned to the location of the mailing list "
+#~ "server instead of the mail sender.\n"
+#~ "When in doubt, don't trust the results of this plugin, and don't rely on "
+#~ "this information to divorce your spouse.\n"
 #~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
-#~ "quarrels)."
+#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about "
+#~ "marital quarrels)."
 #~ msgstr ""
 #~ "Bu eklenti Claws Mail için GeoLocation özelliğini sağlamakta.\n"
 #~ "\n"
 #~ "Uyarı: Gönderenin konumunu E-Posta adresinden kesin olarak tesbit etmek "
-#~ "teknik olarak mümkün değildir. Bu eklenti aracılığıyla gösterilen sonuçlar "
-#~ "yaklaşık tahminlerdir. Özellikle, posta listesi yöneticileri gönderen "
-#~ "bilgisini sıkça postalardan silmektedir, dolayısıyla posta listesindeki "
-#~ "postalar gönderenin adresi yerine posta listesi sunucusunun konumunu "
-#~ "gösterebilir.\n"
+#~ "teknik olarak mümkün değildir. Bu eklenti aracılığıyla gösterilen "
+#~ "sonuçlar yaklaşık tahminlerdir. Özellikle, posta listesi yöneticileri "
+#~ "gönderen bilgisini sıkça postalardan silmektedir, dolayısıyla posta "
+#~ "listesindeki postalar gönderenin adresi yerine posta listesi sunucusunun "
+#~ "konumunu gösterebilir.\n"
 #~ "Emin olmadığınızda, bu eklentinin sağladığı sonuçlara güvenmeyin ve bu "
 #~ "bilgiye güvenip eşinizi boşamayın.\n"
 #~ "\n"
-#~ "<berndth at gmx.de> adresine geri bildirim yapabilirsiniz (evlilik kavgalarıyla "
-#~ "ilgili olmadıktan sonra.)"
+#~ "<berndth at gmx.de> adresine geri bildirim yapabilirsiniz (evlilik "
+#~ "kavgalarıyla ilgili olmadıktan sonra.)"
 
 #~ msgid "GeoLocation integration"
 #~ msgstr "GeoLocation entegrasyonu"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d08db2e..e312153 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.1.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: 2015-09-04 11:00+8\n"
 "Last-Translator: Mark Chang <mark.cyj at gmail.com>\n"
 "Language-Team: Mark Chang <mark.cyj at gmail.com>\n"
@@ -51,10 +51,12 @@ msgid "Accounts with remote folders cannot be copied."
 msgstr "包含遠端資料夾的帳號無法被複製"
 
 #: src/account.c:915
+#, c-format
 msgid "Copy of %s"
 msgstr "複製 %s"
 
 #: src/account.c:1075
+#, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "你確認要刪除帳號「%s」嗎?"
 
@@ -76,7 +78,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "「收信」將從選取的帳號下取回郵件"
 
 #: 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
@@ -89,7 +91,7 @@ msgstr "「收信」將從選取的帳號下取回郵件"
 msgid "Name"
 msgstr "名稱"
 
-#: 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 "通訊協定"
 
@@ -98,6 +100,7 @@ msgid "Server"
 msgstr "伺服器"
 
 #: src/action.c:382
+#, c-format
 msgid "Could not get message file %d"
 msgstr "無法取得訊息檔案 %d"
 
@@ -106,10 +109,12 @@ msgid "Could not get message part."
 msgstr "無法取得部份的訊息"
 
 #: src/action.c:436
+#, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "無法取得多重郵件中的部份 %s"
 
 #: 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."
@@ -121,6 +126,7 @@ msgid "There is no filtering action set"
 msgstr "沒有設定任何的過濾行為"
 
 #: src/action.c:722
+#, c-format
 msgid ""
 "Invalid filtering action(s):\n"
 "%s"
@@ -129,6 +135,7 @@ msgstr ""
 "%s"
 
 #: src/action.c:987
+#, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 "%s\n"
@@ -151,10 +158,12 @@ msgid "Completed"
 msgstr "完成"
 
 #: src/action.c:1243
+#, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 執行中: %s\n"
 
 #: src/action.c:1247
+#, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 已結束: %s\n"
 
@@ -163,6 +172,7 @@ msgid "Action's input/output"
 msgstr "輸出/入的動作"
 
 #: src/action.c:1608
+#, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 "('%%h' will be replaced with the argument)\n"
@@ -177,6 +187,7 @@ msgid "Action's hidden user argument"
 msgstr "隱藏使用者命令的動作"
 
 #: src/action.c:1617
+#, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 "('%%u' will be replaced with the argument)\n"
@@ -656,6 +667,7 @@ msgid "Cannot paste into an address group."
 msgstr "無法貼在地址群組上"
 
 #: src/addressbook.c:2913
+#, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "確認要刪除%s內所有搜尋的結果和地址嗎?"
 
@@ -666,6 +678,7 @@ msgid "Delete"
 msgstr "刪除"
 
 #: 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."
@@ -687,6 +700,7 @@ msgid "Delete folder and _addresses"
 msgstr "刪除資料夾和地址(_a)"
 
 #: src/addressbook.c:2940
+#, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
@@ -695,6 +709,7 @@ msgstr ""
 "所有的地址將不會遺失"
 
 #: src/addressbook.c:2947
+#, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
@@ -703,6 +718,7 @@ msgstr ""
 "所有的地址都將遺失"
 
 #: src/addressbook.c:3061
+#, c-format
 msgid "Search '%s'"
 msgstr "尋找 %s"
 
@@ -782,8 +798,8 @@ msgstr "通訊錄"
 msgid "Person"
 msgstr "人員"
 
-#: 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 "資料夾"
 
@@ -923,18 +939,18 @@ msgstr "地址更新"
 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: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 "警告"
 
-#: 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 "錯誤"
@@ -967,80 +983,83 @@ 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 "通知器"
 
-#: 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:435
+#: src/common/plugin.c:437
 msgid "Plugin already loaded"
 msgstr "此外掛功能已經載入"
 
-#: src/common/plugin.c:446
+#: src/common/plugin.c:448
 msgid "Failed to allocate memory for Plugin"
 msgstr "此外掛功能發生記憶體配置錯誤"
 
-#: 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 "此模組並未取得GPL v3或更新版本的相容許可"
 
-#: src/common/plugin.c:489
+#: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
 msgstr "此模組適用於 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 "
 "built with."
 msgstr "此Claws Mail版本比外掛程式 %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."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要新"
 
-#: 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版本比外掛程式 %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版本比外掛程式 %s 建置的版本還要舊"
 
@@ -1069,6 +1088,7 @@ msgid "error occurred on authentication\n"
 msgstr "認證發生錯誤\n"
 
 #: src/common/smtp.c:585
+#, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "訊息太多(最大的容許量是 %s)\n"
 
@@ -1085,30 +1105,37 @@ msgid "Connection timed out.\n"
 msgstr "連線超時\n"
 
 #: src/common/socket.c:732
+#, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: 連線失敗 (%s)\n"
 
 #: src/common/socket.c:972
+#, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: 不知名的主機\n"
 
 #: src/common/socket.c:1064
+#, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: 尋找主機失敗 (%s)\n"
 
 #: src/common/socket.c:1368
+#, c-format
 msgid "write on fd%d: %s\n"
 msgstr "寫入 fd%d: %s\n"
 
 #: 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:334
+#, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "無法讀取P12認證檔 (%s)\n"
 
 #: src/common/ssl_certificate.c:343
+#, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "無法匯入P12認證檔 (%s)\n"
 
@@ -1137,30 +1164,37 @@ msgid "Certificate issuer is not a CA"
 msgstr "簽證發行者不是CA"
 
 #: 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:873
+#, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "簽證檔案%s遺失(%s)\n"
 
 #: 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:896
+#, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "金鑰檔案%s遺失(%s)\n"
 
 #: 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:1047
+#, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "開啟P12簽證檔案 %s (%s)失敗\n"
 
 #: src/common/ssl_certificate.c:1051
+#, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "P12簽證檔案%s遺失 (%s)\n"
 
@@ -1176,227 +1210,231 @@ msgid "(Subject cleared by RegExp)"
 msgstr "標題已被RegExp清除"
 
 #: src/common/utils.c:259
+#, c-format
 msgid "%dB"
 msgstr "%dB"
 
 #: src/common/utils.c:260
+#, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
 #: src/common/utils.c:261
+#, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
 #: src/common/utils.c:262
+#, c-format
 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 "星期日"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4824
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "星期一"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4825
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4826
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4827
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4828
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "星期五"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4829
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4831
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "一月"
 
-#: src/common/utils.c:4822
+#: src/common/utils.c:4832
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "二月"
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4833
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "三月"
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4834
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "四月"
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4835
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4836
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "六月"
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4837
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "七月"
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4838
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "八月"
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4839
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "九月"
 
-#: src/common/utils.c:4830
+#: src/common/utils.c:4840
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "十月"
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4841
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "十一月"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4842
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "十二月"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4844
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "星期日"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4845
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "星期一"
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4846
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "星期二"
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4847
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "星期三"
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4848
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "星期四"
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4849
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "星期五"
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4850
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "星期六"
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4852
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "一月"
 
-#: src/common/utils.c:4843
+#: src/common/utils.c:4853
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "二月"
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4854
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "三月"
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4855
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "四月"
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4856
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4857
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "六月"
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4858
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "七月"
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4859
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "八月"
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4860
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "九月"
 
-#: src/common/utils.c:4851
+#: src/common/utils.c:4861
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "十月"
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4862
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "十一月"
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4863
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "十二月"
 
-#: src/common/utils.c:4864
+#: src/common/utils.c:4874
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "上午"
 
-#: src/common/utils.c:4865
+#: src/common/utils.c:4875
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "下午"
 
-#: src/common/utils.c:4866
+#: src/common/utils.c:4876
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "上午"
 
-#: src/common/utils.c:4867
+#: src/common/utils.c:4877
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "下午"
@@ -1410,7 +1448,7 @@ msgstr "新增(_A)..."
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/compose.c:578 src/folderview.c:242
+#: src/compose.c:578 src/folderview.c:246
 msgid "_Properties..."
 msgstr "屬性(_P)"
 
@@ -1737,6 +1775,7 @@ msgid "New message subject format error."
 msgstr "新訊息標題格式錯誤"
 
 #: 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行出現錯誤"
 
@@ -1751,6 +1790,7 @@ msgid ""
 msgstr "回寄信件內的寄件者樣板包含一個無效的郵件地址"
 
 #: 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行出現一個錯誤"
 
@@ -1761,6 +1801,7 @@ msgid ""
 msgstr "轉寄信件內的寄件者樣板包含一個無效的郵件地址"
 
 #: 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行出現一個錯誤"
 
@@ -1769,6 +1810,7 @@ msgid "Fw: multiple emails"
 msgstr "回覆:多重郵件"
 
 #: src/compose.c:2539
+#, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "改寄信件內的內容樣板在第%d行出現一個錯誤"
 
@@ -1807,6 +1849,7 @@ msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "無法夾帶檔案(字元轉換失敗)"
 
 #: src/compose.c:2840
+#, c-format
 msgid ""
 "The following file has been attached: \n"
 "%s"
@@ -1825,10 +1868,12 @@ msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "樣板內\"引用標示\"有誤"
 
 #: src/compose.c:3613
+#, c-format
 msgid "Could not get size of file '%s'."
 msgstr "無法取得檔案'%s'大小"
 
 #: 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?"
@@ -1838,11 +1883,12 @@ msgstr "你可以在訊息內容中插入一個檔案 %s,確認要這樣幹嗎
 msgid "Are you sure?"
 msgstr "你確定嗎?"
 
-#: 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 "插入(_I)"
 
 #: src/compose.c:3752
+#, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空白的"
 
@@ -1855,10 +1901,12 @@ msgid "_Attach anyway"
 msgstr "直接夾檔(_A)"
 
 #: src/compose.c:3763
+#, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s"
 
 #: src/compose.c:3790
+#, c-format
 msgid "Message: %s"
 msgstr "訊息: %s"
 
@@ -1868,10 +1916,12 @@ msgid " [Edited]"
 msgstr " 已編輯"
 
 #: src/compose.c:4790 src/plugins/python/composewindowtype.c:501
+#, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新信件 %s"
 
 #: src/compose.c:4793 src/plugins/python/composewindowtype.c:504
+#, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[無主題] - 新信件 %s"
 
@@ -1888,7 +1938,7 @@ msgstr ""
 "傳送前請選擇一個郵件地址"
 
 #: 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 "傳送"
 
@@ -1896,8 +1946,8 @@ msgstr "傳送"
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "只存在一個副本收件者,確認寄出?"
 
-#: 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 "傳送(_S)"
@@ -1915,6 +1965,7 @@ msgid "_Queue"
 msgstr "草稿(_Q)"
 
 #: src/compose.c:5112
+#, c-format
 msgid "Subject is empty. %s"
 msgstr "主題空白 %s"
 
@@ -1930,7 +1981,7 @@ msgstr "儲存至草稿?"
 msgid "Send later"
 msgstr "稍後寄送"
 
-#: 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"
@@ -1940,7 +1991,7 @@ msgstr ""
 "\n"
 "字元轉換失敗"
 
-#: 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"
@@ -1950,7 +2001,8 @@ msgstr ""
 "\n"
 "無法取得收件者的加密金鑰"
 
-#: 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"
 "\n"
@@ -1961,6 +2013,7 @@ msgstr ""
 "簽名天敗:  %s"
 
 #: src/compose.c:5181
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -1983,6 +2036,7 @@ msgstr ""
 "從主視窗用\"傳送草稿訊息\"重試"
 
 #: src/compose.c:5254
+#, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -1990,7 +2044,8 @@ msgstr ""
 "%s\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5629
+#: src/compose.c:5632
+#, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 "to the specified %s charset.\n"
@@ -1999,7 +2054,8 @@ msgstr ""
 "無法轉換訊息的字元編碼至指定的 %s 編碼\n"
 "確認以 %s 傳送?"
 
-#: src/compose.c:5687
+#: src/compose.c:5690
+#, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 "The contents of the message might be broken on the way to the delivery.\n"
@@ -2010,69 +2066,72 @@ msgstr ""
 "訊息內容將被打斷以利傳輸\n"
 "確定要傳送嗎?"
 
-#: src/compose.c:5798
+#: src/compose.c:5801
+#, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "郵件 %s 無法被加密"
 
-#: src/compose.c:5919
+#: src/compose.c:5922
 msgid "Encryption warning"
 msgstr "加密警告"
 
-#: src/compose.c:5920
+#: src/compose.c:5923
 msgid "C_ontinue"
 msgstr "繼續(_o)"
 
-#: src/compose.c:5969
+#: src/compose.c:5972
 msgid "No account for sending mails available!"
 msgstr "傳送郵件時找不到有效的帳號"
 
-#: src/compose.c:5978
+#: src/compose.c:5981
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "選擇的帳號並非NNTP:無法傳輸"
 
-#: src/compose.c:6213
+#: src/compose.c:6216
+#, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "附加檔案%s不存在,忽略嗎?"
 
-#: 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 "終止傳送"
 
-#: src/compose.c:6214
+#: src/compose.c:6217
 msgid "Ignore attachment"
 msgstr "忽略附加檔案"
 
-#: src/compose.c:6254
+#: src/compose.c:6257
+#, c-format
 msgid "Original %s part"
 msgstr "原始的第%s部份"
 
-#: src/compose.c:6832
+#: src/compose.c:6838
 msgid "Add to address _book"
 msgstr "新增至通訊錄"
 
-#: src/compose.c:6993
+#: src/compose.c:6999
 msgid "Delete entry contents"
 msgstr "刪除目錄"
 
-#: 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 "按下 <tab> 可自動完成郵件地址"
 
-#: src/compose.c:7212
+#: src/compose.c:7218
 msgid "Mime type"
 msgstr "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 "大小"
 
-#: src/compose.c:7281
+#: src/compose.c:7287
 msgid "Save Message to "
 msgstr "儲存訊息到"
 
-#: 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
@@ -2083,23 +2142,24 @@ 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"
@@ -2107,85 +2167,88 @@ msgstr ""
 "拼字檢查無法正確啟用\n"
 "%s"
 
-#: 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 "無法載入隱私系統'%s',此訊息將無法被簽證或加密"
 
-#: 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 "空白(_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 "此樣板內容的第%d行發現錯誤"
 
-#: 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 "無效的MINE型式"
 
-#: 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 "MIME型式"
 
-#: 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"
 "Force terminating the process?\n"
@@ -2195,15 +2258,16 @@ msgstr ""
 "強制終止此行程嗎?\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 "Claws Mail 需要網路的存取權才能傳送此郵件"
 
-#: 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"
 "\n"
@@ -2213,15 +2277,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: 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?"
@@ -2229,23 +2293,25 @@ msgstr ""
 "無法儲存為草稿\n"
 "確定要終止離開或放棄此郵件?"
 
-#: 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 "無法讀取檔案'%s'"
 
-#: 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."
@@ -2253,73 +2319,77 @@ msgstr ""
 "目前的編碼檔案'%s'包含無效的字元\n"
 "插入可能是無效的"
 
-#: 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 "儲存至草稿(_S)"
 
-#: 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 "確定要使用樣板 '%s'嗎?"
 
-#: 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 "覆蓋(_R)"
 
-#: 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 "附加檔案(_A)"
 
-#: src/compose.c:11607
+#: src/compose.c:11619
+#, c-format
 msgid "Quote format error at line %d."
 msgstr "第%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 "
 "time. Do you want to continue?"
 msgstr "您企圖回覆%d訊息,開啟視窗可能會花費一些時,確認要繼續嗎?"
 
 #: src/crash.c:140
+#, c-format
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr "Claws Mail 進行 (%ld) 收到信號 %ld"
 
@@ -2328,6 +2398,7 @@ msgid "Claws Mail has crashed"
 msgstr "Claws Mail 不正常結束"
 
 #: src/crash.c:202
+#, c-format
 msgid ""
 "%s.\n"
 "Please file a bug report and include the information below."
@@ -2436,6 +2507,7 @@ msgid "Choose a picture"
 msgstr "選擇一張照片"
 
 #: src/editaddress.c:803
+#, c-format
 msgid ""
 "Failed to import image: \n"
 "%s"
@@ -2495,6 +2567,7 @@ msgid "O_ther Attributes"
 msgstr "其它屬性"
 
 #: src/editaddress.c:1583
+#, c-format
 msgid ""
 "Failed to save image: \n"
 "%s"
@@ -2523,7 +2596,7 @@ 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: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 "檔案"
@@ -2670,7 +2743,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"
 
@@ -2833,7 +2906,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜尋結果中可以接收的最大登入數量"
 
-#: src/editldap.c:779 src/prefs_account.c:3274
+#: src/editldap.c:779 src/prefs_account.c:3287
 msgid "Basic"
 msgstr "基本"
 
@@ -2920,6 +2993,7 @@ msgid "File exported successfully."
 msgstr "檔案匯出成功"
 
 #: src/exphtmldlg.c:177
+#, c-format
 msgid ""
 "The HTML output directory '%s'\n"
 "does not exist. Do you want to create it?"
@@ -2932,6 +3006,7 @@ msgid "Create directory"
 msgstr "建立目錄"
 
 #: src/exphtmldlg.c:189
+#, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 "%s"
@@ -3053,6 +3128,7 @@ msgid "Specify parameters to format distinguished name."
 msgstr "指定參數用來格式化區分名稱"
 
 #: src/expldifdlg.c:187
+#, c-format
 msgid ""
 "LDIF Output Directory '%s'\n"
 "does not exist. OK to create new directory?"
@@ -3065,6 +3141,7 @@ msgid "Create Directory"
 msgstr "建立目錄"
 
 #: src/expldifdlg.c:199
+#, c-format
 msgid ""
 "Could not create output directory for LDIF file:\n"
 "%s"
@@ -3254,14 +3331,17 @@ msgid "Not specified."
 msgstr "未指定"
 
 #: src/file_checker.c:76
+#, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr "缺少檔案 %s,確認要用使用來自於 %s 的備份檔案嗎?"
 
 #: src/file_checker.c:84 src/file_checker.c:106
+#, c-format
 msgid "Could not copy %s to %s"
 msgstr "無法從 %s 複制到 %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?"
@@ -3272,6 +3352,7 @@ msgid "rule is not account-based\n"
 msgstr "這不是一個以帳號為基準的規則\n"
 
 #: src/filtering.c:607
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
@@ -3292,6 +3373,7 @@ msgid ""
 msgstr "這是一個以帳號為基準的規則,但是不符合用來作為取回郵件的帳號\n"
 
 #: src/filtering.c:624
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
@@ -3305,6 +3387,7 @@ msgid ""
 msgstr "這不是一個以帳號為基準的規則,所有的規則將被使用在使用者需求上\n"
 
 #: src/filtering.c:649
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
@@ -3313,6 +3396,7 @@ msgstr ""
 "求上\n"
 
 #: src/filtering.c:667
+#, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr "這是一個以帳號為基準的規則 [id=%d, name='%s'],將跳過使用者請求\n"
 
@@ -3321,6 +3405,7 @@ msgid "rule is account-based, skipped on user request\n"
 msgstr "這是一個以帳號為基準的規則,將跳過使用者請求\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"
@@ -3333,6 +3418,7 @@ msgid "rule is account-based, not matching current account\n"
 msgstr "這是一個以帳號為基準的規則,但是不符合目前帳號\n"
 
 #: src/filtering.c:712
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
@@ -3341,6 +3427,7 @@ msgstr ""
 "name='%s']\n"
 
 #: src/filtering.c:752
+#, c-format
 msgid "applying action [ %s ]\n"
 msgstr "套用動作 [ %s ]\n"
 
@@ -3349,22 +3436,27 @@ msgid "action could not apply\n"
 msgstr "無法套用此動作\n"
 
 #: src/filtering.c:759
+#, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "此動作 [ %s ] 套用後沒有其它的處理程序\n"
 
 #: src/filtering.c:810
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "套用規則 '%s' [ %s ]\n"
 
 #: src/filtering.c:814
+#, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "套用規則 <unnamed> [ %s ]\n"
 
 #: src/filtering.c:832
+#, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "關閉規則 '%s' [ %s ]\n"
 
 #: src/filtering.c:836
+#, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "關閉規則 <unnamed> [ %s ]\n"
 
@@ -3393,6 +3485,7 @@ msgid "post-processing"
 msgstr "後處理"
 
 #: src/filtering.c:911
+#, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
@@ -3413,6 +3506,7 @@ msgid ": "
 msgstr ": "
 
 #: src/filtering.c:920
+#, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
@@ -3441,18 +3535,22 @@ msgid "Drafts"
 msgstr "草稿"
 
 #: src/folder.c:2012
+#, c-format
 msgid "Processing (%s)...\n"
 msgstr "處理中 (%s)...\n"
 
 #: src/folder.c:3257
+#, c-format
 msgid "Copying %s to %s...\n"
 msgstr "正在複製 %s 到 %s...\n"
 
 #: src/folder.c:3257
+#, c-format
 msgid "Moving %s to %s...\n"
 msgstr "正在移動 %s 到 %s...\n"
 
 #: src/folder.c:3563
+#, c-format
 msgid "Updating cache for %s..."
 msgstr "正在為 %s 更新緩衝中..."
 
@@ -3461,6 +3559,7 @@ msgid "Processing messages..."
 msgstr "郵件處理中..."
 
 #: src/folder.c:4559
+#, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "離線同步化 %s ...\n"
 
@@ -3486,6 +3585,7 @@ msgstr "新資料夾"
 #: 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 "'%c' 不能被包含在資料夾名稱內"
 
@@ -3493,161 +3593,169 @@ msgstr "'%c' 不能被包含在資料夾名稱內"
 #: 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 "資料夾 '%s' 已經存在"
 
 #: 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 "無法建立資料夾 '%s'"
 
-#: src/folderview.c:237
+#: src/folderview.c:241
 msgid "Mark all re_ad"
 msgstr "標示所有為已讀(_a)"
 
-#: src/folderview.c:238
+#: src/folderview.c:242
 msgid "Mark all read recursi_vely"
 msgstr "遞迴地標示所有為已讀(_v)"
 
-#: src/folderview.c:240
+#: src/folderview.c:244
 msgid "R_un processing rules"
 msgstr "立即執行規則(u)"
 
-#: src/folderview.c:241 src/mainwindow.c:551
+#: src/folderview.c:245 src/mainwindow.c:551
 msgid "_Search folder..."
 msgstr "搜尋資料夾(_S)..."
 
-#: src/folderview.c:243
+#: src/folderview.c:247
 msgid "Process_ing..."
 msgstr "處理中(_i)..."
 
-#: src/folderview.c:244
+#: src/folderview.c:248
 msgid "Empty _trash..."
 msgstr "清空回收桶(_t)..."
 
-#: src/folderview.c:245
+#: src/folderview.c:249
 msgid "Send _queue..."
 msgstr "傳送暫存郵件(_q)..."
 
-#: 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 "新郵件"
 
-#: 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 "未讀郵件"
 
-#: 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 "全部郵件"
 
 #. 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 "設定資料夾訊息..."
 
-#: 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 "確定要將此資料夾及其下的子目錄內所有的郵件標示為已讀嗎?"
 
-#: 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 "確定要將此資料內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:843 src/summaryview.c:4114
+#: src/folderview.c:851 src/summaryview.c:4114
 msgid "Mark all as read"
 msgstr "將所有的郵件標示為已讀"
 
-#: src/folderview.c:1019 src/imap.c:4641
+#: src/folderview.c:1027 src/imap.c:4639
+#, fuzzy, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "掃描資料夾 %s%c%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 "掃描資料夾 %s..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1061
 msgid "Rebuild folder tree"
 msgstr "重建資料夾串列"
 
-#: src/folderview.c:1054
+#: src/folderview.c:1062
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "重建資料夾串列將移除本地的暫存資料,確定要繼續嗎?"
 
-#: src/folderview.c:1064
+#: src/folderview.c:1072
 msgid "Rebuilding folder tree..."
 msgstr "資料夾串列重建中..."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1074
 msgid "Scanning folder tree..."
 msgstr "資料夾串列掃描中..."
 
-#: src/folderview.c:1157
+#: src/folderview.c:1165
+#, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "無法掃描資料夾 %s\n"
 
-#: src/folderview.c:1211
+#: src/folderview.c:1219
 msgid "Checking for new messages in all folders..."
 msgstr "在所有資料夾內檢查新郵件..."
 
-#: src/folderview.c:2131
+#: src/folderview.c:2144
+#, c-format
 msgid "Closing folder %s..."
 msgstr "關閉資料夾 %s..."
 
-#: src/folderview.c:2226
+#: src/folderview.c:2239
+#, c-format
 msgid "Opening folder %s..."
 msgstr "開啟 %s..."
 
-#: src/folderview.c:2244
+#: src/folderview.c:2257
 msgid "Folder could not be opened."
 msgstr "資料夾無法開啟"
 
-#: 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 "清空回收桶"
 
-#: src/folderview.c:2387
+#: src/folderview.c:2400
 msgid "Delete all messages in trash?"
 msgstr "刪除所以回收桶內的郵件"
 
-#: src/folderview.c:2388
+#: src/folderview.c:2401
 msgid "_Empty trash"
 msgstr "清空回收桶(_E)"
 
-#: 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 "離線警告"
 
-#: src/folderview.c:2432 src/toolbar.c:2608
+#: src/folderview.c:2445 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "目前為離線模式,要覆寫嗎?"
 
-#: src/folderview.c:2443 src/toolbar.c:2627
+#: src/folderview.c:2456 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "傳送暫存郵件"
 
-#: src/folderview.c:2444 src/toolbar.c:2628
+#: src/folderview.c:2457 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "傳送所有暫存郵件?"
 
-#: 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 "傳送暫存郵件時發生一些錯誤"
 
-#: 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"
 "%s"
@@ -3655,59 +3763,64 @@ msgstr ""
 "傳送暫存郵件時發生一些錯誤:\n"
 "%s"
 
-#: src/folderview.c:2531
+#: src/folderview.c:2544
+#, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "確認要複製資料夾 '%s' 嗎?(從'%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 "確認要將資料夾 '%s' 變為 '%s' 的子資料夾嗎?"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Copy folder"
 msgstr "複製資料夾"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2547
 msgid "Move folder"
 msgstr "移動資料夾"
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
+#, c-format
 msgid "Copying %s to %s..."
 msgstr "從 %s 複製到 %s ..."
 
-#: src/folderview.c:2545
+#: src/folderview.c:2558
+#, c-format
 msgid "Moving %s to %s..."
 msgstr "從 %s 移動到 %s ..."
 
-#: src/folderview.c:2579
+#: src/folderview.c:2592
 msgid "Source and destination are the same."
 msgstr "來源和目的相同"
 
-#: src/folderview.c:2582
+#: src/folderview.c:2595
 msgid "Can't copy a folder to one of its children."
 msgstr "不能將資料夾複製到它的子目錄內"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2596
 msgid "Can't move a folder to one of its children."
 msgstr "不能將資料夾移動到它的子目錄內"
 
-#: src/folderview.c:2586
+#: src/folderview.c:2599
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "資料夾無法在兩個不同的郵件資料夾間移動"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Copy failed!"
 msgstr "複製失敗"
 
-#: src/folderview.c:2589
+#: src/folderview.c:2602
 msgid "Move failed!"
 msgstr "移動失敗"
 
-#: src/folderview.c:2639
+#: src/folderview.c:2652
+#, c-format
 msgid "Processing configuration for folder %s"
 msgstr "進行資料夾 %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 "目的資料夾只能被用來儲存子資料夾"
 
@@ -3762,6 +3875,7 @@ msgid "Done."
 msgstr "完成"
 
 #: src/grouplistdialog.c:492
+#, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "新聞群組 %d 接收完成 (%s 讀取)"
 
@@ -3822,6 +3936,7 @@ msgstr ""
 "系統資訊\n"
 
 #: src/gtk/about.c:168
+#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
@@ -3830,6 +3945,7 @@ msgstr ""
 "作業系統: %s %s (%s)"
 
 #: src/gtk/about.c:177
+#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
@@ -3838,6 +3954,7 @@ msgstr ""
 "作業系統: %s"
 
 #: src/gtk/about.c:186
+#, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
@@ -3964,6 +4081,7 @@ msgid "Session statistics\n"
 msgstr "通信統計\n"
 
 #: 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 "開始於: %s\n"
 
@@ -3972,6 +4090,7 @@ msgid "Incoming traffic\n"
 msgstr "收件傳輸量\n"
 
 #: src/gtk/about.c:721 src/main.c:2589
+#, c-format
 msgid "Received messages: %d\n"
 msgstr "已接收郵件: %d\n"
 
@@ -3980,18 +4099,22 @@ msgid "Outgoing traffic\n"
 msgstr "外寄傳輸量\n"
 
 #: src/gtk/about.c:731 src/main.c:2598
+#, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "新/改寄的郵件: %d\n"
 
 #: src/gtk/about.c:736 src/main.c:2602
+#, c-format
 msgid "Replied messages: %d\n"
 msgstr "回覆的郵件: %d\n"
 
 #: src/gtk/about.c:741 src/main.c:2606
+#, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "轉寄的郵件: %d\n"
 
 #: src/gtk/about.c:746 src/main.c:2610
+#, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "所有寄出的郵件: %d\n"
 
@@ -4033,63 +4156,63 @@ msgstr "釋出記錄(_R)"
 msgid "_Statistics"
 msgstr "統計(_S)"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "橙"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "紅"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "粉紅"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "天空藍"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "藍"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "綠"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "棕"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "灰"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "淡藍"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "深紅"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "深粉紅"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "金屬藍"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "金"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "亮綠"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "洋紅"
 
@@ -4110,6 +4233,7 @@ msgid "No dictionary selected."
 msgstr "尚未選擇字典"
 
 #: src/gtk/gtkaspell.c:365 src/gtk/gtkaspell.c:395
+#, c-format
 msgid "Couldn't initialize %s speller."
 msgstr "無法初始化 %s 拼字器"
 
@@ -4118,6 +4242,7 @@ msgid "Couldn't initialize Enchant broker."
 msgstr "無法初始化魔法經紀人(Enchant broker)"
 
 #: src/gtk/gtkaspell.c:713
+#, c-format
 msgid "Couldn't initialize %s dictionary:"
 msgstr "無法初始化 %s 字典:"
 
@@ -4130,6 +4255,7 @@ msgid "Replace unknown word"
 msgstr "取代未知的單字"
 
 #: src/gtk/gtkaspell.c:1460
+#, c-format
 msgid "Replace \"%s\" with: "
 msgstr "以...取代\"%s\""
 
@@ -4148,6 +4274,7 @@ msgid "More..."
 msgstr "更多..."
 
 #: src/gtk/gtkaspell.c:1867
+#, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" 在字典中找不到 '%s'"
 
@@ -4164,6 +4291,7 @@ msgid "Replace with..."
 msgstr "以...取代"
 
 #: src/gtk/gtkaspell.c:1916
+#, c-format
 msgid "Check with %s"
 msgstr "用 %s 檢查"
 
@@ -4172,10 +4300,12 @@ msgid "(no suggestions)"
 msgstr "(沒有建議)"
 
 #: src/gtk/gtkaspell.c:2012
+#, c-format
 msgid "Dictionary: %s"
 msgstr "字典: %s"
 
 #: src/gtk/gtkaspell.c:2027
+#, c-format
 msgid "Use alternate (%s)"
 msgstr "使用替換 (%s)"
 
@@ -4188,6 +4318,7 @@ msgid "Check while typing"
 msgstr "輸⼊時檢查"
 
 #: src/gtk/gtkaspell.c:2153
+#, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 "%s"
@@ -4196,6 +4327,7 @@ msgstr ""
 "%s"
 
 #: src/gtk/gtkaspell.c:2209
+#, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
 "%s"
@@ -4212,6 +4344,7 @@ msgid "Failed: network error."
 msgstr "失敗: 網路錯誤"
 
 #: src/gtk/gtkutils.c:1927
+#, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "未知的錯誤(%d)"
 
@@ -4710,11 +4843,13 @@ msgid ""
 msgstr "以下圖示用來顯示郵件和資料夾狀態:"
 
 #: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
+#, c-format
 msgid "Input password for %s on %s:"
 msgstr "為 %s 輸入密碼於 %s:"
 
 #: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
 #: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
+#, c-format
 msgid "Input password for %s:"
 msgstr "為 %s 輸入密碼:"
 
@@ -4776,6 +4911,7 @@ msgid "Select the Plugins to load"
 msgstr "選擇欲載入的外掛程式"
 
 #: src/gtk/pluginwindow.c:215
+#, c-format
 msgid ""
 "The following error occurred while loading %s:\n"
 "\n"
@@ -4808,7 +4944,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 "外掛程式"
 
@@ -4825,6 +4961,7 @@ msgid "Description"
 msgstr "說明"
 
 #: src/gtk/pluginwindow.c:374
+#, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr "參閱 %sClaws Mail website%s 以取得更詳細的資訊"
 
@@ -4849,9 +4986,9 @@ msgid "_Hide"
 msgstr "隱藏(_H)"
 
 #: 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"
@@ -5018,6 +5155,7 @@ msgid "messages which contain S in References header"
 msgstr "參考標頭內包含S的郵件"
 
 #: src/gtk/quicksearch.c:491
+#, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "傳入命令的返回值為0 - %F 為郵件檔案"
 
@@ -5150,10 +5288,12 @@ msgid "Expires on: "
 msgstr "過期日: "
 
 #: src/gtk/sslcertwindow.c:302
+#, c-format
 msgid "SSL certificate for %s"
 msgstr "%s 的 SSL 簽證"
 
 #: src/gtk/sslcertwindow.c:318
+#, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
 "You may be connecting to a rogue server.\n"
@@ -5164,6 +5304,7 @@ msgstr ""
 "\n"
 
 #: src/gtk/sslcertwindow.c:338
+#, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 "%sDo you want to accept it?"
@@ -5173,6 +5314,7 @@ msgstr ""
 
 #: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
 #: src/gtk/sslcertwindow.c:464
+#, c-format
 msgid "Signature status: %s"
 msgstr "簽名狀態: %s"
 
@@ -5198,6 +5340,7 @@ msgid "_Accept and save"
 msgstr "接受並儲存(_A)"
 
 #: src/gtk/sslcertwindow.c:387
+#, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 "%sDo you want to continue?"
@@ -5226,6 +5369,7 @@ msgid "Known certificate:"
 msgstr "已知的簽證"
 
 #: src/gtk/sslcertwindow.c:451
+#, c-format
 msgid ""
 "Certificate for %s has changed.\n"
 "%sDo you want to accept it?"
@@ -5294,6 +5438,7 @@ msgstr "IMAP4 連線中斷\n"
 #: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
 #: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
 #: src/imap.c:744 src/imap.c:748
+#, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP 發生%s錯誤:"
 
@@ -5462,6 +5607,7 @@ msgid "SSL error"
 msgstr " SSL 錯誤"
 
 #: src/imap.c:748
+#, c-format
 msgid "Unknown error [%d]"
 msgstr "未知的錯誤 [%d]"
 
@@ -5526,23 +5672,27 @@ msgstr ""
 "才能正常運作"
 
 #: src/imap.c:983
+#, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "連線到 %s 失敗:登入被拒絕 %s"
 
 #: src/imap.c:987
+#, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "連線到 %s 失敗:登入被拒絕 %s\n"
 
 #: src/imap.c:1005
+#, c-format
 msgid "Connecting to %s failed"
 msgstr "連線到 %s 失敗"
 
 #: src/imap.c:1012 src/imap.c:1015
+#, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 連線到 %s 已經被中斷,重新連線中...\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 需要有網路的存取能力,才能夠存取 IMAP 伺服器"
 
@@ -5568,90 +5718,100 @@ msgid "Con_tinue connecting"
 msgstr "繼續保持連線"
 
 #: src/imap.c:1171
+#, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
 msgstr "帳號 '%s':連線到 IMAP4 伺服器:  %s:%d..."
 
 #: src/imap.c:1219
+#, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d"
 
 #: src/imap.c:1222
+#, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 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 "無法啟始 TLS 通信\n"
 
-#: src/imap.c:1324
+#: src/imap.c:1322
+#, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "無法登入到 IMAP 伺服器 %s \n"
 
-#: src/imap.c:1327
+#: src/imap.c:1325
+#, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "無法登入到 IMAP 伺服器 %s"
 
-#: src/imap.c:1754
+#: src/imap.c:1752
 msgid "Adding messages..."
 msgstr "加入郵件..."
 
-#: src/imap.c:1959 src/mh.c:529
+#: src/imap.c:1957 src/mh.c:529
 msgid "Copying messages..."
 msgstr "複製郵件..."
 
-#: src/imap.c:2552
+#: src/imap.c:2550
 msgid "can't set deleted flags\n"
 msgstr "無法設定已刪除旗標\n"
 
-#: src/imap.c:2559 src/imap.c:5063
+#: src/imap.c:2557 src/imap.c:5061
 msgid "can't expunge\n"
 msgstr "無法刪掉\n"
 
-#: src/imap.c:2910
+#: src/imap.c:2908
+#, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "在沒有訂閱的資料夾 %s 內尋找..."
 
-#: src/imap.c:2913
+#: src/imap.c:2911
+#, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "在%s尋找子資料夾..."
 
-#: src/imap.c:3231
+#: src/imap.c:3229
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法建立郵件箱:LIST錯誤\n"
 
-#: src/imap.c:3246
+#: src/imap.c:3244
 msgid "can't create mailbox\n"
 msgstr "無法建立郵件箱\n"
 
-#: src/imap.c:3377
+#: src/imap.c:3375
+#, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "無法將郵件箱口稱從 %s 變更為 %s\n"
 
-#: src/imap.c:3490
+#: src/imap.c:3488
 msgid "can't delete mailbox\n"
 msgstr "無法刪除郵件箱\n"
 
-#: src/imap.c:3769
+#: src/imap.c:3767
 msgid "LIST failed\n"
 msgstr "LIST 失敗\n"
 
-#: src/imap.c:3854
+#: src/imap.c:3852
 msgid "Flagging messages..."
 msgstr "標示郵件中..."
 
-#: src/imap.c:3957
+#: src/imap.c:3955
+#, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾: %s\n"
 
-#: src/imap.c:4109
+#: src/imap.c:4107
 msgid "Server requires TLS to log in.\n"
 msgstr "伺服器需要以 TLS 進行登入\n"
 
-#: src/imap.c:4119
+#: src/imap.c:4117
 msgid "Can't refresh capabilities.\n"
 msgstr "不能刷新功能\n"
 
-#: src/imap.c:4124
+#: src/imap.c:4122
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
@@ -5659,19 +5819,20 @@ msgstr ""
 "連線到 %s 失敗:伺服器需要 TLS,但是目前的 Claws Mail 被編譯成不支援 TLS 的版"
 "本\n"
 
-#: src/imap.c:4132
+#: src/imap.c:4130
 msgid "Server logins are disabled.\n"
 msgstr "伺服器登入被關閉\n"
 
-#: src/imap.c:4355
+#: src/imap.c:4353
 msgid "Fetching message..."
 msgstr "取得郵件中..."
 
-#: src/imap.c:5056
+#: src/imap.c:5054
+#, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "無法設定被刪除的旗標: %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"
@@ -5759,6 +5920,7 @@ msgstr "從上層資料夾繼承屬性"
 #: 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 "為 %s 輸入新名稱"
 
@@ -5779,6 +5941,7 @@ msgstr ""
 "這個資料夾名稱是不允許的"
 
 #: 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 "
 "will not be possible.\n"
@@ -5792,10 +5955,12 @@ msgstr ""
 #: 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 "不能移除資料夾 '%s'"
 
 #: src/imap_gtk.c:498
+#, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "確認要在 '%s' 取消訂閱的子資料夾中搜尋嗎?"
 
@@ -5812,6 +5977,7 @@ msgid "_Search"
 msgstr "搜尋(_S)"
 
 #: src/imap_gtk.c:517
+#, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "選擇 %s 的一個子資料夾以訂閱:"
 
@@ -5836,6 +6002,7 @@ msgstr ""
 "主目錄"
 
 #: src/imap_gtk.c:557
+#, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "確認要 %s 這個 '%s' 資料夾嗎?"
 
@@ -6042,6 +6209,7 @@ msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail 需要網路才能取得郵件"
 
 #: src/inc.c:343
+#, c-format
 msgid "%s failed\n"
 msgstr "%s 失敗\n"
 
@@ -6062,6 +6230,7 @@ msgid "Retrieving"
 msgstr "正在取回"
 
 #: src/inc.c:635
+#, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "完成 (%d 郵件 (%s) 已取回)"
@@ -6089,6 +6258,7 @@ msgid "Timeout"
 msgstr "超時"
 
 #: src/inc.c:752
+#, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "已完成 (%d 新郵件)"
@@ -6099,18 +6269,22 @@ msgid "Finished (no new messages)"
 msgstr "已完成 (沒有新郵件)"
 
 #: src/inc.c:795
+#, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 正在取回新郵件"
 
 #: src/inc.c:825
+#, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "帳號 '%s': POP3 伺服器連線中: %s:%d..."
 
 #: src/inc.c:843
+#, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "無法連線至 POP3 伺服器: %s:%d"
 
 #: src/inc.c:847
+#, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線至 POP3 伺服器: %s:%d\n"
 
@@ -6120,6 +6294,7 @@ msgid "Authenticating..."
 msgstr "認證中..."
 
 #: src/inc.c:929
+#, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "正在從 %s (%s) 取回郵件..."
 
@@ -6144,16 +6319,19 @@ msgid "Quitting"
 msgstr "離開中"
 
 #: src/inc.c:979
+#, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在取得郵件 (%d / %d) (%s / %s)"
 
 #: src/inc.c:992
+#, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "正在取回 (%d 郵件 (%s) 已接收)"
 msgstr[1] "正在取回 (%d 郵件 (%s) 已接收)"
 
 #: src/inc.c:1151
+#, c-format
 msgid "Connection to %s:%d failed."
 msgstr "連線至 %s:%d 失敗"
 
@@ -6162,6 +6340,7 @@ msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤"
 
 #: src/inc.c:1162
+#, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
@@ -6182,6 +6361,7 @@ msgid "Socket error."
 msgstr "通訊錯誤"
 
 #: src/inc.c:1181
+#, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "連線至 %s:%d 時通訊錯誤"
 
@@ -6190,6 +6370,7 @@ msgid "Connection closed by the remote host."
 msgstr "遠端伺服器關閉連線"
 
 #: src/inc.c:1189
+#, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "連線至 %s:%d 時被遠端伺服器關閉連線"
 
@@ -6198,6 +6379,7 @@ msgid "Mailbox is locked."
 msgstr "郵件箱已鎖定"
 
 #: src/inc.c:1198
+#, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
@@ -6210,6 +6392,7 @@ msgid "Authentication failed."
 msgstr "認證失敗"
 
 #: src/inc.c:1210 src/send_message.c:676
+#, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
@@ -6224,6 +6407,7 @@ msgid ""
 msgstr "連線已超時。可以在選項/其它/雜項中增加超時設定值,或許可以回復"
 
 #: src/inc.c:1220
+#, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "連線至 %s:%d 超時"
 
@@ -6232,10 +6416,12 @@ msgid "Incorporation cancelled\n"
 msgstr "已取消合併\n"
 
 #: src/inc.c:1523
+#, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%s 目前處於離線模式,要回復 %d 分鐘嗎?"
 
 #: src/inc.c:1529
+#, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%s 目前處於離線模式,要回復嗎?"
 
@@ -6252,6 +6438,7 @@ msgid "Nick Name"
 msgstr "暱稱"
 
 #: src/main.c:244
+#, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
@@ -6260,6 +6447,7 @@ msgstr ""
 "無法建立資料夾"
 
 #: src/main.c:365
+#, c-format
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
@@ -6268,6 +6456,7 @@ msgstr ""
 "確認要合併配置設定內容嗎?"
 
 #: src/main.c:367
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -6317,6 +6506,7 @@ msgid "(or older)"
 msgstr "(或較舊的)"
 
 #: src/main.c:1448
+#, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
 "more information:\n"
@@ -6371,6 +6561,7 @@ msgid "Missing required 'To:' header\n"
 msgstr "遺失必要的'收件者:'標頭\n"
 
 #: src/main.c:1929
+#, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用方式: %s [選項]...\n"
 
@@ -6527,13 +6718,14 @@ msgid ""
 "                         set geometry for main window"
 msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
-"							設定主視窗的大小"
+"\t\t\t\t\t\t\t設定主視窗的大小"
 
 #: src/main.c:2024
 msgid "Unknown option\n"
 msgstr "未知的選項\n"
 
 #: src/main.c:2042
+#, c-format
 msgid "Processing (%s)..."
 msgstr "處理中 (%s)..."
 
@@ -7374,6 +7566,7 @@ msgstr ""
 
 #: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
+#, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "郵件夾 '%s' 已經存在"
 
@@ -7428,6 +7621,7 @@ msgid "Deleting duplicated messages..."
 msgstr "正在刪除重複的郵件..."
 
 #: 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] "已刪除 %d 重複郵件於 %d 資料夾內\n"
@@ -7459,10 +7653,12 @@ msgid ""
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入 registry"
 
 #: src/mainwindow.c:5188 src/setup.c:91
+#, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "掃描資料夾 %s%c%s..."
 
 #: src/mainwindow.c:5332
+#, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "忘記了 %d 密碼於 %d 帳號內\n"
@@ -7470,6 +7666,7 @@ msgstr[1] "忘記了 %d 密碼於 %d 帳號內\n"
 
 #: src/matcher.c:214 src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
 #: src/matcher.c:218 src/matcher.c:219 src/matcher.c:220 src/matcher.c:221
+#, c-format
 msgid "%s header"
 msgstr "%s 標頭"
 
@@ -7499,6 +7696,7 @@ msgid "Case insensitive"
 msgstr "不區分大小寫"
 
 #: src/matcher.c:1849
+#, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "檢查郵件是否相符 [ %s ]\n"
 
@@ -7516,6 +7714,7 @@ msgid "(none)"
 msgstr "(空)"
 
 #: src/mbox.c:107
+#, c-format
 msgid ""
 "Could not open mbox file:\n"
 "%s\n"
@@ -7524,6 +7723,7 @@ msgstr ""
 "%s\n"
 
 #: src/mbox.c:144
+#, c-format
 msgid "Importing from mbox... (%d mail imported)"
 msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] "從 mbox 匯入中... (%d 郵件已匯入)"
@@ -7537,12 +7737,13 @@ msgstr "覆寫 mbox 檔案"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "此檔案已經鄉在,要覆寫嗎?"
 
-#: 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 "覆寫"
 
 #: src/mbox.c:564
+#, c-format
 msgid ""
 "Could not create mbox file:\n"
 "%s\n"
@@ -7586,7 +7787,7 @@ msgstr "搜尋完畢"
 msgid "Compose _new message"
 msgstr "寫新郵件(_n)"
 
-#: 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 - 郵件視窗"
 
@@ -7595,6 +7796,7 @@ msgid "<No Return-Path found>"
 msgstr "<找不到回覆路徑>"
 
 #: src/messageview.c:848
+#, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 "to be sent does not correspond to the return path:\n"
@@ -7624,60 +7826,64 @@ msgstr ""
 "並沒有給你官方郵件地址\n"
 "建議你不要傳送回條"
 
-#: src/messageview.c:1373
+#: src/messageview.c:1376
+#, c-format
 msgid "Fetching message (%s)..."
 msgstr "取得郵件 (%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 "無法解碼: %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 "郵件不符合 MIME 標準,可能解讀錯誤"
 
-#: 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 "另存新檔"
 
-#: src/messageview.c:1853
+#: src/messageview.c:1856
 msgid "Overwrite existing file?"
 msgstr "覆寫已存在的檔案嗎?"
 
-#: 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 "無法儲存檔案 '%s'"
 
-#: src/messageview.c:1914
+#: src/messageview.c:1917
+#, c-format
 msgid "Show all %s."
 msgstr "顯示全部 %s"
 
-#: src/messageview.c:1916
+#: src/messageview.c:1919
 msgid "Only the first megabyte of text is shown."
 msgstr "只有文字中第一個 megabyte 會顯示"
 
-#: 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 "你已收到此郵件的回條:接收者將會看到"
 
-#: src/messageview.c:1950
+#: src/messageview.c:1953
 msgid "You asked for a return receipt in this message."
 msgstr "你在此郵件中要求回覆回條"
 
-#: src/messageview.c:1956
+#: src/messageview.c:1959
 msgid "This message asks for a return receipt."
 msgstr "此郵件要求回覆回條"
 
-#: src/messageview.c:1957
+#: src/messageview.c:1960
 msgid "Send receipt"
 msgstr "傳送回條"
 
-#: src/messageview.c:2000
+#: src/messageview.c:2003
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7685,7 +7891,8 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "而且已經待伺服器被刪除"
 
-#: src/messageview.c:2006
+#: src/messageview.c:2009
+#, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
@@ -7693,15 +7900,16 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s"
 
-#: src/messageview.c:2010 src/messageview.c:2032
+#: src/messageview.c:2013 src/messageview.c:2035
 msgid "Mark for download"
 msgstr "標示欲下載項目"
 
-#: src/messageview.c:2011 src/messageview.c:2023
+#: src/messageview.c:2014 src/messageview.c:2026
 msgid "Mark for deletion"
 msgstr "標示欲刪除項目"
 
-#: src/messageview.c:2016
+#: src/messageview.c:2019
+#, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
@@ -7709,12 +7917,13 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s 將被下載"
 
-#: 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 "未標示"
 
-#: src/messageview.c:2027
+#: src/messageview.c:2030
+#, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
@@ -7722,11 +7931,11 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s 將被刪除"
 
-#: src/messageview.c:2100
+#: src/messageview.c:2103
 msgid "Return Receipt Notification"
 msgstr "回覆回條通知"
 
-#: 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"
@@ -7736,19 +7945,19 @@ msgstr ""
 "超過一個帳號使用了此郵件的收件者地址\n"
 "請選擇一個帳號用來傳送回條通知"
 
-#: 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 "取消(_C)"
 
-#: src/messageview.c:2105
+#: src/messageview.c:2108
 msgid "_Send Notification"
 msgstr "傳送通知(_S)"
 
-#: src/messageview.c:2194
+#: src/messageview.c:2197
 msgid "Cannot print: the message doesn't contain text."
 msgstr "無法列印:此郵件不包含文字"
 
-#: src/messageview.c:2956
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -7756,7 +7965,7 @@ msgstr ""
 "\n"
 "  此資料夾內沒有郵件"
 
-#: src/messageview.c:2964
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -7764,7 +7973,7 @@ msgstr ""
 "\n"
 "  郵件已被刪除"
 
-#: src/messageview.c:2965
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -7772,7 +7981,7 @@ msgstr ""
 "\n"
 "  郵件已被刪除或移至其它資料夾"
 
-#: 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 "學習過程中發生錯誤\n"
@@ -7790,6 +7999,7 @@ msgid "Remove _mailbox..."
 msgstr "移除郵件箱(_m)..."
 
 #: src/mh_gtk.c:222
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
@@ -7800,6 +8010,7 @@ msgstr ""
 "%s."
 
 #: 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)"
@@ -7849,10 +8060,12 @@ msgid "Check again"
 msgstr "再檢查一次"
 
 #: src/mimeview.c:1059
+#, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s 點選圖示去檢查它"
 
 #: src/mimeview.c:1061
+#, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s 點選圖示或點擊'%s'去檢查它 "
 
@@ -7861,6 +8074,7 @@ msgid "Timeout checking the signature. Click the icon to try again."
 msgstr "檢查簽章超時,點選圖示再試一次"
 
 #: src/mimeview.c:1073
+#, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr "檢查簽章超時,點選圖示或點擊'%s'再試一次"
@@ -7875,10 +8089,12 @@ 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:416
+#, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "無法儲存多重郵件的一個部份:%s"
 
 #: src/mimeview.c:1839 src/textview.c:3073
+#, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆寫已存在的檔案 '%s' 嗎?"
 
@@ -7887,6 +8103,7 @@ msgid "Select destination folder"
 msgstr "選擇目的資料夾"
 
 #: src/mimeview.c:1888 src/plugins/archive/archiver_prefs.c:132
+#, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s'並不是一個路徑"
 
@@ -7895,6 +8112,7 @@ msgid "Open with"
 msgstr "以...開啟"
 
 #: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2991
+#, c-format
 msgid ""
 "Enter the command-line to open file:\n"
 "('%s' will be replaced with file name)"
@@ -7903,6 +8121,7 @@ msgstr ""
 "('%s' 將被用檔名覆蓋)"
 
 #: src/mimeview.c:2228
+#, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
 "\n"
@@ -7948,14 +8167,17 @@ msgid "Description:"
 msgstr "描述:"
 
 #: src/news.c:303
+#, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "連線至 %s:%d 的 NNTP 已經斷線\n"
 
 #: src/news.c:336
+#, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "帳號 '%s': 連線至 NNTP 伺服器:%s:%d...\n"
 
 #: src/news.c:357
+#, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "登入%s:%d時發生錯誤...\n"
 
@@ -7969,10 +8191,12 @@ msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "雖然模式讀取器失效,但仍將繼續\n"
 
 #: src/news.c:451
+#, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "用 %s:%d 建立資料發生錯誤\n"
 
 #: src/news.c:466
+#, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "向 %s:%d 認證時發生錯誤\n"
 
@@ -7981,34 +8205,38 @@ msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail 需要網路才能存取新聞伺服器"
 
 #: src/news.c:862
+#, c-format
 msgid "couldn't select group: %s\n"
 msgstr "無法選擇群組: %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 "無法設定群組: %s\n"
 
-#: src/news.c:1060
+#: src/news.c:1063
+#, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "無效的文章範圍 %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\n"
 
-#: src/news.c:1214
+#: src/news.c:1217
+#, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "取得 xover %d - %d 於 %s 內...\n"
 
-#: src/news.c:1229
+#: src/news.c:1232
 msgid "couldn't get xover\n"
 msgstr "無法取得 xover\n"
 
-#: src/news.c:1244
+#: src/news.c:1247
 msgid "invalid xover line\n"
 msgstr "無效的 xover 線\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"
@@ -8029,6 +8257,7 @@ msgid "_Unsubscribe newsgroup"
 msgstr "取消訂閱新聞群組(_U)"
 
 #: src/news_gtk.c:250
+#, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "真的要取消訂閱新聞群組 '%s' 嗎?"
 
@@ -8256,6 +8485,7 @@ msgid "Create Archive..."
 msgstr "建立封存..."
 
 #: src/plugins/archive/archiver.c:122
+#, c-format
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
 "\n"
@@ -8324,26 +8554,32 @@ msgid "Folder and archive must be selected"
 msgstr "資料夾和封存將被選取"
 
 #: src/plugins/archive/archiver_gtk.c:516
+#, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: 已存在!繼續嗎?"
 
 #: src/plugins/archive/archiver_gtk.c:519
+#, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: 是一個超連結!無法繼續"
 
 #: src/plugins/archive/archiver_gtk.c:522
+#, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: 是一個路徑!無法繼續"
 
 #: src/plugins/archive/archiver_gtk.c:525
+#, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: 沒有權限!無法繼續"
 
 #: src/plugins/archive/archiver_gtk.c:528
+#, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: 未知的錯誤!無法繼續"
 
 #: src/plugins/archive/archiver_gtk.c:565
+#, c-format
 msgid ""
 "Not a valid file name:\n"
 "%s."
@@ -8352,6 +8588,7 @@ msgstr ""
 "%s."
 
 #: src/plugins/archive/archiver_gtk.c:578
+#, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
 "%s."
@@ -8360,6 +8597,7 @@ msgstr ""
 "%s."
 
 #: src/plugins/archive/archiver_gtk.c:607
+#, c-format
 msgid ""
 "Adding files in folder failed\n"
 "Files in folder: %d\n"
@@ -8446,6 +8684,7 @@ msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr "選擇封存檔案名稱 [後綴將類似 .tgz]"
 
 #: src/plugins/archive/archiver_gtk.c:951
+#, c-format
 msgid "%ld of %ld"
 msgstr "%ld of %ld"
 
@@ -8725,6 +8964,7 @@ msgid "Attachment handling"
 msgstr "已掌握附加檔案"
 
 #: src/plugins/attachwarner/attachwarner.c:217
+#, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
 "attached. Mention appears on line %d, which begins with text: %s\n"
@@ -8842,6 +9082,7 @@ msgstr ""
 "練,建議使用數百個垃圾郵件及一般郵件來進行。"
 
 #: src/plugins/bogofilter/bogofilter.c:619
+#, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
@@ -8853,6 +9094,7 @@ msgstr "Bogofilter: 從郵件中學習..."
 
 #: src/plugins/bogofilter/bogofilter.c:779
 #: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:513
+#, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "學習失敗; `%s` 返回狀態為 %d."
 
@@ -8861,6 +9103,7 @@ msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: 從郵件中學習..."
 
 #: src/plugins/bogofilter/bogofilter.c:882
+#, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 "%s"
@@ -8923,7 +9166,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:1508
+#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
 msgid "KB"
 msgstr "KB"
 
@@ -9048,6 +9291,7 @@ msgstr ""
 "議使用數百個垃圾郵件及一般郵件來進行。"
 
 #: src/plugins/bsfilter/bsfilter.c:401
+#, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
@@ -9129,10 +9373,12 @@ msgstr ""
 "Clamd 仍在執行中嗎?"
 
 #: src/plugins/clamd/clamav_plugin.c:119
+#, c-format
 msgid "Detected %s virus."
 msgstr "偵測到 %s 病毒"
 
 #: src/plugins/clamd/clamav_plugin.c:135
+#, c-format
 msgid ""
 "Scanning error:\n"
 "%s"
@@ -9141,6 +9387,7 @@ msgstr ""
 "%s"
 
 #: src/plugins/clamd/clamav_plugin.c:146
+#, c-format
 msgid "File: %s. Size (%d) greater than limit (%d)\n"
 msgstr "檔案: %s  大小 (%d) 大於限制 (%d)\n"
 
@@ -9315,6 +9562,7 @@ msgstr ""
 "clamd 仍在執行中嗎?"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:117
+#, c-format
 msgid ""
 "%s: Unable to open\n"
 "clamd will be disabled"
@@ -9323,6 +9571,7 @@ msgstr ""
 "clamd 將被關閉"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:215
+#, c-format
 msgid ""
 "%s: Not able to find required information\n"
 "clamd will be disabled"
@@ -9349,6 +9598,7 @@ msgid "Socket write error"
 msgstr "Socket寫入錯誤"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#, c-format
 msgid "%s: Error reading"
 msgstr "%s: 讀取錯誤"
 
@@ -9463,7 +9713,7 @@ msgstr "此檔案內的CSS將套用在所有的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 "瀏覽(W)"
@@ -9501,10 +9751,12 @@ msgid "Open links with external browser"
 msgstr "以外部瀏覽器開啟連結"
 
 #: src/plugins/fancy/fancy_viewer.c:643
+#, c-format
 msgid "An error occurred: %d\n"
 msgstr "發生錯誤: %d\n"
 
 #: src/plugins/fancy/fancy_viewer.c:699
+#, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s 是一個畸形或不支援的輸入資料"
 
@@ -9557,6 +9809,7 @@ msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML 檢視器"
 
 #: src/plugins/fancy/fancy_viewer.c:1040
+#, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
 "By default all remote content is blocked. Options can be found in /"
@@ -9680,11 +9933,13 @@ msgid "Enter code:"
 msgstr "輸入認證碼:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:326
+#, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr "GData外掛程式: 連個人查詢錯誤: %s\n"
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
 #: src/plugins/gdata/cm_gdata_contacts.c:342
+#, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
 msgstr[0] "新增 %d 至"
@@ -9692,6 +9947,7 @@ msgstr[1] "新增 %d 至"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
 #: 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] "1 個連絡人加入至快取"
@@ -9702,6 +9958,7 @@ msgid "GData plugin: Starting async contacts query\n"
 msgstr "GData外掛程式: 開始進行非同步連絡人查詢\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:375
+#, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr "GData外掛程式: 群組查詢錯誤: %s\n"
 
@@ -9714,6 +9971,7 @@ msgid "GData plugin: Starting async groups query\n"
 msgstr "GData外掛程式: 開始非同步的群組查尋\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:444
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "GData外掛程式:認證錯誤: %s\n"
 
@@ -9736,6 +9994,7 @@ msgid ""
 msgstr "GData外掛程式:沒有收到認證碼,認證要求取消\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:495
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData外掛程式: 認證刷新失敗: %s\n"
 
@@ -9748,7 +10007,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData外掛程式: 正在嘗試刷新認證\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1749
+#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
 msgid "Authentication"
 msgstr "認證"
 
@@ -9854,10 +10113,12 @@ msgid "Error reading cache stats"
 msgstr "讀取暫存狀態錯誤"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
+#, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr "使用在 %s 內的 %d 檔案, %d 目錄和 %d 其它項目以及 %d 錯誤"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
+#, c-format
 msgid "Using %s in %d files, %d directories and %d others"
 msgstr "使用在 %s 內的 %d 檔案, %d 目錄和 %d 其它項目"
 
@@ -9874,6 +10135,7 @@ msgid "Not enough memory for operation"
 msgstr "沒有足夠的記憶體進行操作"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
+#, c-format
 msgid ""
 "Icon cache successfully cleared:\n"
 "• %u missing entries removed.\n"
@@ -9888,6 +10150,7 @@ msgid "Icon cache successfully cleared!"
 msgstr "圖示快取清除完成!"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
+#, c-format
 msgid ""
 "Errors clearing icon cache:\n"
 "• %u missing entries removed.\n"
@@ -9918,7 +10181,7 @@ msgstr "保持磁碟上的圖示以利重用將改為創造另外的網路要求
 msgid "Cache refresh interval"
 msgstr "快取刷新的間隔時間"
 
-#: 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 "小時"
@@ -10054,6 +10317,7 @@ msgstr ""
 " "
 
 #: src/plugins/mailmbox/plugin_gtk.c:330
+#, c-format
 msgid ""
 "All folders and messages under '%s' will be deleted.\n"
 "Do you really want to delete?"
@@ -10074,11 +10338,13 @@ msgid "Disconnected"
 msgstr "連線已終止"
 
 #: src/plugins/managesieve/managesieve.c:676
+#, c-format
 msgid "Disconnected: %s"
 msgstr "連線已終止:  %s"
 
 #: src/plugins/managesieve/managesieve.c:724
 #: src/plugins/managesieve/managesieve.c:869
+#, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "無法掌控在Sieve程序中的郵件: %s\n"
 
@@ -10095,10 +10361,12 @@ msgid "error occurred on SIEVE session\n"
 msgstr "Sieve程序中發生錯誤\n"
 
 #: src/plugins/managesieve/managesieve.c:865
+#, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "Sieve程序中發生錯誤: %s\n"
 
 #: src/plugins/managesieve/managesieve.c:874
+#, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "無法掌控在Sieve程序中的郵件: %d\n"
 
@@ -10162,6 +10430,7 @@ msgid "This script has been modified. Save the latest changes?"
 msgstr "這個腳本已經被修改過。儲存最新的異動嗎?"
 
 #: src/plugins/managesieve/sieve_editor.c:693
+#, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - 過濾器%s"
 
@@ -10184,6 +10453,7 @@ msgid "Enter new name for the script."
 msgstr "為腳本輸入新的名稱"
 
 #: src/plugins/managesieve/sieve_manager.c:323
+#, c-format
 msgid "Do you really want to delete the filter '%s'?"
 msgstr "你確定要刪除過濾器 '%s' 嗎?"
 
@@ -10288,7 +10558,7 @@ msgstr "指定認證"
 #: 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 "使用者名稱"
 
@@ -10296,18 +10566,18 @@ msgstr "使用者名稱"
 #: 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 "密碼"
 
-#: 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 "認證方式"
 
-#: 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 "自動"
 
@@ -10332,10 +10602,12 @@ msgid "Failed to register newmail hook"
 msgstr "註冊新郵件hook失敗"
 
 #: src/plugins/newmail/newmail.c:128
+#, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "無法開啟日誌檔 %s: %s\n"
 
 #: src/plugins/newmail/newmail.c:141
+#, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
 "after sorting.\n"
@@ -10486,6 +10758,7 @@ msgstr "郵件訊息"
 
 #: src/plugins/notification/notification_popup.c:492
 #: src/plugins/notification/notification_popup.c:498
+#, c-format
 msgid "%d new message arrived"
 msgid_plural "%d new messages arrived"
 msgstr[0] "%d 新訊息到達"
@@ -10501,6 +10774,7 @@ msgstr "行事歷訊息"
 
 #: src/plugins/notification/notification_popup.c:504
 #: src/plugins/notification/notification_trayicon.c:942
+#, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
 msgstr[0] "%d 新行事歷訊息已到達"
@@ -10511,12 +10785,14 @@ msgid "RSS news feed"
 msgstr "RSS新聞帖"
 
 #: src/plugins/notification/notification_popup.c:510
+#, c-format
 msgid "%d new article in a RSS feed arrived"
 msgid_plural "%d new articles in a RSS feed arrived"
 msgstr[0] "%d RSS內的新文章已到達"
 msgstr[1] "%d RSS內的新文章已到達"
 
 #: src/plugins/notification/notification_popup.c:574
+#, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d 新訊息"
@@ -10797,6 +11073,7 @@ msgid "Enable global hotkeys"
 msgstr "使用全域的快捷鍵"
 
 #: src/plugins/notification/notification_prefs.c:1960
+#, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr "快捷鍵範例包括了 <b>%s</b> 和 <b>%s</b>"
 
@@ -10845,6 +11122,7 @@ msgid "Show Trayicon Notifications"
 msgstr "顯示通知小圖示"
 
 #: src/plugins/notification/notification_trayicon.c:277
+#, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "新的: %d, 未讀: %d, 全部: %d"
 
@@ -10869,18 +11147,21 @@ msgid "New messages arrived"
 msgstr "新訊息已到達"
 
 #: src/plugins/notification/notification_trayicon.c:920
+#, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] "%d 新郵件已到達"
 msgstr[1] "%d 新郵件已到達"
 
 #: src/plugins/notification/notification_trayicon.c:931
+#, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] "%d 新的新聞貼已到達"
 msgstr[1] "%d 新的新聞貼已到達"
 
 #: src/plugins/notification/notification_trayicon.c:953
+#, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "%d 新的RSS文章已到達"
@@ -10933,10 +11214,12 @@ msgid ""
 msgstr "此文件已被鎖定,需要輸入正確的密碼才能開啟"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1342
+#, c-format
 msgid "%s Document"
 msgstr "%s 文件"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1348
+#, c-format
 msgid "of %d"
 msgstr "%d 個當中"
 
@@ -11002,6 +11285,7 @@ msgid "Zoom Factor"
 msgstr "縮放倍率因子"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:2054
+#, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
 "Poppler %s Lib and the gs tool.\n"
@@ -11020,6 +11304,7 @@ msgid "PDF Viewer"
 msgstr "PDF檢視器"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:2064
+#, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
 "process PostScript attachments, only PDF attachments will be displayed. To "
@@ -11202,7 +11487,7 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "設定為 '0' 將會為整個程序儲存密碼"
 
 #: 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 "分"
@@ -11262,10 +11547,12 @@ msgid "GPG"
 msgstr "GPG"
 
 #: src/plugins/pgpcore/select-keys.c:94
+#, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "沒有完全符合'%s'的;請選擇金鑰"
 
 #: src/plugins/pgpcore/select-keys.c:97
+#, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "為 '%s' ... %c 搜集資訊"
 
@@ -11312,10 +11599,12 @@ msgid "Enter another user or key ID:"
 msgstr "輸入其它的使用者ID或金鑰ID:"
 
 #: src/plugins/pgpcore/select-keys.c:605
+#, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "加密至 %s <%s>"
 
 #: src/plugins/pgpcore/select-keys.c:606
+#, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
 "If you choose to encrypt the message with this key, you don't\n"
@@ -11343,6 +11632,7 @@ msgid "Untrusted"
 msgstr "不被信任的"
 
 #: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#, c-format
 msgid "The signature can't be checked - %s"
 msgstr "這個簽名無法被檢查 - %s"
 
@@ -11355,38 +11645,47 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: 無法取得金鑰 - 沒有執行gpg-agent"
 
 #: src/plugins/pgpcore/sgpgme.c:269
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "來自於 \"%s\" 的良好簽名 [最根本的]"
 
 #: src/plugins/pgpcore/sgpgme.c:272
+#, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "來自於 \"%s\" 的良好簽名 [完整的]"
 
 #: src/plugins/pgpcore/sgpgme.c:275
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "來自於 \"%s\" 的良好簽名 [最低限度的]"
 
 #: src/plugins/pgpcore/sgpgme.c:282
+#, c-format
 msgid "Good signature from \"%s\""
 msgstr "來自於 \"%s\" 的良好簽名"
 
 #: 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 "金鑰 0x%s 用來驗證這一個簽名是無效的"
 
 #: src/plugins/pgpcore/sgpgme.c:292
+#, c-format
 msgid "Expired signature from \"%s\""
 msgstr "來自於 \"%s\" 的過期簽名"
 
 #: src/plugins/pgpcore/sgpgme.c:295
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "來自於 \"%s\" 的良好簽名,但是金鑰已經過期了"
 
 #: src/plugins/pgpcore/sgpgme.c:298
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "來自於 \"%s\" 的良好簽名,但是金鑰已經被撤回"
 
 #: src/plugins/pgpcore/sgpgme.c:301
+#, c-format
 msgid "Bad signature from \"%s\""
 msgstr "來自於 \"%s\" 的不良簽名,"
 
@@ -11399,34 +11698,42 @@ msgid "Error checking signature: no status\n"
 msgstr "檢查簽名發生錯誤:沒有狀態\n"
 
 #: src/plugins/pgpcore/sgpgme.c:347
+#, c-format
 msgid "Error checking signature: %s\n"
 msgstr "檢查簽名發生錯誤: %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:365
+#, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "此簽名是以 %s 製作,使用 %s 金鑰 ID %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:371
+#, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的良好簽名 (有效期限: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:376
+#, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "逾期的金鑰 uid \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:381
+#, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的逾期簽名 (有效期限: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:386
+#, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "已撤銷的金鑰 uid \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:391
+#, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "來自 \"%s\" 的不良簽名\n"
 
 #: src/plugins/pgpcore/sgpgme.c:404
+#, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid\"%s\"(有效期限: %s)\n"
 
@@ -11435,6 +11742,7 @@ msgid "Revoked"
 msgstr "已撤銷"
 
 #: src/plugins/pgpcore/sgpgme.c:411
+#, c-format
 msgid "Owner Trust: %s\n"
 msgstr "擁有者信任: %s\n"
 
@@ -11447,18 +11755,22 @@ msgid "Primary key fingerprint:"
 msgstr "主要的金鑰指紋:"
 
 #: src/plugins/pgpcore/sgpgme.c:432
+#, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "警告:簽名者的地址 \"%s\" 和DNS項目不符合\n"
 
 #: src/plugins/pgpcore/sgpgme.c:438
+#, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "已驗證的簽名者地址是 \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:472
+#, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "無法取得來自郵件 %s 的資料"
 
 #: src/plugins/pgpcore/sgpgme.c:488
+#, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "無法初始化資料, %s"
 
@@ -11467,18 +11779,22 @@ msgid "Secret key specification is ambiguous"
 msgstr "密鑰規格模稜兩可"
 
 #: src/plugins/pgpcore/sgpgme.c:653
+#, c-format
 msgid "Secret key not found (%s)"
 msgstr "無不到密鑰 (%s)"
 
 #: src/plugins/pgpcore/sgpgme.c:666
+#, c-format
 msgid "Error setting secret key: %s"
 msgstr "設定密鑰錯誤: %s"
 
 #: src/plugins/pgpcore/sgpgme.c:759
+#, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "Gpgme 協定 '%s' 無法使用:引擎 '%s' 尚未被正確的安裝"
 
 #: 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"
@@ -11487,6 +11803,7 @@ msgstr ""
 "%s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:773
+#, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme 協定 '%s' 無法使用 (未知的問題)"
 
@@ -11519,6 +11836,7 @@ msgstr ""
 "你確定現在要產生一對新的金鑰嗎?"
 
 #: src/plugins/pgpcore/sgpgme.c:961 src/plugins/pgpcore/sgpgme.c:983
+#, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "無法產生一對新的金鑰: %s"
 
@@ -11533,6 +11851,7 @@ msgid "Couldn't generate a new key pair: unknown error"
 msgstr "無法產生新的金鑰對: 未知的錯誤"
 
 #: src/plugins/pgpcore/sgpgme.c:993
+#, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
 "%s\n"
@@ -11577,6 +11896,7 @@ msgstr "無法將文字資料轉換至其它合理的字元"
 #: 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:413
+#, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "無法初始化PGP內容, %s"
 
@@ -11585,6 +11905,7 @@ msgid "Couldn't parse mime part."
 msgstr "無法解析mime的區塊"
 
 #: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
+#, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "無法開啟已加密的檔案 %s"
 
@@ -11592,6 +11913,7 @@ msgstr "無法開啟已加密的檔案 %s"
 #: src/plugins/pgpinline/pgpinline.c:380 src/plugins/pgpinline/pgpinline.c:388
 #: src/plugins/pgpinline/pgpinline.c:398 src/plugins/pgpinline/pgpinline.c:407
 #: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
+#, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "無法寫入已解密的檔案 %s"
 
@@ -11610,6 +11932,7 @@ msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- 此為 PGP/Inline 加密資料的結束 ---\n"
 
 #: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
+#, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "無法關閉已解密的檔案 %s"
 
@@ -11630,10 +11953,12 @@ msgid "Couldn't create temporary file."
 msgstr "無法建立暫存檔"
 
 #: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:536
+#, c-format
 msgid "Data signing failed, %s"
 msgstr "資料簽名失敗, %s"
 
 #: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:563
+#, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "資料簽名失敗起因於無效的簽名者: %s"
 
@@ -11652,14 +11977,17 @@ msgid ""
 msgstr "請注意!附件沒有用 PGP/Inline 系統進行加密,不包括 郵件標頭,像是主旨"
 
 #: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:662
+#, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "無法加入 GPG 金鑰 %s, %s"
 
 #: src/plugins/pgpinline/pgpinline.c:695 src/plugins/pgpmime/pgpmime.c:691
+#, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "無法建立暫存檔,%s"
 
 #: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:718
+#, c-format
 msgid "Encryption failed, %s"
 msgstr "加密失敗,%s"
 
@@ -11708,6 +12036,7 @@ msgid "Couldn't parse decrypted file parts."
 msgstr "無法解析已解密的部份檔案"
 
 #: src/plugins/pgpmime/pgpmime.c:455 src/plugins/pgpmime/pgpmime.c:494
+#, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "無法建立暫存檔案: %s"
 
@@ -11766,8 +12095,8 @@ msgstr "顯示 Python 控制台..."
 msgid "Refresh"
 msgstr "更新"
 
-#: 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 "瀏覽"
@@ -11866,6 +12195,7 @@ msgid "Python integration"
 msgstr "Python 整合"
 
 #: src/plugins/rssyl/old_feeds.c:90
+#, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
 "%s"
@@ -11874,14 +12204,17 @@ msgstr ""
 "%s"
 
 #: src/plugins/rssyl/opml_export.c:110
+#, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl:  當寫入'%s'以匯出feed清單時發生錯誤\n"
 
 #: src/plugins/rssyl/opml_export.c:131
+#, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: 無法刪除舊版本的 OPML 檔案 '%s': %s\n"
 
 #: src/plugins/rssyl/opml_export.c:141
+#, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr "RSSyl: 無法開啟檔案 '%s' 以匯出feed清單: %s\n"
 
@@ -11890,6 +12223,7 @@ msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: 寫入feed匯出檔案時發生錯誤\n"
 
 #: src/plugins/rssyl/opml_import.c:109
+#, c-format
 msgid ""
 "Error while subscribing feed\n"
 "%s\n"
@@ -11937,6 +12271,7 @@ msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "輸入你希望訂閱的新聞feed的URL:"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:98
+#, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' 不能用於資料夾名稱"
 
@@ -11947,6 +12282,7 @@ msgstr[0] "Claws Mail需要網路的存取能力才能進行feed的更新"
 msgstr[1] "Claws Mail需要網路的存取能力才能進行feed的更新"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:314
+#, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "你確定要移除feed `%s' 的樹狀結構嗎?\n"
 
@@ -11959,38 +12295,47 @@ msgid "Select an OPML file"
 msgstr "選擇一個 OPML 檔案"
 
 #: 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 "無法建為新的feed '%s' 建立資料夾"
 
 #: src/plugins/rssyl/rssyl_feed.h:10
+#, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: 訂閱新的feed: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:11
+#, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: 已訂閱新的feed: '%s' (%s)\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:12
+#, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: 正在更新 feed: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:13
+#, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: 已完成更新 feed: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:14
+#, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: 在 '%s' 擷取feed時發生錯誤: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:15
+#, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: 在 '%s' 沒有合法的 feed\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:16
+#, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: 無法在 '%s' 進行 feed \n"
 
 #: src/plugins/rssyl/rssyl_feed.h:17
+#, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "RSSyl: 應用程式已經存在,無法在 '%s' 結束feed的更新動作\n"
 
@@ -12065,7 +12410,7 @@ msgstr "如果可以的話擷取註解,貼文出現至今少於"
 
 #: 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 "天"
 
@@ -12201,6 +12546,7 @@ msgid "_Edit feed properties after subscribing"
 msgstr "加入後編輯 feed 屬性(_E)"
 
 #: src/plugins/rssyl/rssyl_update_comments.c:105
+#, c-format
 msgid "Updating comments for '%s'..."
 msgstr "為 '%s' 更新註解..."
 
@@ -12220,10 +12566,12 @@ msgid "404 (Not found)"
 msgstr "404 (找不到)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:114
+#, c-format
 msgid "Error %d"
 msgstr "錯誤 %d"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:127
+#, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
 "Error fetching feed at\n"
@@ -12236,6 +12584,7 @@ msgstr ""
 "%s"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:140
+#, c-format
 msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
@@ -12248,14 +12597,17 @@ msgid "Untitled feed"
 msgstr "無標題的 Feed"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:154
+#, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: 可能在 '%s' 中存在不合法的 feed 沒有主旨\n"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:231
+#, c-format
 msgid "Updating feed '%s'..."
 msgstr "正在更新 feed '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:258
+#, c-format
 msgid ""
 "Couldn't process feed at\n"
 "<b>%s</b>\n"
@@ -12317,6 +12669,7 @@ msgstr ""
 "GPGME 版本來自於 Werner Koch <dd9jn at gnu.org>,於 2001"
 
 #: src/plugins/smime/smime.c:421
+#, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "無法設定 GPG 協定,%s"
 
@@ -12505,6 +12858,7 @@ msgid ""
 msgstr "允許檢查的最高次數。如果檢查花費了太長的時間,它將會終止。"
 
 #: src/plugins/tnef_parse/tnef_parse.c:65
+#, c-format
 msgid ""
 "\n"
 "Claws Mail TNEF parser:\n"
@@ -12663,7 +13017,7 @@ msgid "Next month"
 msgstr "下個月"
 
 #: 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"
 
@@ -12703,6 +13057,7 @@ msgid "Create meeting from message..."
 msgstr "從郵件建立會議..."
 
 #: src/plugins/vcalendar/vcalendar.c:120
+#, c-format
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "你可以一個一個建立 %d 會議,你要續嗎?"
@@ -12766,6 +13121,7 @@ msgid "You have received an answer to an unknown meeting proposal."
 msgstr "你收到了一個未知的計畫會議回覆"
 
 #: src/plugins/vcalendar/vcalendar.c:756
+#, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
 "%s has %s the invitation whose details follow:"
@@ -12931,6 +13287,7 @@ msgid "later"
 msgstr "稍後"
 
 #: src/plugins/vcalendar/vcal_folder.c:1510
+#, c-format
 msgid ""
 "\n"
 "These are the events planned %s:\n"
@@ -12939,14 +13296,17 @@ msgstr ""
 "這些是已計劃的事件 %s:\n"
 
 #: src/plugins/vcalendar/vcal_folder.c:1605
+#, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "已超時 (%d 秒),發生在連線至 %s 時\n"
 
 #: src/plugins/vcalendar/vcal_folder.c:1623
+#, c-format
 msgid "Error %ld"
 msgstr "錯誤 %ld"
 
 #: src/plugins/vcalendar/vcal_folder.c:1820
+#, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
 "%s:\n"
@@ -12959,6 +13319,7 @@ msgstr ""
 "%s"
 
 #: src/plugins/vcalendar/vcal_folder.c:1824
+#, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
 "%s:\n"
@@ -12971,6 +13332,7 @@ msgstr ""
 "%s\n"
 
 #: src/plugins/vcalendar/vcal_folder.c:1835
+#, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
 "%s\n"
@@ -12981,6 +13343,7 @@ msgstr ""
 "%s"
 
 #: src/plugins/vcalendar/vcal_folder.c:1838
+#, c-format
 msgid ""
 "This URL does not look like a WebCal URL:\n"
 "%s\n"
@@ -12992,6 +13355,7 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcal_folder.c:1867
 #: src/plugins/vcalendar/vcal_folder.c:1870
+#, c-format
 msgid "Could not create directory %s"
 msgstr "無法建立目錄 %s"
 
@@ -13000,6 +13364,7 @@ msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail 需要網路的存取能力以更新Webcal feed"
 
 #: src/plugins/vcalendar/vcal_folder.c:1919
+#, c-format
 msgid "Fetching calendar for %s..."
 msgstr "為 %s 取得行事曆..."
 
@@ -13079,15 +13444,15 @@ msgstr "本週"
 msgid "Later"
 msgstr "稍後"
 
-#: src/plugins/vcalendar/vcal_manager.c:1243
+#: src/plugins/vcalendar/vcal_manager.c:1256
 msgid "Accepted: "
 msgstr "接受:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1245
+#: src/plugins/vcalendar/vcal_manager.c:1258
 msgid "Declined: "
 msgstr "拒絕:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1247
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Tentatively Accepted: "
 msgstr "暫時接受:"
 
@@ -13126,42 +13491,52 @@ msgid "You are busy at the time of your planned meeting"
 msgstr "你自己在你計畫的這個會議時間是忙碌的"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s 在你計畫的這個會議時間是忙碌的"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#, c-format
 msgid "%d hour sooner"
 msgstr "%d 小時之前"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#, c-format
 msgid "%d hours sooner"
 msgstr "%d 小時之前"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d 小時和 %d 分鐘之前"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#, c-format
 msgid "%d minutes sooner"
 msgstr "%d 分鐘之前"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#, c-format
 msgid "%d hour later"
 msgstr "%d 小時之後"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#, c-format
 msgid "%d hours later"
 msgstr "%d 小時之後"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d 小時和 %d 分鐘之後"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#, c-format
 msgid "%d minutes later"
 msgstr "%d 分鐘之前"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -13172,6 +13547,7 @@ msgstr ""
 "每一個人都可以 %s 或 %s."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -13193,10 +13569,12 @@ msgstr ""
 "在這之前的6個小時或是之前的6個小時內,要每一個人參與這個會議是不可 能的事情"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#, c-format
 msgid "would be available %s or %s"
 msgstr "%s 或 %s 將是可以的"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#, c-format
 msgid "would be available %s"
 msgstr "%s 是可以的"
 
@@ -13207,10 +13585,12 @@ msgid "not available"
 msgstr "不可能"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#, c-format
 msgid ", but would be available %s or %s."
 msgstr ", 但是 %s 或 %s 是可以的"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#, c-format
 msgid ", but would be available %s."
 msgstr ", 但是 %s 是可以的"
 
@@ -13240,6 +13620,7 @@ msgid "Not everyone is available. See tooltips for more info..."
 msgstr "並不是每個人都可以!參考提示以獲得更多的資訊..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#, c-format
 msgid "Fetching planning for %s..."
 msgstr "為 %s 取得計畫..."
 
@@ -13293,6 +13674,7 @@ msgid "New meeting"
 msgstr "新的會議"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1665
+#, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - 編輯會議"
 
@@ -13302,22 +13684,26 @@ msgid "Time:"
 msgstr "時間:"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1877
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1880
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分鐘"
 msgstr[1] "%d 分鐘"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1891
+#, c-format
 msgid "Upcoming event: %s"
 msgstr "即將到來的事件: %s"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#, c-format
 msgid ""
 "You have a meeting or event soon.\n"
 "It starts at %s and ends %s later.\n"
@@ -13334,6 +13720,7 @@ msgstr ""
 "%s"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1909
+#, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "在 %d 分鐘後提醒我"
@@ -13356,6 +13743,7 @@ msgid "Export calendar to ICS"
 msgstr "把行事曆匯出至 ICS"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "無法匯出行事曆至 '%s'\n"
 
@@ -13364,6 +13752,7 @@ msgid "Could not export the freebusy info."
 msgstr "無法匯出 空閒/忙碌 的資訊"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:2264
+#, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "無法匯出 空閒/忙碌 至'%s'\n"
 
@@ -13442,6 +13831,7 @@ msgid "Get free/busy status of others from"
 msgstr "從其它的寄件者取得空閒/忙碌狀態"
 
 #: 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"
@@ -13470,14 +13860,17 @@ msgid "POP3 protocol error\n"
 msgstr "POP3 協定錯誤\n"
 
 #: src/pop.c:263
+#, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "無效的 UIDL 回應: %s\n"
 
 #: src/pop.c:841
+#, c-format
 msgid "POP3: Deleting expired message %d [%s]\n"
 msgstr "POP3: 刪除已過期的郵件 %d [%s]\n"
 
 #: src/pop.c:857
+#, c-format
 msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: 略過郵件 %d [%s] (%d 位元)\n"
 
@@ -13501,12 +13894,12 @@ msgstr "POP3通信發生錯誤\n"
 msgid "TOP command unsupported\n"
 msgstr "未支援的頂端命令\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"
 
@@ -13591,407 +13984,410 @@ msgid "command to send mails"
 msgstr "傳送郵件命令"
 
 #: src/prefs_account.c:1332
+#, c-format
 msgid "Account%d"
 msgstr "帳號 %d"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1428
 msgid "Local"
 msgstr "本地"
 
-#: src/prefs_account.c:1431 src/prefs_account.c:1520
+#: src/prefs_account.c:1434 src/prefs_account.c:1523
 msgid "Default Inbox"
 msgstr "預設收件夾"
 
-#: 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 "未過濾郵件將被儲存在這個資料夾"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1456
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全認證 (APOP)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1459
 msgid "Remove messages on server when received"
 msgstr "郵件接收後從伺服器上移除"
 
-#: src/prefs_account.c:1467
+#: src/prefs_account.c:1470
 msgid "Remove after"
 msgstr "超過"
 
-#: 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 天 0 小時後: 立刻移除"
 
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1500
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: 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."
 msgstr ""
 "郵件超過此限制將被部份接收,當選擇它們後,你將可以把它們全部下找或刪除。"
 
-#: 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 "可允許最大的郵件下載數量"
 
-#: src/prefs_account.c:1557
+#: src/prefs_account.c:1560
 msgid "unlimited if 0 is specified"
 msgstr "若設為0代表沒有限制"
 
-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1585
 msgid "Plain text"
 msgstr "尋找字串:"
 
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(通常是空白的)"
 
-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1616
 msgid "Show subscribed folders only"
 msgstr "只顯示訂閱資料夾"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1623
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "寬頻效果模式 (防止接到遠端的標籤)"
 
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1625
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "此模式使用較少的頻寬,對於某此伺服器可能會有速度較慢的情況發生"
 
-#: src/prefs_account.c:1629
+#: src/prefs_account.c:1632
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account.c:1636
+#: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
 msgstr "接收郵件時允許使用外掛程式進行過濾"
 
-#: src/prefs_account.c:1640
+#: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'接收郵件' 檢查此帳號的新郵件"
 
-#: 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 "郵件標頭"
 
-#: src/prefs_account.c:1724
+#: src/prefs_account.c:1727
 msgid "Generate Message-ID"
 msgstr "產生  Message-ID"
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
 msgstr "將傳送帳號的郵件地址放入  Message-ID"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1733
 msgid "Add user agent header"
 msgstr "加入使用者代理郵件標頭"
 
-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1740
 msgid "Add user-defined header"
 msgstr "加入使用者自訂郵件標頭"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1755
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "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."
 msgstr "若以下欄位空白,將以使用者名稱和密碼進行接收"
 
-#: src/prefs_account.c:1848
+#: src/prefs_account.c:1851
 msgid "Authenticate with POP3 before sending"
 msgstr "傳送前用 POP3 認證"
 
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1866
 msgid "POP authentication timeout: "
 msgstr "POP 認證超時:"
 
-#: src/prefs_account.c:1948 src/prefs_account.c:1994
+#: src/prefs_account.c:1954 src/prefs_account.c:2000
 msgid "Signature"
 msgstr "簽名"
 
-#: src/prefs_account.c:1951
+#: src/prefs_account.c:1957
 msgid "Automatically insert signature"
 msgstr "自動插入簽名"
 
-#: src/prefs_account.c:1956
+#: src/prefs_account.c:1962
 msgid "Signature separator"
 msgstr "簽名分隔線"
 
-#: src/prefs_account.c:1981
+#: src/prefs_account.c:1987
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account.c:2014
+#: src/prefs_account.c:2020
 msgid "Automatically set the following addresses"
 msgstr "自動設置轉寄地址"
 
-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2072
 msgid "Spell check dictionaries"
 msgstr "併字檢查字典"
 
-#: 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 "預設定典"
 
-#: 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 "預設替代定典"
 
-#: 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 "新郵件"
 
-#: 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 "回覆"
 
-#: 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 "轉寄"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2258
 msgid "Default privacy system"
 msgstr "預設的隱私系統"
 
-#: src/prefs_account.c:2281
+#: src/prefs_account.c:2287
 msgid "Always sign messages"
 msgstr "總是進行郵件簽章"
 
-#: src/prefs_account.c:2283
+#: src/prefs_account.c:2289
 msgid "Always encrypt messages"
 msgstr "總是將郵件加密"
 
-#: src/prefs_account.c:2285
+#: src/prefs_account.c:2291
 msgid "Always sign messages when replying to a signed message"
 msgstr "當回覆簽章郵件時,總是將郵件進行簽章"
 
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2294
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "當回覆已加密郵件時,總是將郵件進行加密"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2297
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "除了收件者外,將已傳送的郵件用私有金鑰進行加密"
 
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2299
 msgid "Save sent encrypted messages as clear text"
 msgstr "將已傳送的加密郵件儲存為明碼文件"
 
-#: 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 "不使用 SSL"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2459
 msgid "Use SSL for POP3 connection"
 msgstr "使用 SSL 進行連線"
 
-#: 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 "使用 STARTTLS 命令開始 SSL 通訊"
 
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2474
 msgid "Use SSL for IMAP4 connection"
 msgstr "使用 SSL 進行 IMAP4 連線"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2494
 msgid "Use SSL for NNTP connection"
 msgstr "使用 SSL 進行 NNTP 連線"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2498
 msgid "Send (SMTP)"
 msgstr "傳送 (SMTP)"
 
-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2502
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "不使用 SSL (若需要,使用 STARTTLS)"
 
-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2505
 msgid "Use SSL for SMTP connection"
 msgstr "使用 SSL 進行 SMTP 連線"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2513
 msgid "Client certificates"
 msgstr "客戶端認證"
 
-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2521
 msgid "Certificate for receiving"
 msgstr "進行接收認證"
 
-#: 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 "客戶端認證檔案為 PKCS12 或 PEM 檔"
 
-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2543
 msgid "Certificate for sending"
 msgstr "進行傳送認證"
 
-#: src/prefs_account.c:2570
+#: src/prefs_account.c:2576
 msgid "Automatically accept valid SSL certificates"
 msgstr "自動接放不明的合法 SSL 認證"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2579
 msgid "Use non-blocking SSL"
 msgstr "使用非阻斷式 SSL"
 
-#: src/prefs_account.c:2585
+#: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL connection problems"
 msgstr "如果發生 SSL 連線問題,請把此功能關閉"
 
-#: src/prefs_account.c:2713
+#: src/prefs_account.c:2726
 msgid "SMTP port"
 msgstr "SMTP 通訊埠"
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2733
 msgid "POP3 port"
 msgstr "POP3 通訊埠"
 
-#: src/prefs_account.c:2727
+#: src/prefs_account.c:2740
 msgid "IMAP4 port"
 msgstr "IMAP4 通訊埠"
 
-#: src/prefs_account.c:2734
+#: src/prefs_account.c:2747
 msgid "NNTP port"
 msgstr "NNTP 通訊埠"
 
-#: src/prefs_account.c:2740
+#: src/prefs_account.c:2753
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: 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."
 msgstr "網域名稱將被用來產生 Message-ID 以及當要連接到 SMTP 伺服器時"
 
-#: src/prefs_account.c:2757
+#: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
 msgstr "以命令和伺服器進行通訊"
 
-#: src/prefs_account.c:2766
+#: src/prefs_account.c:2779
 msgid "Mark cross-posted messages as read and color:"
 msgstr "標示已傳送郵件為已讀並更改顏色"
 
-#: src/prefs_account.c:2822
+#: src/prefs_account.c:2835
 msgid "Put sent messages in"
 msgstr "郵已傳送郵件放在"
 
-#: src/prefs_account.c:2824
+#: src/prefs_account.c:2837
 msgid "Put queued messages in"
 msgstr "將暫存郵件放在"
 
-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2839
 msgid "Put draft messages in"
 msgstr "將草稿郵件放在"
 
-#: src/prefs_account.c:2828
+#: src/prefs_account.c:2841
 msgid "Put deleted messages in"
 msgstr "將刪除的郵件放在"
 
-#: src/prefs_account.c:2887
+#: src/prefs_account.c:2900
 msgid "Account name is not entered."
 msgstr "未指定帳號名稱"
 
-#: src/prefs_account.c:2891
+#: src/prefs_account.c:2904
 msgid "Mail address is not entered."
 msgstr "未指定郵件地方"
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:2911
 msgid "SMTP server is not entered."
 msgstr "未指定 SMTP 伺服器"
 
-#: src/prefs_account.c:2903
+#: src/prefs_account.c:2916
 msgid "User ID is not entered."
 msgstr "使用者 ID 未指定"
 
-#: src/prefs_account.c:2908
+#: src/prefs_account.c:2921
 msgid "POP3 server is not entered."
 msgstr "未指定 POP3 伺服器"
 
-#: src/prefs_account.c:2928
+#: src/prefs_account.c:2941
 msgid "The default Inbox folder doesn't exist."
 msgstr "預設收件夾不存在"
 
-#: src/prefs_account.c:2934
+#: src/prefs_account.c:2947
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 伺服器未指定"
 
-#: src/prefs_account.c:2939
+#: src/prefs_account.c:2952
 msgid "NNTP server is not entered."
 msgstr "NNTP 伺服器未指定"
 
-#: src/prefs_account.c:2945
+#: src/prefs_account.c:2958
 msgid "local mailbox filename is not entered."
 msgstr "本地郵件夾名稱未指定"
 
-#: src/prefs_account.c:2951
+#: src/prefs_account.c:2964
 msgid "mail command is not entered."
 msgstr "郵件命令未指定"
 
-#: src/prefs_account.c:3292
+#: src/prefs_account.c:3305
 msgid "Receive"
 msgstr "接收"
 
-#: 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 "樣版"
 
-#: src/prefs_account.c:3364
+#: src/prefs_account.c:3377
 msgid "Privacy"
 msgstr "隱私"
 
-#: src/prefs_account.c:3476
+#: src/prefs_account.c:3489
 msgid "Advanced"
 msgstr "進階"
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3806
 msgid "Preferences for new account"
 msgstr "新帳號選項"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3808
+#, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帳號選項"
 
-#: src/prefs_account.c:3916 src/wizard.c:1389
+#: src/prefs_account.c:3929 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "失敗 (錯誤的地址)"
 
-#: src/prefs_account.c:4001
+#: src/prefs_account.c:4014
 msgid "Select signature file"
 msgstr "繼擇簽名檔案"
 
-#: 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 "選擇認證檔案"
 
-#: src/prefs_account.c:4132
+#: src/prefs_account.c:4145
 msgid "Protocol:"
 msgstr "通訊協定"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4285
+#, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (未載入外掛程式)"
 
@@ -14085,6 +14481,7 @@ msgid "Menu name and command are too long."
 msgstr "功能項目和命令都太長了"
 
 #: src/prefs_actions.c:655
+#, c-format
 msgid ""
 "The command\n"
 "%s\n"
@@ -14243,15 +14640,15 @@ msgstr "目前的動作"
 msgid "Action string is not valid."
 msgstr "動作字串是無效的"
 
-#: src/prefs_common.c:222 src/prefs_quote.c:69
+#: src/prefs_common.c:223 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "嗨, \\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 已寫入:\\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"
@@ -14259,7 +14656,7 @@ msgstr ""
 "\\n\\n開始轉寄郵件:\\n\\n?d{日期: %d\\n}?f{寄件者: %f\\n}?t{收件者: %t"
 "\\n}?c{副本: %c\\n}?n{新聞群組: %n\\n}?s{主旨: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:450
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -14405,6 +14802,7 @@ msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr "無法呼叫 `compface`。請確認它在你的 $PATH 內"
 
 #: src/prefs_customheader.c:620
+#, c-format
 msgid "Compface error: %s"
 msgstr "Compface 錯誤: %s"
 
@@ -14449,6 +14847,7 @@ msgid "This header is already in the list."
 msgstr "此標頭已經存在清單中了"
 
 #: src/prefs_ext_prog.c:102
+#, c-format
 msgid "%s will be replaced with file name / URI"
 msgstr "%s 將會被檔案名稱覆蓋 / URI"
 
@@ -14968,6 +15367,7 @@ msgid "General"
 msgstr "一般"
 
 #: src/prefs_folder_item.c:1882
+#, c-format
 msgid "Properties for folder %s"
 msgstr "資料夾屬性 %s"
 
@@ -15395,10 +15795,12 @@ msgid "any address in any header"
 msgstr "任何郵件標頭內的任何地址"
 
 #: src/prefs_matcher.c:1621
+#, c-format
 msgid "the address(es) in header '%s'"
 msgstr "郵件標頭'%s'內的地址"
 
 #: src/prefs_matcher.c:1622
+#, c-format
 msgid ""
 "Book/folder path is not set.\n"
 "\n"
@@ -15593,6 +15995,7 @@ 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"
@@ -15727,6 +16130,7 @@ msgstr "包含新郵件的資料夾"
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:459
+#, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
 msgstr "為 '顏色 %d' 挑選顏色"
@@ -15734,12 +16138,14 @@ msgstr "為 '顏色 %d' 挑選顏色"
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:432 src/prefs_msg_colors.c:463
+#, c-format
 msgid "Set label for 'color %d'"
 msgstr "為 '顏色 %d' 設定標籤"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:592
+#, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
 msgstr "為 '顏色 %d' 挑選顏色"
@@ -15925,8 +16331,8 @@ 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"
@@ -16005,6 +16411,7 @@ msgid "after manual check"
 msgstr "在手動檢查後"
 
 #: src/prefs_receive.c:268
+#, c-format
 msgid ""
 "Command to execute:\n"
 "(use %d as number of new mails)"
@@ -16614,10 +17021,12 @@ msgid "Only root can remove system themes"
 msgstr "只有 root 權限才能移除系統佈景主題"
 
 #: src/prefs_themes.c:439
+#, c-format
 msgid "Remove system theme '%s'"
 msgstr "移除系統佈景主題 '%s'"
 
 #: src/prefs_themes.c:442
+#, c-format
 msgid "Remove theme '%s'"
 msgstr "移除佈景主題 '%s'"
 
@@ -16626,6 +17035,7 @@ msgid "Are you sure you want to remove this theme?"
 msgstr "你確認要移除這個佈景主題嗎?"
 
 #: src/prefs_themes.c:458
+#, c-format
 msgid ""
 "File %s failed\n"
 "while removing theme."
@@ -16646,6 +17056,7 @@ msgid "Select theme folder"
 msgstr "選擇佈景主題資料夾"
 
 #: src/prefs_themes.c:500
+#, c-format
 msgid "Install theme '%s'"
 msgstr "安裝佈景主題 '%s'"
 
@@ -16678,10 +17089,12 @@ msgstr ""
 "你希望覆蓋它嗎?"
 
 #: src/prefs_themes.c:537
+#, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "無法在 %s 內刪除舊佈景主題"
 
 #: src/prefs_themes.c:545
+#, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "無法建立目的路徑 %s"
 
@@ -16694,6 +17107,7 @@ msgid "Failed installing theme"
 msgstr "佈景主題安裝失敗"
 
 #: src/prefs_themes.c:568
+#, c-format
 msgid ""
 "File %s failed\n"
 "while installing theme."
@@ -16702,10 +17116,12 @@ msgstr ""
 "當安裝佈景主題時"
 
 #: src/prefs_themes.c:666
+#, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d 個有效的佈景主題 (%d 個使用者的, %d 個系統的, 1 個內鍵的)"
 
 #: src/prefs_themes.c:707
+#, c-format
 msgid "Internal theme has %d icons"
 msgstr "內鍵的佈景主題有 %d  圖示"
 
@@ -16718,6 +17134,7 @@ msgid "Error: couldn't get theme status"
 msgstr "錯誤:無法取得佈景主題狀態"
 
 #: src/prefs_themes.c:755
+#, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d 個檔案 (%d 個圖示), 大小: %s"
 
@@ -16882,6 +17299,7 @@ msgid "Zoom out"
 msgstr "縮小"
 
 #: src/printing.c:701
+#, c-format
 msgid "Page %d"
 msgstr "第 %d 頁"
 
@@ -16902,6 +17320,7 @@ msgid "Already trying to send."
 msgstr "已嘗試傳送"
 
 #: src/procmsg.c:1557 src/procmsg.c:1616
+#, c-format
 msgid "Couldn't open file %s."
 msgstr "無法開啟檔案 %s"
 
@@ -16934,6 +17353,7 @@ msgid "Error when writing temporary file for news sending."
 msgstr "為新傳送郵件建立暫存檔案時發生錯誤"
 
 #: src/procmsg.c:1717
+#, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "當發出郵件至 %s 時,發生錯誤"
 
@@ -17222,6 +17642,7 @@ msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "此 \"轉寄\" 樣版的 \"引言標示\" 欄位是無效的"
 
 #: src/quote_fmt_parse.y:541
+#, c-format
 msgid "Enter text to replace '%s'"
 msgstr "輸入文字以覆蓋 '%s'"
 
@@ -17230,14 +17651,17 @@ msgid "Enter variable"
 msgstr "輸入變數"
 
 #: src/send_message.c:153
+#, c-format
 msgid "Sending message using command: %s\n"
 msgstr "使用此命令傳送郵件: %s\n"
 
 #: src/send_message.c:167
+#, c-format
 msgid "Couldn't execute command: %s"
 msgstr "不能執行此命令: %s"
 
 #: src/send_message.c:202
+#, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "當執行此命令時發生錯誤: %s"
 
@@ -17254,6 +17678,7 @@ msgid "POP before SMTP"
 msgstr "在SMTP之前POP"
 
 #: src/send_message.c:363
+#, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "帳號'%s':連線到SMTP伺服器: %s:%d..."
 
@@ -17294,6 +17719,7 @@ msgid "Quitting..."
 msgstr "離開中..."
 
 #: src/send_message.c:542
+#, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "傳送郵件 (%d / %d 位元)"
 
@@ -17306,6 +17732,7 @@ msgid "Error occurred while sending the message."
 msgstr "在傳送郵件時發生錯誤"
 
 #: src/send_message.c:667
+#, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
@@ -17334,6 +17761,7 @@ msgid "Source of the message"
 msgstr "郵件的來源"
 
 #: src/sourcewindow.c:159
+#, c-format
 msgid "%s - Source"
 msgstr "%s - 來源"
 
@@ -17374,6 +17802,7 @@ msgid "Find _all"
 msgstr "尋找全部(_a)"
 
 #: src/summary_search.c:690 src/summaryview.c:1086 src/summaryview.c:1347
+#, c-format
 msgid "Searching in %s... \n"
 msgstr "在%s內搜尋...\n"
 
@@ -17406,6 +17835,7 @@ msgid "Some marks are left. Process them?"
 msgstr "有一些標示已留下,要進行嗎?"
 
 #: src/summaryview.c:1326
+#, c-format
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
@@ -17484,10 +17914,12 @@ msgid "Attracting messages by subject..."
 msgstr "從主旨取出郵件..."
 
 #: src/summaryview.c:2612
+#, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
 #: src/summaryview.c:2616
+#, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
@@ -17496,6 +17928,7 @@ msgid ", "
 msgstr ",  "
 
 #: src/summaryview.c:2622
+#, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
@@ -17506,6 +17939,7 @@ msgstr[0] "項目已選擇"
 msgstr[1] "項目已選擇"
 
 #: src/summaryview.c:2654 src/summaryview.c:2697
+#, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 新郵件, %d 未讀, %d 全部 (%s)"
 
@@ -17550,6 +17984,7 @@ msgid "Watched:"
 msgstr "已監看:"
 
 #: src/summaryview.c:2692
+#, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d 已選擇 (%s/%s), %d 未讀"
 
@@ -17570,10 +18005,12 @@ msgid "(No Recipient)"
 msgstr "(無收信者)"
 
 #: src/summaryview.c:3403
+#, c-format
 msgid "From: %s, on %s"
 msgstr "寄件者: %s,  以 %s"
 
 #: src/summaryview.c:3412
+#, c-format
 msgid "To: %s, on %s"
 msgstr "收件者: %s, 以 %s"
 
@@ -17582,6 +18019,7 @@ msgid "You're not the author of the article.\n"
 msgstr "你不是文章的作者\n"
 
 #: 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] "你確定要刪除 %d 封選擇的郵件嗎?"
@@ -17618,6 +18056,7 @@ msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
 #: src/summaryview.c:4861
+#, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "你想要列印%d封件,一封一封的印,你確定要繼續嗎?"
@@ -17699,6 +18138,7 @@ msgid "Has attachment(s)"
 msgstr "有附件"
 
 #: src/summaryview.c:7953
+#, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
@@ -17743,10 +18183,12 @@ msgid "_Save image..."
 msgstr "儲存影像檔(_S)..."
 
 #: src/textview.c:722
+#, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d 位元)]"
 
 #: src/textview.c:725
+#, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d 位元)]"
 
@@ -17826,6 +18268,7 @@ msgid "'Open with...'"
 msgstr "以...開啟"
 
 #: src/textview.c:1139
+#, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 "    %s\n"
@@ -18173,6 +18616,7 @@ msgid "Welcome to Claws Mail"
 msgstr "歡迎光臨 Claws Mail"
 
 #: src/wizard.c:544
+#, c-format
 msgid ""
 "\n"
 "Welcome to Claws Mail\n"
diff --git a/src/compose.c b/src/compose.c
index a4d0d7e..d216a4b 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -10335,7 +10335,7 @@ static void compose_attach_cb(GtkAction *action, gpointer data)
 	 * which unsets it (via focus_out_event callback on compose window). */
 	manage_window_focus_in(compose->window, NULL, NULL);
 
-	file_list = filesel_select_multiple_files_open(_("Select file"));
+	file_list = filesel_select_multiple_files_open(_("Select file"), NULL);
 
 	if (file_list) {
 		compose_attach_from_list(compose, file_list, TRUE);
@@ -10349,7 +10349,7 @@ static void compose_insert_file_cb(GtkAction *action, gpointer data)
 	GList *file_list;
 	gint files_inserted = 0;
 
-	file_list = filesel_select_multiple_files_open(_("Select file"));
+	file_list = filesel_select_multiple_files_open(_("Select file"), NULL);
 
 	if (file_list) {
 		GList *tmp;
diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c
index 4b2b2f2..f694ea5 100644
--- a/src/gtk/filesel.c
+++ b/src/gtk/filesel.c
@@ -192,9 +192,9 @@ static GList *filesel_create(const gchar *title, const gchar *path,
  * This opens an Open type dialog.
  * @param title the title of the dialog
  */
-GList *filesel_select_multiple_files_open(const gchar *title)
+GList *filesel_select_multiple_files_open(const gchar *title, const gchar *path)
 {
-	return filesel_create(title, NULL, TRUE, TRUE, FALSE, NULL);
+	return filesel_create(title, path, TRUE, TRUE, FALSE, NULL);
 }
 
 GList *filesel_select_multiple_files_open_with_filter(	const gchar *title,
diff --git a/src/gtk/filesel.h b/src/gtk/filesel.h
index ae1c42c..ed3555b 100644
--- a/src/gtk/filesel.h
+++ b/src/gtk/filesel.h
@@ -29,7 +29,7 @@ gchar *filesel_select_file_save(const gchar *title, const gchar *path);
 gchar *filesel_select_file_open_folder(const gchar *title, const gchar *path);
 gchar *filesel_select_file_save_folder(const gchar *title, const gchar *path);
 
-GList *filesel_select_multiple_files_open(const gchar *title);
+GList *filesel_select_multiple_files_open(const gchar *title, const gchar *path);
 GList *filesel_select_multiple_files_open_with_filter(	const gchar *title,
 							const gchar *path,
 							const gchar *filter);
diff --git a/src/gtk/w32_filesel.c b/src/gtk/w32_filesel.c
index 958ddd0..09dd0b0 100644
--- a/src/gtk/w32_filesel.c
+++ b/src/gtk/w32_filesel.c
@@ -307,9 +307,9 @@ gchar *filesel_select_file_open(const gchar *title, const gchar *path)
 	return filesel_select_file_open_with_filter(title, path, NULL);
 }
 
-GList *filesel_select_multiple_files_open(const gchar *title)
+GList *filesel_select_multiple_files_open(const gchar *title, const gchar *path)
 {
-	return filesel_select_multiple_files_open_with_filter(title, NULL, NULL);
+	return filesel_select_multiple_files_open_with_filter(title, path, NULL);
 }
 
 gchar *filesel_select_file_save(const gchar *title, const gchar *path)

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list